Improved cooldown timer for tornados

Author: adrian-bu

game/src/main/java/dev/game/spacechaos/game/entities/component/combat/WeaponInventoryComponent.java

@@ -21,6 +21,7 @@ public class WeaponInventoryComponent extends BaseComponent {
     private BaseWeapon leftWeapon;
     private ArrayList<BaseWeapon> rightWeapons;
     private int rightWeaponIndex = 0;
+    private boolean canShotRightFirstSlot = false;
 
     // The right weapon can later be replaced by a list, so you can switch your
     // equipped weapon (e.g. via scrolling)
@@ -65,19 +66,26 @@ public void addAmmoToRightWeapon(int add) {
     }
 
     public boolean canShootNowWithLeftWeapon() {
-        return leftWeapon.canShootNow();
+        return leftWeapon.canShootLeftNow();
     }
 
     public boolean canShootNowWithRightWeapon() {
-        return rightWeapons.get(rightWeaponIndex).canShootNow();
+        return rightWeapons.get(rightWeaponIndex).canShootRightNow();
     }
 
     public void setLastShotWithLeftWeapon() {
         leftWeapon.setLastShot();
     }
 
     public void setLastShotWithRightWeapon() {
-        rightWeapons.get(rightWeaponIndex).setLastShot();
+
+        if (canShotRightFirstSlot) {
+            rightWeapons.get(rightWeaponIndex).setLastShotRightFirstSlot();
+            this.canShotRightFirstSlot = false;
+        } else {
+            rightWeapons.get(rightWeaponIndex).setLastShotRightSecondSlot();
+            this.canShotRightFirstSlot = true;
+        }
     }
 
 }

game/src/main/java/dev/game/spacechaos/game/entities/factory/PlayerFactory.java

@@ -102,7 +102,7 @@ public static Entity createPlayer(EntityManager ecs, float x, float y, Texture t
 
         // add component for shooting
         BaseWeapon leftWeapon = new BaseWeapon(200, 1);
-        BaseWeapon rightWeapon = new BaseWeapon(100, 10, 20);
+        BaseWeapon rightWeapon = new BaseWeapon(500, 500, 10, 20);
         player.addComponent(new WeaponInventoryComponent(leftWeapon, rightWeapon));
 
         // add component for shield

game/src/main/java/dev/game/spacechaos/game/weapons/BaseWeapon.java

@@ -10,14 +10,25 @@
 public class BaseWeapon {
 
     private long lastShot = 0;
+    private long lastShotRightFirstSlot = 0;
+    private long lastShotRightSecondSlot = 0;
+
     private int currentAmmo;
     private int maxAmmo;
-    private int cooldown;
 
-    public BaseWeapon(int cooldown, int ammo, int maxAmmo) {
-        this.cooldown = cooldown;
+    //cooldown of right and left weapon
+    private int cooldownLeft;
+    private int cooldownRight;
+
+    public BaseWeapon(int cooldownLeft, int cooldownRight, int ammo, int maxAmmo) {
+        this.cooldownLeft = cooldownLeft;
         this.currentAmmo = ammo;
         this.maxAmmo = maxAmmo;
+        this.cooldownRight = cooldownRight;
+    }
+
+    public BaseWeapon(int cooldown, int ammo, int maxAmmo) {
+        this(cooldown, 0, ammo, maxAmmo);
     }
 
     public BaseWeapon(int cooldown, int ammo) {
@@ -50,13 +61,31 @@ public void setLastShot() {
         lastShot = System.currentTimeMillis();
     }
 
-    public boolean canShootNow() {
-        if (System.currentTimeMillis() - lastShot > cooldown && currentAmmo > 0) {
+    public void setLastShotRightFirstSlot() {
+        lastShotRightFirstSlot = System.currentTimeMillis();
+    }
+
+    public void setLastShotRightSecondSlot() {
+        lastShotRightSecondSlot = System.currentTimeMillis();
+    }
+
+    public boolean canShootLeftNow() {
+
+        if (System.currentTimeMillis() - lastShot > cooldownLeft && currentAmmo > 0) {
             // lastShot = System.currentTimeMillis();
             return true;
         } else {
             return false;
         }
     }
 
+    public boolean canShootRightNow() {
+        if (System.currentTimeMillis() - lastShotRightFirstSlot > cooldownRight && currentAmmo > 0) {
+            return true;
+        } else if (System.currentTimeMillis() - lastShotRightSecondSlot > cooldownRight && currentAmmo > 0) {
+            return true;
+        }
+        return false;
+    }
+
 }