From 315bcf8dd6447eb588aa445e4818b42473a914cc Mon Sep 17 00:00:00 2001
From: "Erica.Gogova" <erica.gogova@yahoo.com>
Date: Fri, 27 Jun 2025 10:13:19 +0100
Subject: [PATCH 1/2] #2 create a powerup that when shot it will increase the
 shooting speed

---
 .../java/org/ergasia/javaspacegame/Ammo.java  |   3 +
 .../java/org/ergasia/javaspacegame/Panel.java |  34 ++++++-
 .../ergasia/javaspacegame/PowerUpFuel.java    |  89 ++++++++++++++++++
 src/main/resources/gasolina.png               | Bin 0 -> 1645 bytes
 4 files changed, 124 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java
 create mode 100644 src/main/resources/gasolina.png

diff --git a/src/main/java/org/ergasia/javaspacegame/Ammo.java b/src/main/java/org/ergasia/javaspacegame/Ammo.java
index 6655822..de6dd8c 100644
--- a/src/main/java/org/ergasia/javaspacegame/Ammo.java
+++ b/src/main/java/org/ergasia/javaspacegame/Ammo.java
@@ -87,6 +87,9 @@ public void fire(){
 		dy = 5;
 	}
 
+	public void setFirespeed() {
+		this.dy= this.dy*100;
+	}
     /**
      * if the player typed the right keyboard button
      * the dx value increases, so the object moves right.
diff --git a/src/main/java/org/ergasia/javaspacegame/Panel.java b/src/main/java/org/ergasia/javaspacegame/Panel.java
index 7a7ff93..61fd801 100644
--- a/src/main/java/org/ergasia/javaspacegame/Panel.java
+++ b/src/main/java/org/ergasia/javaspacegame/Panel.java
@@ -74,6 +74,8 @@ public class Panel extends JPanel implements ActionListener, KeyListener {
     private boolean endGame = false;
 	/*Image of the background */
     private Image bg;
+	private PowerUpFuel fuel;
+	private int frameCounter = 0;
 
 
 	/**
@@ -104,7 +106,8 @@ public Panel() {
         	ufos.add(new Ufo()); //Creating the Ufo Objects
         }
 
-        timer = new Timer(16, this);// ~= 60fps.
+
+		timer = new Timer(16, this);// ~= 60fps.
         timer.start();//Starting the thread.
 
     }
@@ -187,6 +190,15 @@ private void doDrawing(Graphics g) {
 
         g2d.drawImage(ship.getImage(), ship.getX(), ship.getY() - 25/*the height of the image*/, this);
 
+		if (fuel!= null && fuel.getImage() != null) {
+			if (!fuel.fuelCheck()){
+				g2d.drawImage(fuel.getImage(), fuel.getX(), fuel.getY(), this);
+			}
+		}
+		else{
+			System.out.println("Fuel is "+frameCounter);
+
+		}
     }
 
     /**
@@ -197,7 +209,25 @@ private void doDrawing(Graphics g) {
      */
     @Override
     public void actionPerformed(ActionEvent e) {
+		frameCounter++;
+		if (fuel != null && !fuel.fuelCheck()) {
+			fuel.checkForCollision(ammos);
+		}
+		int duration = 300;
+		if (fuel != null && fuel.isActive()){
+			for(int i=0; i<ammos.size(); i++){
+				ammos.get(i).setFirespeed();;
+			}
+
+			duration --;
+			if (duration <=0) {
+				fuel.setActive(false);
+			}
 
+		}
+		if (frameCounter == 200) {
+			fuel= new PowerUpFuel();
+		}
     	//if stage is beaten this if statement is responsible for the setup for the next stage.
     	if(restart){
 			for(int i=0; i<numUfo; i++){
@@ -245,7 +275,7 @@ public void actionPerformed(ActionEvent e) {
 		}
 
 
-        repaint();//Calls the paintComponent method.
+		repaint();//Calls the paintComponent method.
     }
 
 	/**
diff --git a/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java b/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java
new file mode 100644
index 0000000..4245e82
--- /dev/null
+++ b/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java
@@ -0,0 +1,89 @@
+package org.ergasia.javaspacegame;
+
+import java.awt.Image;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.Random;
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
+
+public class PowerUpFuel {
+    /*X dimension of the object */
+    private int x;
+    /*Y dimension of the object */
+    private int y;
+    /*The width of the object */
+    private int width;
+    /*The height of the object */
+    private int height;
+    private Image image;
+    /*In this variable is saved the total score */
+    /*Random object */
+    private Random rand;
+    private boolean fuelhit;
+    private boolean isActive=false;
+
+    public PowerUpFuel() {
+        ImageIcon ii = null;
+        try {
+            ii = new ImageIcon(ImageIO.read(Objects.requireNonNull(getClass().getResourceAsStream("/gasolina.png"))));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        image = ii.getImage();
+        rand = new Random();
+
+        do{
+            x = 40 + rand.nextInt(720);
+            y = 30 + rand.nextInt(440);
+        }while(x > 642 && y < 137);
+
+        width = image.getWidth(null);
+        height = image.getHeight(null);
+    }
+    public Image getImage() {
+        return image;
+    }
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+
+    public void checkForCollision(ArrayList<Ammo> ammos) {
+        if (fuelhit) return;
+
+        for(int i=0; i<ammos.size(); i++){
+
+            int ammoX = ammos.get(i).getX();
+            int ammoY = ammos.get(i).getY();
+            int ammoWidth = ammos.get(i).getWidth();
+            int ammoHeight = ammos.get(i).getHeight();
+
+            if(ammoY + ammoHeight > y && ammoY + ammoHeight < y + height){
+                if(ammoX + ammoWidth > x && ammoX < x + width){
+                    image = null;
+                    fuelhit = true;
+                    boolean isActive = true;
+                }
+            }
+
+        }
+
+    }
+    public boolean fuelCheck(){
+        return fuelhit;
+    }
+
+    public boolean isActive(){
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        this.isActive = active;
+    }
+}
diff --git a/src/main/resources/gasolina.png b/src/main/resources/gasolina.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a25a6d706174cded9b2a32d3db1b7caffc63e1b
GIT binary patch
literal 1645
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

literal 0
HcmV?d00001


From d04907d50e6bdb3a4c1aab3be7000932d1906544 Mon Sep 17 00:00:00 2001
From: "Erica.Gogova" <erica.gogova@yahoo.com>
Date: Fri, 27 Jun 2025 14:05:16 +0100
Subject: [PATCH 2/2] #2 create a powerup that when shot it will increase the
 shooting speed

---
 .../java/org/ergasia/javaspacegame/Ammo.java  | 13 ++++++-
 .../java/org/ergasia/javaspacegame/Panel.java | 34 ++++++++++++++-----
 .../ergasia/javaspacegame/PowerUpFuel.java    | 10 +++---
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/ergasia/javaspacegame/Ammo.java b/src/main/java/org/ergasia/javaspacegame/Ammo.java
index de6dd8c..d4745ed 100644
--- a/src/main/java/org/ergasia/javaspacegame/Ammo.java
+++ b/src/main/java/org/ergasia/javaspacegame/Ammo.java
@@ -30,6 +30,7 @@ public class Ammo {
     private Image image;
     /*This boolean variable is used for the shot system*/
     private boolean check = false;
+	private boolean updatedSpeed = false;
 
     /**
      * The Constructor.
@@ -88,7 +89,17 @@ public void fire(){
 	}
 
 	public void setFirespeed() {
-		this.dy= this.dy*100;
+		if (this.dy<=5) {
+			this.dy = this.dy * 3;
+			updatedSpeed=true;
+		}
+
+	}
+
+
+
+	public void resetSpeed() {
+			this.dy = 5;
 	}
     /**
      * if the player typed the right keyboard button
diff --git a/src/main/java/org/ergasia/javaspacegame/Panel.java b/src/main/java/org/ergasia/javaspacegame/Panel.java
index 61fd801..5b90fdf 100644
--- a/src/main/java/org/ergasia/javaspacegame/Panel.java
+++ b/src/main/java/org/ergasia/javaspacegame/Panel.java
@@ -76,6 +76,7 @@ public class Panel extends JPanel implements ActionListener, KeyListener {
     private Image bg;
 	private PowerUpFuel fuel;
 	private int frameCounter = 0;
+	private int fuelEffectDuration = 300;
 
 
 	/**
@@ -196,7 +197,7 @@ private void doDrawing(Graphics g) {
 			}
 		}
 		else{
-			System.out.println("Fuel is "+frameCounter);
+			//System.out.println("Fuel is "+frameCounter);
 
 		}
     }
@@ -212,20 +213,35 @@ public void actionPerformed(ActionEvent e) {
 		frameCounter++;
 		if (fuel != null && !fuel.fuelCheck()) {
 			fuel.checkForCollision(ammos);
+
 		}
-		int duration = 300;
-		if (fuel != null && fuel.isActive()){
-			for(int i=0; i<ammos.size(); i++){
-				ammos.get(i).setFirespeed();;
+
+		if (fuel != null && fuel.fuelCheck()){
+
+			// or 300 if using frames
+			// Set all ammo to be fast
+
+			for (Ammo ammo : ammos) {
+				ammo.setFirespeed();
 			}
 
-			duration --;
-			if (duration <=0) {
-				fuel.setActive(false);
+
+
+			fuelEffectDuration--;
+			System.out.println(fuelEffectDuration);
+			if (fuelEffectDuration <= 0) {
+					fuel.changefuelhit();// end the powerup
+
+					fuelEffectDuration = 300;
+					// Reset ammo speeds if needed
+					for (Ammo ammo : ammos) {
+						ammo.resetSpeed(); // You may need to make this method
+
+				}
 			}
 
 		}
-		if (frameCounter == 200) {
+		if (frameCounter == 100) {
 			fuel= new PowerUpFuel();
 		}
     	//if stage is beaten this if statement is responsible for the setup for the next stage.
diff --git a/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java b/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java
index 4245e82..d745d15 100644
--- a/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java
+++ b/src/main/java/org/ergasia/javaspacegame/PowerUpFuel.java
@@ -69,6 +69,7 @@ public void checkForCollision(ArrayList<Ammo> ammos) {
                     image = null;
                     fuelhit = true;
                     boolean isActive = true;
+
                 }
             }
 
@@ -79,11 +80,10 @@ public boolean fuelCheck(){
         return fuelhit;
     }
 
-    public boolean isActive(){
-        return isActive;
-    }
 
-    public void setActive(boolean active) {
-        this.isActive = active;
+
+    public void changefuelhit() {
+        this.fuelhit = false;
+     ;
     }
 }