From 0a347143126d3b0d016b55896da9c703c545dcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Fri, 20 Oct 2023 19:04:38 +0200
Subject: [PATCH] Correct reload and fire.
---
src/main/java/lab/BulletAnimated.java | 16 +++++++---------
src/main/java/lab/GameController.java | 1 -
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/lab/BulletAnimated.java b/src/main/java/lab/BulletAnimated.java
index 0340e67..9dc8e04 100644
--- a/src/main/java/lab/BulletAnimated.java
+++ b/src/main/java/lab/BulletAnimated.java
@@ -73,37 +73,35 @@ public class BulletAnimated implements DrawableSimulable, Collisionable{
position = new Point2D(position.getX(), size / 2);
}
} else {
- fire();
-
+ reload();
}
}
public Rectangle2D getBoundingBox() {
return new Rectangle2D(position.getX(), position.getY() - size, size, size);
}
-
+
public boolean overlaps(Dragon dragon) {
return getBoundingBox().intersects(dragon.getBoundingBox());
}
-
+
public void hitBy(Collisionable other) {
- reload();
+ fire();
}
-
+
public void reload() {
position = start;
speed = initialSpeed;
hitToGround = false;
+ accelerate = true;
}
public void setCanonPower(double value) {
strenghtOfCannon = value;
-
}
-
+
public void fire() {
reload();
- accelerate = true;
}
}
diff --git a/src/main/java/lab/GameController.java b/src/main/java/lab/GameController.java
index b36a006..7532722 100644
--- a/src/main/java/lab/GameController.java
+++ b/src/main/java/lab/GameController.java
@@ -19,7 +19,6 @@ public class GameController {
animationTimer = new DrawingThread(canvas, world);
animationTimer.start();
-
world.setCannonAngle(-45d);
world.setCannonPower(100.);
world.fireBullet();
--
GitLab