From 06849a507878c6947c0929ce0898a433d7260070 Mon Sep 17 00:00:00 2001 From: Chara1236 Date: Sun, 19 Jun 2022 21:30:25 -0400 Subject: [PATCH] First level done --- saves/Level1-signs.txt | 15 ++++++++++++--- saves/Level1.txt | 6 +++--- src/LevelManager.java | 10 ++++++---- src/StickyBomb.java | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/saves/Level1-signs.txt b/saves/Level1-signs.txt index 6449cf5..b23cb81 100644 --- a/saves/Level1-signs.txt +++ b/saves/Level1-signs.txt @@ -1,7 +1,16 @@ 500 150 Hello Kenny, Welcome to my platformer 1500 150 Don't touch that pink dude 1500 200 it looks like it could hurt you -2300 300 You can guess what this -2300 350 orange substance does +2350 300 You can guess what this +2350 350 orange substance does +4250 255 Psssss.. use a bomb to jump out of the hole +5000 500 Avoid da fiiiiiiirrrrrrreeeeeebbbaaaalllsss +5700 100 Oh yeah, bombs can +5700 150 kill slimes / -300 200 Press WASD to move +2950 500 Click left to throw a bomb +2950 550 you can blow up boxes +500 200 Press WASD to move and R to restart +4250 100 You can pickup/placedown steel using right click +4250 150 Hold right click to see your pickup/placedown range +4250 200 You can't jump or throw bombs while while holding steel \ No newline at end of file diff --git a/saves/Level1.txt b/saves/Level1.txt index 02996db..f24e2d1 100644 --- a/saves/Level1.txt +++ b/saves/Level1.txt @@ -10,9 +10,9 @@ sssssssssssssssssd sssssssssssssssssd assssssssssssssssd +ssssssssssssssd sssssssssssssssssd asssssssssssssssstwwwwwwwwwwwe +ssssssssssssssd sssssssssssssssssd zxxxxxxxxxxxxxxxxxxxxxxxxxxxftwwwwwwe qe +ssssssssssssssd -sssssssssssssssssd bb zxxxxxxxcooad h +ssssssssssssssd -sssssssssssssssssd qe q e bb ad +ssssssssssssssd +sssssssssssssssssd bb zxxxxxxxcooad he +ssssssssssssssd +sssssssssssssssssd qe q e bb ad zc +ssssssssssssssd sssssssssssssssssd ad qwwwrlllte bb ad +ssssssssssssssd sssssssssssssssssd ad asssssssste bb ad +ssssssssssssssd -sssssssssssssssssd ad ! qwrssssssssstwwwe bb ad h +ssssssssssssssd +sssssssssssssssssd ad ! qwrssssssssstwwwe bb ad h !!!!!!!!!!! +ssssssssssssssd ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwd diff --git a/src/LevelManager.java b/src/LevelManager.java index 317c23b..62f4527 100644 --- a/src/LevelManager.java +++ b/src/LevelManager.java @@ -10,7 +10,7 @@ import java.util.Arrays; public class LevelManager implements Serializable { public static int level = 1; public static int xSpawn = -400; - public static int ySpawn = 500; + public static int ySpawn = 450; public static String filePath; @@ -22,9 +22,9 @@ public class LevelManager implements Serializable { GameFrame.game.player.xVelocity = 0; LevelManager.level = level; if(level == 1){ - //-400/500 - xSpawn = 1200; - ySpawn = 500; + //-400/450 + xSpawn = -400; + ySpawn = 450; filePath = "saves/Level1.txt"; bombs = 99999; } else if(level == 2){ @@ -55,6 +55,8 @@ public class LevelManager implements Serializable { // reset signs GameFrame.game.tutorialSign = new ArrayList(); GameFrame.game.loreSign = new ArrayList(); + GameFrame.game.tutorialSign.clear(); + GameFrame.game.loreSign.clear(); // temporary boolean, so only declared here boolean stillTutorial = true; for (String[] sA: MapReader.inputSign(filePath)) { diff --git a/src/StickyBomb.java b/src/StickyBomb.java index 64ee3b0..4b673c7 100644 --- a/src/StickyBomb.java +++ b/src/StickyBomb.java @@ -75,7 +75,7 @@ public class StickyBomb extends GenericSprite implements Serializable { double disX = GameFrame.game.enemy.get(i).x+GameFrame.game.enemy.get(i).npcWidth/2 - (x+length/2); double disY = GameFrame.game.enemy.get(i).y+GameFrame.game.enemy.get(i).npcHeight/2 - (y+length/2); double eHypo = Math.sqrt(disX*disX+disY*disY); - if(eHypo<200){ + if(eHypo<105){ GameFrame.game.enemy.get(i).isDead = true; }