From d071e51c5bead8c14e37f087e44d134bc540d38b Mon Sep 17 00:00:00 2001
From: Chara1236 <Charliezhao06@gmail.com>
Date: Sun, 19 Jun 2022 16:20:31 -0400
Subject: [PATCH] ignore

---
 saves/Level1.txt   |  4 ++--
 src/FireBall.java  | 16 +++++++++++++++-
 src/GamePanel.java |  2 +-
 src/Player.java    |  7 +------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/saves/Level1.txt b/saves/Level1.txt
index 77da5e2..da9ae01 100644
--- a/saves/Level1.txt
+++ b/saves/Level1.txt
@@ -12,7 +12,7 @@ sssssssssssssssssd
 sssssssssssssssssd                                      zxc               asd  asd     zxxxxxc         zxxxxxxxllllxxxxxxxxc                  ad
 sssssssssssssssssd                                                  1     zxc  zxc                     vvvvvvvvwwwwvvvvvvvvv                  ad
 sssssssssssssssssd     qe                                                                              vvvvvvvvvvvvvvvvvvvvv                  ad
-sssssssssssssssssdlllllad                2          hqwwwwwwwwe                                        vvvvvvvvvvvvvvvvvvvvv                  ad
+sssssssssssssssssdlllllad                2           qwwwwwwwwe                                        vvvvvvvvvvvvvvvvvvvvv                  ad
 sssssssssssssssssdlllllad       bbb      s          qrsssslssstwe                                      vvvvvvvvvvvvvvvvvvvvv                  ad
-sssssssssssssssssdllllladbb              s     ooqwwrssssllssssstwe                !!!           qwe   vvvvvvvvvvvvvvvvvvvvv      +           ad
+sssssssssssssssssdllllladbb              s     ooqwwrssssllssssstwe          !  b h !!!           qwe   vvvvvvvvvvvvvvvvvvvvv      +           ad
 ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww3
\ No newline at end of file
diff --git a/src/FireBall.java b/src/FireBall.java
index 5a456e6..f40b0bd 100644
--- a/src/FireBall.java
+++ b/src/FireBall.java
@@ -6,7 +6,10 @@ public class FireBall extends GenericSprite{
     private int realX;
 
     public boolean dead;
-    public FireBall(int x, int y, int height, int width, int xv, int yv, String dir) {
+
+    public static final int height = 8;
+    public static final int width = 16;
+    public FireBall(int x, int y, int xv, int yv, String dir) {
         super(x, y, height, width);
         xVelocity = xv;
         yVelocity = yv;
@@ -20,6 +23,13 @@ public class FireBall extends GenericSprite{
     public void update(){
         realX = x-GameFrame.game.camera.x;
     }
+
+    public boolean collidePlayer(Player p){
+        if(realX+width>p.x&&realX<p.x+Player.PLAYER_WIDTH&&y-p.y<Player.PLAYER_HEIGHT&&p.y-y<height){
+            return true;
+        }
+        return false;
+    }
     public void move(){
         update();
         if(canUpdate(xVelocity,yVelocity)) {
@@ -28,6 +38,10 @@ public class FireBall extends GenericSprite{
         } else {
             dead = true;
         }
+        if(collidePlayer(GameFrame.game.player)){
+            dead = true;
+            GameFrame.game.player.reset();
+        }
     }
     public void draw(Graphics g) throws IOException {
        g.drawImage(GamePanel.getImage(spritePath),x-GameFrame.game.camera.x,y,null);
diff --git a/src/GamePanel.java b/src/GamePanel.java
index bb6a205..633344b 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -467,7 +467,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-20,i.y+Tile.length/2,8,16,-fireballSpeed,0,"left"));
+        fireballs.add(new FireBall(i.x-20,i.y+Tile.length/2-FireBall.height/2,-fireballSpeed,0,"left"));
       }
     }
   }
diff --git a/src/Player.java b/src/Player.java
index e109f73..0e807ff 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -130,12 +130,7 @@ public class Player extends GenericSprite {
     return canUpdate;
   }
 
-//  public boolean SteelCollide(GenericSprite g, int x, int y){
-//    if(x+WIDTH>tile.realX&&x<tile.realX+Tile.length&&y-tile.y<Tile.length&&tile.y-y<HEIGHT){
-//      return true;
-//    }
-//    return false;
-//  }
+
   public void updatePlaceSteel(int x, int y){
     if(this.y<0){
       canPlaceSteel = false;