Skip to content

Commit

Permalink
Merge pull request #33 from Adrian400811/Adrian
Browse files Browse the repository at this point in the history
Updated Level0
  • Loading branch information
reihoron authored Jun 12, 2024
2 parents 7a25a4a + 8f3d641 commit f8683b7
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 109 deletions.
Empty file modified GameOverScreen.java
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion Level0.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public Level0() {
addObject(player = new Player(), 100, 622);
addObject(coinLabel, 1100, 10);
coinLabel.update("Coins: " + totalCoins);

int[][] blockGeneration = loadLevel(0);
spawnTerrain(blockGeneration);
}
Expand Down
2 changes: 1 addition & 1 deletion Level1.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public Level1() {
coinLabel.update("Coins: " + totalCoins);

// Individual Block Placement
int[][] blockGeneration = new int[40][10];
int[][] blockGeneration = new int[120][20];
blockGeneration[2][5] = 1;
spawnTerrain(blockGeneration);
}
Expand Down
2 changes: 1 addition & 1 deletion Mobs.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void collision() {
}

protected int bounceWall(int dir) {
if (getOneObjectAtOffset(dir * getImage().getWidth() + 2, 0, Tile.class) != null) {
if (getOneObjectAtOffset(dir * getImage().getWidth() + 1, 0, Tile.class) != null) {
dir *= -1;
}
return dir;
Expand Down
Empty file modified images/GameOverText.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/gameOverInstructions.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 35 additions & 15 deletions levels/0.csv
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
4,0,1
4,1,8
5,10,1
6,9,1
7,8,1
8,8,1
9,8,1
10,9,1
11,9,1
12,9,1
13,9,1
14,9,1
15,9,1
16,8,1
17,8,1
8,7,1
8,7,1
9,7,1
10,8,1
11,8,1
12,8,1
12,7,3
12,6,3
12,5,3
12,1,4
2,2,5
3,3,6
4,4,8
9,5,3
10,5,2
13,8,1
14,8,1
15,8,1
16,7,1
17,7,1
18,7,1
19,8,1
20,9,1
21,9,1
21,10,1
25,9,1
26,9,1
27,9,1
27,7,1
28,7,1
29,5,1
30,5,1
31,5,1
32,7,1
33,7,1
33,9,1
34,9,1
35,9,1
17,9,2
Loading

0 comments on commit f8683b7

Please sign in to comment.