From 5ae603cb063ad1da57458b5915946f71ae480c77 Mon Sep 17 00:00:00 2001
From: Chara1236 <Charliezhao06@gmail.com>
Date: Fri, 17 Jun 2022 23:36:52 -0400
Subject: [PATCH] Fireball but not really

---
 src/FireBall.java  |  8 ++++----
 src/GamePanel.java | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/FireBall.java b/src/FireBall.java
index 82db012..683557d 100644
--- a/src/FireBall.java
+++ b/src/FireBall.java
@@ -8,15 +8,15 @@ public class FireBall extends GenericSprite{
         xVelocity = xv;
         yVelocity = yv;
         if(dir.equals("left")){
-            spritePath  = "src/img/misc/flame/flameLeft.png";
+            spritePath  = "img/misc/flame/flameLeft.png";
         }
     }
 
     public void move(){
-        x += xVelocity;
-        y += yVelocity;
+       // x += xVelocity;
+       // y += yVelocity;
     }
     public void draw(Graphics g) throws IOException {
-        g.drawImage(GamePanel.getImage(spritePath),x-GameFrame.game.camera.x,y,null);
+       //g.drawImage(GamePanel.getImage(spritePath),x-GameFrame.game.camera.x,y,null);
     }
 }
diff --git a/src/GamePanel.java b/src/GamePanel.java
index c448426..be33eff 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -253,6 +253,10 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
         }
       }
     }
+    for(int i=0; i<fireballs.size(); i++){
+      fireballs.get(i).draw(g);
+    }
+
     for(int i=0; i<particles.size(); i++){
       // todo: find cause of particles being null
       if(i<particles.size()&&particles.get(i)!=null) {
@@ -306,6 +310,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
         // throw new RuntimeException(e);
       }
     }
+    g.drawString(player.xVelocity+"",400,400);
   }
 
   //call the move methods in other classes to update positions
@@ -390,8 +395,8 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
       now = System.nanoTime();
       delta = delta + (now-lastTime)/ns;
       lastTime = now;
-      if(fireballCounter<0){fireballCounter = 20;}
-      fireballCounter--;
+//      if(fireballCounter<0){fireballCounter = 20;}
+//      fireballCounter--;
       //only move objects around and update screen if enough time has passed
       if(delta >= 1){
         if ((!isPaused && !isDialogue) && MenuPanel.gameStart) {
@@ -403,9 +408,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
           }
           checkCollision();
           updateEnemy();
-          if(fireballCounter == 0) {
-            updateShootingBlock();
-          }
+//wwwwwwww
           try {
             updateParticle();
           } catch (IOException e) {
@@ -433,7 +436,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
         repaint();
         delta--;
       }
-      System.out.println(Thread.currentThread());
+      //System.out.println(Thread.currentThread());
     }
 
   }
@@ -452,7 +455,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
   public void updateShootingBlock(){
     for(Tile i: shootingTiles){
       if(i.shootingDir.equals("left")){
-        //fireballs.add(new FireBall(i.x,i.y,80,41,-1,0))
+        //fireballs.add(new FireBall(i.x,i.y,80,41,-1,0,"left"));
       }
     }
   }