diff --git a/src/main/java/lab/BulletAnimated.java b/src/main/java/lab/BulletAnimated.java index 0340e675b26ec6711d33219722cca4118043b84b..9dc8e041ea68fb97b036e9628f607be29a7870d4 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 b36a006721505f9b0951a13fb79c1f1e11799af3..7532722a714a178b0e5279f53a4a91448334c49c 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();