Skip to content

Commit

Permalink
Added grid functions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Grusk9
Grusk9 committed Jan 31, 2024
1 parent ac05a9e commit b077ed2
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 4 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
Binary file added assets/.DS_Store
View file
Binary file not shown.
Binary file added assets/img/.DS_Store
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Game/game.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Game {
}

public nextLevel() {
if (this.currentLevelNumber < 3) {
if (this.currentLevelNumber < 7) {
this.currentLevelNumber++;
this.level = this.levelFactory.generateLevel(
this.currentLevelNumber,
Expand Down
98 changes: 95 additions & 3 deletions src/Game/levelFactory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@

class LevelFactory {
public numbersGridLevel1: number[][];
public levelImage: p5.Image;
public numbersGridLevel2: number[][];
public numbersGridLevel3: number[][];
public numbersGridLevel4: number[][];
public numbersGridLevel5: number[][];
public numbersGridLevel6: number[][];
public numbersGridLevel7: number[][];
public levelImage: p5.Image;

constructor() {
// prettier-ignore
Expand Down Expand Up @@ -74,8 +78,80 @@ class LevelFactory {
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
];

// prettier-ignore
this.numbersGridLevel4= [
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
[10, 20, 13, 20, 20, 20, 20, 20, 20, 14, 20, 14, 11, 14, 20, 20, 20, 20, 14, 20, 11, 14, 18, 20, 10],
[10, 20, 11, 11, 11, 11, 11, 13, 11, 11, 11, 11, 11, 20, 11, 11, 11, 20, 11, 20, 11, 11, 11, 13, 10],
[10, 20, 11, 20, 13, 20, 11, 20, 20, 20, 20, 20, 20, 20, 20, 14, 11, 20, 11, 20, 14, 20, 20, 20, 10],
[10, 14, 11, 20, 11, 14, 11, 20, 11, 11, 11, 11, 11, 20, 11, 11, 11, 20, 11, 11, 11, 20, 11, 20, 10],
[10, 20, 11, 20, 11, 20, 11, 14, 11, 20, 14, 20, 11, 20, 20, 13, 13, 20, 20, 11, 13, 20, 11, 14, 10],
[10, 14, 11, 20, 11, 14, 11, 20, 11, 20, 11, 20, 11, 20, 20, 11, 11, 11, 20, 11, 20, 11, 11, 20, 10],
[10, 11, 11, 20, 11, 20, 11, 14, 11, 20, 11, 16, 11, 20, 20, 14, 14, 11, 20, 11, 20, 14, 11, 20, 10],
[10, 20, 20, 14, 11, 20, 11, 20, 11, 20, 11, 11, 11, 20, 20, 11, 11, 11, 20, 11, 11, 20, 11, 20, 17],
[10, 20, 11, 11, 11, 20, 11, 20, 11, 14, 20, 20, 13, 20, 20, 20, 20, 20, 20, 11, 14, 20, 11, 11, 10],
[10, 20, 11, 20, 14, 20, 13, 20, 11, 11, 11, 11, 11, 20, 11, 11, 11, 11, 20, 11, 20, 11, 11, 16, 10],
[10, 20, 11, 20, 11, 11, 11, 11, 11, 20, 20, 20, 20, 20, 11, 20, 14, 11, 20, 11, 20, 14, 11, 20, 10],
[10, 20, 11, 20, 11, 20, 20, 20, 13, 20, 20, 11, 11, 20, 11, 20, 11, 11, 20, 11, 11, 11, 11, 20, 10],
[10, 15, 11, 16, 11, 14, 11, 14, 11, 20, 20, 14, 20, 20, 11, 14, 20, 13, 20, 14, 20, 14, 20, 13, 10],
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
];

// prettier-ignore
this.numbersGridLevel5= [
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
[10, 15, 20, 20, 20, 20, 11, 16, 11, 20, 20, 20, 14, 20, 20, 20, 11, 20, 20, 13, 20, 20, 18, 20, 10],
[10, 11, 11, 11, 11, 20, 11, 20, 11, 20, 11, 11, 11, 11, 11, 20, 11, 20, 11, 11, 11, 11, 11, 13, 10],
[10, 20, 20, 20, 20, 20, 11, 20, 11, 20, 20, 20, 20, 14, 11, 20, 11, 20, 14, 11, 20, 14, 11, 14, 10],
[10, 20, 11, 11, 11, 20, 11, 14, 11, 20, 11, 13, 11, 11, 11, 20, 11, 11, 11, 11, 20, 20, 11, 20, 10],
[10, 20, 11, 16, 11, 20, 11, 20, 11, 20, 11, 20, 11, 20, 20, 20, 14, 20, 20, 14, 20, 20, 11, 20, 10],
[10, 20, 11, 14, 11, 14, 11, 20, 11, 20, 11, 20, 11, 11, 11, 20, 11, 13, 11, 11, 11, 20, 11, 16, 10],
[10, 20, 11, 20, 11, 20, 11, 14, 11, 20, 11, 20, 20, 14, 11, 20, 11, 20, 11, 14, 11, 20, 11, 11, 10],
[10, 20, 11, 14, 11, 20, 11, 11, 11, 20, 11, 20, 11, 11, 11, 20, 11, 20, 11, 14, 11, 20, 11, 20, 17],
[10, 20, 11, 20, 11, 20, 20, 20, 20, 20, 11, 20, 20, 14, 11, 20, 11, 14, 11, 20, 11, 14, 11, 20, 10],
[10, 20, 11, 14, 11, 11, 11, 11, 11, 20, 11, 20, 11, 11, 11, 13, 11, 20, 11, 20, 11, 11, 11, 20, 10],
[10, 20, 20, 20, 20, 20, 11, 20, 13, 20, 11, 20, 11, 14, 20, 20, 11, 16, 11, 20, 20, 20, 20, 20, 10],
[10, 11, 11, 20, 11, 20, 11, 20, 11, 20, 11, 20, 11, 11, 11, 13, 11, 11, 11, 20, 11, 11, 11, 11, 10],
[10, 14, 20, 14, 11, 14, 20, 14, 11, 14, 11, 14, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 14, 10],
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
];
// prettier-ignore
this.numbersGridLevel6= [
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
[10, 16, 20, 20, 20, 14, 14, 11, 14, 11, 14, 13, 20, 20, 20, 11, 14, 14, 20, 11, 14, 20, 20, 20, 12],
[10, 20, 11, 11, 11, 11, 11, 11, 20, 11, 20, 11, 20, 11, 11, 11, 11, 11, 20, 11, 20, 11, 11, 20, 10],
[10, 14, 11, 14, 20, 20, 20, 13, 20, 11, 20, 11, 20, 11, 18, 16, 20, 11, 20, 11, 20, 13, 11, 20, 10],
[10, 20, 11, 11, 11, 11, 20, 20, 20, 20, 20, 11, 20, 11, 14, 11, 20, 11, 20, 11, 20, 14, 11, 14, 10],
[10, 20, 20, 20, 20, 20, 20, 11, 11, 11, 20, 11, 20, 11, 11, 11, 20, 11, 14, 11, 20, 11, 11, 11, 10],
[10, 20, 11, 11, 11, 11, 14, 11, 14, 11, 14, 11, 14, 20, 20, 20, 20, 11, 20, 11, 20, 16, 20, 11, 10],
[10, 20, 11, 20, 20, 20, 20, 11, 14, 11, 20, 11, 11, 11, 11, 11, 11, 11, 20, 14, 20, 20, 20, 20, 10],
[10, 13, 11, 20, 11, 11, 11, 11, 20, 11, 20, 20, 20, 20, 20, 14, 20, 20, 20, 11, 11, 11, 11, 20, 10],
[10, 20, 11, 20, 20, 14, 20, 20, 20, 11, 20, 11, 11, 11, 20, 11, 20, 11, 11, 11, 14, 13, 11, 20, 10],
[10, 20, 11, 11, 20, 11, 11, 11, 11, 11, 20, 11, 14, 11, 20, 11, 20, 14, 11, 20, 20, 20, 11, 14, 10],
[10, 14, 13, 11, 20, 20, 20, 20, 14, 11, 20, 20, 18, 11, 14, 11, 20, 18, 11, 20, 11, 20, 11, 20, 10],
[10, 11, 11, 11, 20, 11, 20, 11, 11, 11, 11, 11, 11, 11, 20, 11, 11, 11, 11, 20, 11, 20, 11, 20, 10],
[15, 20, 20, 20, 14, 11, 20, 20, 20, 14, 14, 20, 20, 16, 20, 20, 20, 14, 14, 20, 11, 20, 14, 20, 10],
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
];
// prettier-ignore
this.numbersGridLevel7= [
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
[10, 15, 20, 16, 14, 20, 20 ,20, 20, 20, 11, 20 ,11, 11, 11, 20, 20, 20, 11, 20, 20, 14, 11, 20, 10],
[10, 14, 11, 11, 11, 20, 11, 20, 11, 13, 20, 20, 20, 11, 20, 20, 11, 14, 11, 20, 20, 20, 20, 20, 10],
[10, 20, 20, 13, 11, 20, 11, 20, 11, 20, 11, 11, 11, 20, 14, 20, 11, 11, 11, 20, 11, 11, 20, 11, 10],
[10, 20, 11, 11, 11, 14, 11, 20, 11, 14, 20, 14, 11, 20, 11, 20, 13, 20, 20, 20, 14, 11, 13, 14, 10],
[10, 20, 14, 11, 20, 14, 11, 20, 11, 20, 20, 11, 14, 20, 11, 20, 11, 11, 20, 20, 11, 11, 20, 11, 10],
[10, 11, 11, 20, 20, 13, 11, 20, 11, 20, 20, 20, 11, 20, 11, 20, 14, 11, 20, 20, 11, 20, 14, 30, 10],
[10, 20, 11, 14, 11, 11, 20, 20, 20, 20, 11, 13, 11, 20, 11, 20, 20, 11, 18, 20, 11, 11, 11, 20, 10],
[10, 14, 20, 20, 20, 20, 13, 11, 20, 11, 20, 20, 11, 20, 11, 11, 11, 11, 11, 20, 14, 11, 20, 20, 17],
[10, 20, 11, 11, 11, 13, 11, 11, 20, 11, 14, 11, 20, 20, 20, 20, 20, 20, 20, 20, 11, 11, 14, 20, 10],
[10, 20, 11, 14, 11, 14, 14, 11, 20, 11, 20, 11, 20, 11, 11, 11, 16, 20, 11, 20, 11, 14, 11, 20, 10],
[10, 20, 11, 14, 11, 14, 14, 11, 20, 11, 20, 11, 14, 11, 14, 11, 20, 20, 11, 16, 11, 18, 11, 20, 10],
[10, 20, 20, 14, 11, 11, 11, 11, 20, 11, 20, 11, 11, 11, 20, 11, 11, 20, 11, 14, 20, 13, 11, 20, 10],
[10, 11, 11, 13, 20, 14, 14, 20, 20, 16, 20, 20, 16, 20, 18, 20, 14, 20, 11, 11, 11, 14, 20, 20, 10],
[10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10],
]


this.levelImage = new p5.Image(1000, 600);
}

Expand All @@ -98,10 +174,26 @@ class LevelFactory {
selectedLevelGrid = this.numbersGridLevel2;
levelImage = levelTwo;
colorWall = "#7851A9";
} else {
} else if (levelNumber === 3) {
selectedLevelGrid = this.numbersGridLevel3;
levelImage = levelThree;
colorWall = "#b776a5";
} else if (levelNumber === 4) {
selectedLevelGrid = this.numbersGridLevel4;
levelImage = levelFour;
colorWall = "#900002";
} else if (levelNumber === 5) {
selectedLevelGrid = this.numbersGridLevel5;
levelImage = levelFive;
colorWall = "#53185d";
} else if (levelNumber === 6) {
selectedLevelGrid = this.numbersGridLevel6;
levelImage = levelSix;
colorWall = "#10740b";
} else {
selectedLevelGrid = this.numbersGridLevel7;
levelImage = levelSeven;
colorWall = "#1E77A4";
}

for (let y = 0; y < selectedLevelGrid.length; y++) {
Expand Down
8 changes: 8 additions & 0 deletions src/sketch.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ let playerImages: p5.Image[];
let levelOne: p5.Image;
let levelTwo: p5.Image;
let levelThree: p5.Image;
let levelFour: p5.Image;
let levelFive: p5.Image;
let levelSix: p5.Image;
let levelSeven: p5.Image;
let backgroundImg: p5.Image;
let endScreenStar: p5.Image;
let smallStarsEndScreen: p5.Image;
Expand Down Expand Up @@ -57,6 +61,10 @@ function preload() {
levelOne = loadImage("./assets/img/levelOne.png");
levelTwo = loadImage("./assets/img/levelTwo.png");
levelThree = loadImage("./assets/img/levelThree.png");
levelFour = loadImage ("./assets/img/levelFour.png");
levelFive = loadImage ("./assets/img/levelFive.png");
levelSix = loadImage ("./assets/img/levelSix.png");
levelSeven = loadImage ("./assets/img/levelSeven.png");
beerImg = loadImage("./assets/img/beer.png");
formulaImg = loadImage("./assets/img/formula.png");
clockImg = loadImage("./assets/img/clock.png");
Expand Down

0 comments on commit b077ed2

Please sign in to comment.