diff --git a/saves/Level1-signs.txt b/saves/Level1-signs.txt index 0211e3d..2114fac 100644 --- a/saves/Level1-signs.txt +++ b/saves/Level1-signs.txt @@ -7,6 +7,7 @@ 5000 500 Avoid da fiiiiiiirrrrrrreeeeeebbbaaaalllsss 5700 100 Oh yeah, bombs can 5700 150 kill slimes +3320 200 They float! / 3430 500 Click left to throw a bomb You have a limited amount of bombs per level! 2950 550 you can blow up boxes diff --git a/saves/Level1.txt b/saves/Level1.txt index 452cdb4..af8196d 100644 --- a/saves/Level1.txt +++ b/saves/Level1.txt @@ -2,11 +2,11 @@ wwwwwwwwwwwwwwwwwe sssssssssssssssssd assssssssssssssssd +ssssssssssssssd sssssssssssssssssd assssssssssssssssd +ssssssssssssssd sssssssssssssssssd assssssssssssssssd +ssssssssssssssd -sssssssssssssssssd assssssssssssssssd +ssssssssssssssd -sssssssssssssssssd assssssssssssssssd +ssssssssssssssd -sssssssssssssssssd assssssssssssssssd +ssssssssssssssd -sssssssssssssssssd assssssssssssssssd +ssssssssssssssd -sssssssssssssssssd assssssssssssssssd +ssssssssssssssd +sssssssssssssssssd assss ssssd +ssssssssssssssd +sssssssssssssssssd assss ssssd +ssssssssssssssd +sssssssssssssssssd assss ssssd +ssssssssssssssd +sssssssssssssssssd assss !!!!!! ssssd +ssssssssssssssd +sssssssssssssssssd assssllllllllssssd +ssssssssssssssd sssssssssssssssssd assssssssssssssssd +ssssssssssssssd sssssssssssssssssd asssssssssssssssstwwwwwwwwwwwe +ssssssssssssssd sssssssssssssssssd zxxxxxxxxxxxxxxxxxxxxxxxxxxxftwwwwwwe qe +ssssssssssssssd diff --git a/saves/Level2-signs.txt b/saves/Level2-signs.txt index 2f87bfa..666ce7b 100644 --- a/saves/Level2-signs.txt +++ b/saves/Level2-signs.txt @@ -1,5 +1,5 @@ -200 350 This is a sign -300 400 This is also a sign -/ -300 200 This is a different sign -400 250 sign sign sign sign \ No newline at end of file +1300 50 Jump to the top +1900 200 Trust me, the steel +1900 300 block is quite useful here +3450 500 Steel block? +4500 100 You need your bomb here... \ No newline at end of file diff --git a/saves/Level3-dialogue.txt b/saves/Level3-dialogue.txt index f02ec09..9e9e69e 100644 --- a/saves/Level3-dialogue.txt +++ b/saves/Level3-dialogue.txt @@ -1,2 +1,4 @@ $Villain -I am having a seizure. \ No newline at end of file +Oh you made it past the first real level +Feeling acomplished aren't you... + diff --git a/saves/Level3-signs.txt b/saves/Level3-signs.txt index 2f87bfa..584b445 100644 --- a/saves/Level3-signs.txt +++ b/saves/Level3-signs.txt @@ -1,5 +1,2 @@ -200 350 This is a sign -300 400 This is also a sign -/ -300 200 This is a different sign -400 250 sign sign sign sign \ No newline at end of file +300 150 Lava parkourrrrrrrrrrrrr +300 500 Hmmmmm... don't screw it up \ No newline at end of file diff --git a/saves/Level3.txt b/saves/Level3.txt index a822d6f..ed3a7d8 100644 --- a/saves/Level3.txt +++ b/saves/Level3.txt @@ -1,12 +1,12 @@ wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwe asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd assssssgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxfd asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd assssssd ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd -assssssd ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd -assssssd ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd -assssssd+ ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd -asssssstwwwwww wwwww ww w wwe ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd -assssssssssssslllsssssllllssllslllssd zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd -asssssgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc qe asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssd ad ass ss s sssss ss ss sssssss ss ssssss ss ss s ss ssd +assssssd ad ass sss ss sssss ssssss ss ss ss ss ssssss sss ssss s sss s ss s s sssd +assssssd+ ad ass sss ss ssss sssssss ss ss ss ss ss ss ssss s ss s s sss s ss s ssssd +asssssstwwwwww wwwww ww w wwe ad ass ss sss ssssssss ss ss ss ss ssss sssss ss ss s s s ssssd +assssssssssssslllsssssllllssllslllssd zc ass ssssss ss sssssssss ss ss ss ss sss ss sss ssssss s sss s s ss s sssd +asssssgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc qe ass ssssss s sssss ss ss ss sssssss ssssss s sss s ss s ss ssd asssssd b ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd asssssd b zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd asssssd b asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd diff --git a/saves/Level4-dialogue.txt b/saves/Level4-dialogue.txt index 0213950..7fbf43e 100644 --- a/saves/Level4-dialogue.txt +++ b/saves/Level4-dialogue.txt @@ -1,2 +1,4 @@ $Villain -Cringe \ No newline at end of file +No more, I won't let you beat this game +It is time for... +BULLET HELL!!!!!!!! \ No newline at end of file diff --git a/saves/Level4-signs.txt b/saves/Level4-signs.txt index 2f87bfa..1ec6efb 100644 --- a/saves/Level4-signs.txt +++ b/saves/Level4-signs.txt @@ -1,5 +1,2 @@ -200 350 This is a sign -300 400 This is also a sign -/ -300 200 This is a different sign -400 250 sign sign sign sign \ No newline at end of file +-200 400 This level is really hard... + diff --git a/saves/Level5-dialogue.txt b/saves/Level5-dialogue.txt index a04bfad..9b8372f 100644 --- a/saves/Level5-dialogue.txt +++ b/saves/Level5-dialogue.txt @@ -1,2 +1,3 @@ $Villain -DIE DIE DIE DIE DIE \ No newline at end of file +How dare you still be alive +Please DIE DIE DIE DIE DIE DIE \ No newline at end of file diff --git a/saves/Level5-signs.txt b/saves/Level5-signs.txt index 2f87bfa..f5d4071 100644 --- a/saves/Level5-signs.txt +++ b/saves/Level5-signs.txt @@ -1,5 +1,2 @@ -200 350 This is a sign -300 400 This is also a sign -/ -300 200 This is a different sign -400 250 sign sign sign sign \ No newline at end of file +-300 400 Slow and steady... +2800 200 ...wins the race \ No newline at end of file diff --git a/saves/Level5.txt b/saves/Level5.txt index 4568be4..15c827d 100644 --- a/saves/Level5.txt +++ b/saves/Level5.txt @@ -1,18 +1,18 @@ -qwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwe -a d -a d -a d -a d -a d -a d -a d -a d -a d -a lll d -a lsl d -a lsl d -a lsl d -a lsl d -aoo lsl d -allllllllllllllsllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllld +qwmwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwmwwwwwwwmmwwwwwwmwwwmmwwwwwmwwwwwmmwwwwwwwwwwwwwwe +a mb !! b d +a bbbbbbo hmmmmmmmmmmmmmm1 +a b h + +a b + +a b + +a b + +a b oooooqwwwwwwwwwwwwwww +a b lllllllllllllllllllllllllllllllllllllllllllllllllllllllld +a b l d +a lllbbbbbb l d +a lsl l h +a lsl l l d +a lsl l d +a lsl l d +aooo lsl l d +allllllllllllllslllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllld zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc \ No newline at end of file diff --git a/src/LevelManager.java b/src/LevelManager.java index 1aa4009..188afcb 100644 --- a/src/LevelManager.java +++ b/src/LevelManager.java @@ -43,11 +43,11 @@ public class LevelManager implements Serializable { filePath = "saves/Level4.txt"; bombs = 5; } else if(level == 5){ - //-1100/460 - xSpawn = -1100; - ySpawn = 350; + //-1100/350 + xSpawn = 1800; + ySpawn = 150; filePath = "saves/Level5.txt"; - bombs = 0; + bombs = 1; } try { MapReader.inputMap(filePath); @@ -86,6 +86,20 @@ public class LevelManager implements Serializable { //System.out.println("done111"); } + + public static void setBombs(){ + if(GameFrame.game.level == 1){ + bombs = 8; + } else if(GameFrame.game.level == 2){ + bombs = 3; + } else if(GameFrame.game.level == 3){ + bombs = 4; + } else if(GameFrame.game.level == 4){ + bombs = 5; + } else if(GameFrame.game.level == 5){ + bombs = 1; + } + } public static void setLevel(int level) { setLevel(level, false); } diff --git a/src/Player.java b/src/Player.java index 50d4cf0..545b4b3 100644 --- a/src/Player.java +++ b/src/Player.java @@ -108,7 +108,7 @@ public class Player extends GenericSprite { // calls parent public boolean canUpdate(double x, double y) throws UnsupportedAudioFileException, LineUnavailableException, IOException { - if(this.y+y<=-(HEIGHT+Tile.length*2)){ + if(this.y+y<=-(HEIGHT+Tile.length)){ return false; } boolean canUpdate = true; @@ -296,16 +296,21 @@ public class Player extends GenericSprite { public void reset() throws UnsupportedAudioFileException, LineUnavailableException, IOException { SoundWrapper.playSound("sound/OOF.wav"); + holdingSteel = false; LevelManager.setLevel(GameFrame.game.level, true); GameFrame.game.camera.x = LevelManager.xSpawn; y = LevelManager.ySpawn; - holdingSteel = false; + GameFrame.game.bombs.clear(); + LevelManager.setBombs(); + } public void resetNoSound() throws IOException { + holdingSteel = false; LevelManager.setLevel(GameFrame.game.level, true); GameFrame.game.camera.x = LevelManager.xSpawn; y = LevelManager.ySpawn; - holdingSteel = false; + GameFrame.game.bombs.clear(); + LevelManager.setBombs(); } public void mousePressed(MouseEvent e) throws SpriteException, IOException { canReach(1,1);