From 6af212ab1cd171881d04d7aa3adbf59ee1045f19 Mon Sep 17 00:00:00 2001
From: bob <lol@lol.com>
Date: Wed, 8 Jun 2022 11:23:57 -0400
Subject: [PATCH] Added Particles

---
 saves/Level2.txt      |  2 +-
 saves/Level3.txt      | 18 ++++++++++++++++++
 src/GamePanel.java    | 11 +++++++++++
 src/LevelManager.java |  4 ++++
 src/Particle.java     | 25 +++++++++++++++++++++++++
 src/Player.java       | 15 +++++++++++----
 6 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 saves/Level3.txt
 create mode 100644 src/Particle.java

diff --git a/saves/Level2.txt b/saves/Level2.txt
index 73051f7..278de15 100644
--- a/saves/Level2.txt
+++ b/saves/Level2.txt
@@ -14,5 +14,5 @@ sssssssssssssssssd              bbb                                    1     zxc
 sssssssssssssssssdbbbbbbbbbbbbbbbbbbbbbbb
 sssssssssssssssssd                                   qwwwwwwwwe
 sssssssssssssssssd                                  qrsssssssstwe
-sssssssssssssssssd      bbb                         qwwrssssssssssstwe                              qwe
+sssssssssssssssssd      bbb                         qwwrssssssssssstwe                              qwe   +
 ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrstwwwwww3
\ No newline at end of file
diff --git a/saves/Level3.txt b/saves/Level3.txt
new file mode 100644
index 0000000..77fe74c
--- /dev/null
+++ b/saves/Level3.txt
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
\ No newline at end of file
diff --git a/src/GamePanel.java b/src/GamePanel.java
index 93dac40..e1340f7 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -44,6 +44,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
   public static Tile[][]map = new Tile[300][18];
   public static ArrayList<NonPlayer>enemy = new ArrayList<NonPlayer>();
 
+  public static ArrayList<Particle>particles = new ArrayList<Particle>();
   public static StickyBomb b;
   public static Camera camera;
 
@@ -140,6 +141,13 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
     }
     playerFrameCounter += player.draw(g, playerFrame);
     b.draw(g);
+    for(int i=0; i<particles.size(); i++){
+      particles.get(i).draw(g);
+      particles.get(i).lifeSpan--;
+      if(particles.get(i).lifeSpan<=0){
+        particles.remove(i);
+      }
+    }
   g.drawString(camera.x+" "+((camera.x+GAME_WIDTH)/Tile.length),100,100);
     g.drawString(b.x+" "+((b.x+GamePanel.GAME_WIDTH)/Tile.length-4),100,200);
   }
@@ -152,6 +160,9 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
       n.move();
     }
     b.move();
+    for (Particle p: particles) {
+      p.move();
+    }
   }
 
   //handles all collision detection and responds accordingly
diff --git a/src/LevelManager.java b/src/LevelManager.java
index 4565684..137a9b3 100644
--- a/src/LevelManager.java
+++ b/src/LevelManager.java
@@ -18,6 +18,10 @@ public class LevelManager {
             xSpawn = 200;
             ySpawn = 0;
             filePath = "saves/Level2.txt";
+        } else if(level == 3){
+            xSpawn = 200;
+            ySpawn = 0;
+            filePath = "saves/Level3.txt";
         }
         try {
             MapReader.inputMap(filePath);
diff --git a/src/Particle.java b/src/Particle.java
new file mode 100644
index 0000000..dee110c
--- /dev/null
+++ b/src/Particle.java
@@ -0,0 +1,25 @@
+import java.awt.*;
+
+public class Particle extends GenericSprite{
+    public static final int small = 3;
+    public static final int big = 10;
+
+    public int xVelocity;
+
+    public int yVelocity;
+
+    public int lifeSpan = 10;
+    public Particle(int x, int y, int xVelocity, int yVelocity){
+        super(x,y,(int)(Math.random()*(big-small+1))+3, (int)(Math.random()*(big-small+1))+3);
+        this.xVelocity = xVelocity;
+        this.yVelocity = yVelocity;
+    }
+    public void move(){
+    x+=xVelocity;
+    y+=yVelocity;
+    }
+    public void draw(Graphics g){
+    g.drawRect(x-GamePanel.camera.x,y,WIDTH,HEIGHT);
+    }
+
+}
diff --git a/src/Player.java b/src/Player.java
index df07202..5ddb1b5 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -157,11 +157,18 @@ public class Player extends GenericSprite {
 
     }
 
-    if(rightPressed && xVelocity<5){
-      xVelocity+=1;
+    if(rightPressed){
+      if(isGrounded){
+        GamePanel.particles.add(new Particle(x+GamePanel.camera.x+WIDTH/2,(int)(y+HEIGHT*0.8),3,3));
+      }
+      if(xVelocity<5) {
+        xVelocity += 1;
+      }
     }
-    if(leftPressed && xVelocity>-5) {
-      xVelocity -= 1;
+    if(leftPressed) {
+      if(xVelocity>-5) {
+        xVelocity -= 1;
+      }
     }
     if(upPressed&isGrounded){
       y-=1;