From 341f26b6bb4b93858fb64e7f76e16ce7c57d6407 Mon Sep 17 00:00:00 2001
From: bob <lol@lol.com>
Date: Mon, 20 Jun 2022 11:29:54 -0400
Subject: [PATCH] Fixing bugs

---
 saves/Level1-signs.txt    |  2 +-
 saves/Level3-dialogue.txt |  2 +-
 saves/Level3.txt          | 16 ++++++++--------
 saves/Level4.txt          | 18 ++++++++++++++++++
 src/GamePanel.java        |  3 ++-
 src/LevelManager.java     | 10 +++++++++-
 6 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 saves/Level4.txt

diff --git a/saves/Level1-signs.txt b/saves/Level1-signs.txt
index 3b34c5a..5c25b7c 100644
--- a/saves/Level1-signs.txt
+++ b/saves/Level1-signs.txt
@@ -11,7 +11,7 @@
 3430 500 Click left to throw a bomb            You have a limited amount of bombs per level!
 2950 550 you can blow up boxes
 500 200 Press WASD to move and R to restart
-500 250 D makes you fall down faster
+500 250 S makes you fall down faster
 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/Level3-dialogue.txt b/saves/Level3-dialogue.txt
index 2761dfe..f02ec09 100644
--- a/saves/Level3-dialogue.txt
+++ b/saves/Level3-dialogue.txt
@@ -1,2 +1,2 @@
 $Villain
-I am having a seizure.
+I am having a seizure.
\ No newline at end of file
diff --git a/saves/Level3.txt b/saves/Level3.txt
index d39adf5..e499ac1 100644
--- a/saves/Level3.txt
+++ b/saves/Level3.txt
@@ -7,12 +7,12 @@ assssssd+                                    ad
 asssssstwwwwww   wwwww    ww  w   wwe        ad                                                     asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
 assssssssssssslllsssssllllssllslllssd        zc                                                     asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
 asssssgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc                     qe                                        asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
-asssssd                             b                     ad                                        asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
-asssssd                             b                     zc                                        asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
-asssssd                             b                                                               asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
-asssssd !!!!!!!!!!!!!!!!!!!!!!!!    b                                                               zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd
-asssssdbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                                                                                                                                       d
-asssssdbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                     qe                                  qe                                                                            d
-asssssd                                                   ak                                  hk                                                                            d
-asssssdo                                                  ad    !               !             ad                                                                           xd
+asssssd      b                                            ad                                        asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
+asssssd      b                                            zc                                        asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
+asssssd      b                                                                                      asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd
+asssssd !!!! b                                                                                      zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd
+asssssdbbbbbbb                                                                                                                                                              +
+asssssdbbbbbbb                                            qe                                  qe                                                                            +
+asssssd                                                   ad                                  ak                                                                            +
+asssssdo                                                  ad                    !             hd                                                                            +
 assssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwc
\ No newline at end of file
diff --git a/saves/Level4.txt b/saves/Level4.txt
new file mode 100644
index 0000000..a888370
--- /dev/null
+++ b/saves/Level4.txt
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
\ No newline at end of file
diff --git a/src/GamePanel.java b/src/GamePanel.java
index c8bc46d..e75c789 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -290,7 +290,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
       }
     }
     for(int i=0; i<fireballs.size(); i++){
-      if(fireballs.get(i)!=null) {
+      if(fireballs.get(i)!=null&&fireballs.get(i).canUpdate(0,0)) {
         fireballs.get(i).draw(g);
       }
       if(i<fireballs.size()&&fireballs.get(i).dead){
@@ -433,6 +433,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
     } else {
       LevelManager.bombs = bombCount;
     }
+    //System.out.println("done111");
     //the CPU runs our game code too quickly - we need to slow it down! The following lines of code "force" the computer to get stuck in a loop for short intervals between calling other methods to update the screen. 
     long lastTime = System.nanoTime();
     double amountOfTicks = 60;
diff --git a/src/LevelManager.java b/src/LevelManager.java
index 8c1cf00..70a0f5a 100644
--- a/src/LevelManager.java
+++ b/src/LevelManager.java
@@ -38,7 +38,13 @@ public class LevelManager implements Serializable {
             xSpawn = -800;
             ySpawn = 100;
             filePath = "saves/Level3.txt";
-            bombs = 99329;
+            bombs = 4;
+        } else if(level == 4){
+            //-800/100
+            xSpawn = -800;
+            ySpawn = 100;
+            filePath = "saves/Level4.txt";
+            bombs = 4;
         }
         try {
             MapReader.inputMap(filePath);
@@ -75,6 +81,7 @@ public class LevelManager implements Serializable {
             throw new RuntimeException(e);
         }
         //GamePanel.player.reset();
+        //System.out.println("done111");
     }
 
     public static void setLevel(int level) {
@@ -82,5 +89,6 @@ public class LevelManager implements Serializable {
     }
     public static void nextLevel(){
         setLevel(level+1);
+        System.out.println("done222");
     }
 }