Updated the tesla tower to be direction aware.

EntelectChallenge · Jun 22, 2018 · dd01b24 · dd01b24
1 parent 5282399
commit dd01b24
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/...e/core/src/main/java/za/co/entelect/challenge/core/engine/TowerDefenseRoundProcessor.java b/...e/core/src/main/java/za/co/entelect/challenge/core/engine/TowerDefenseRoundProcessor.java
@@ -86,14 +86,14 @@ private void fireTeslaTowers() throws Exception {
         //Oldest building first.
         playerTeslaTowers.sort(Comparator.comparing(Building::getConstructionTimeLeft));
 
-        for(Building possibleFiringTelsaTower : playerTeslaTowers ){
+        for(Building possibleFiringTeslaTower : playerTeslaTowers ){
 
-            TowerDefensePlayer currentPlayer = towerDefenseGameMap.getPlayer(possibleFiringTelsaTower.getPlayerType());
+            TowerDefensePlayer currentPlayer = towerDefenseGameMap.getPlayer(possibleFiringTeslaTower.getPlayerType());
             int playerEnergy = currentPlayer.getEnergy();
 
-            if(playerEnergy >= possibleFiringTelsaTower.getEnergyPerShot()){
-                currentPlayer.removeEnergy(possibleFiringTelsaTower.getEnergyPerShot());
-                towerDefenseGameMap.fireTeslaTower(possibleFiringTelsaTower);
+            if(playerEnergy >= possibleFiringTeslaTower.getEnergyPerShot()){
+                currentPlayer.removeEnergy(possibleFiringTeslaTower.getEnergyPerShot());
+                towerDefenseGameMap.fireTeslaTower(possibleFiringTeslaTower);
             }
         }
     }

diff --git a/game-engine/domain/src/main/java/za/co/entelect/challenge/entities/TowerDefenseGameMap.java b/game-engine/domain/src/main/java/za/co/entelect/challenge/entities/TowerDefenseGameMap.java
@@ -150,28 +150,37 @@ public void fireTeslaTower(Building teslaBuilding) {
             missileOwner.takesHitByPlayer(teslaBuilding.getWeaponDamage(),missileOwner);
         }
 
-        //Direction in the left  hand as well.
-        for (int x = teslaBuilding.getX() + 1; x <= teslaBuilding.getMaxRange() + teslaBuilding.getX(); x++) {
-            final int nextTargetpoint = x;
-            Building targetToHit;
+        if(direction.equals(Direction.RIGHT)){
+            for (int x = teslaBuilding.getX() + 1; x <= teslaBuilding.getMaxRange() + teslaBuilding.getX(); x++) {
+                possiblyFireTeslaTower(x,possibleTargets,teslaBuilding,missileOwner);
+            }
+        }else{
+            for (int x = teslaBuilding.getX() - 1; x >= teslaBuilding.getX() - teslaBuilding.getMaxRange(); x--) {
+                possiblyFireTeslaTower(x,possibleTargets,teslaBuilding,missileOwner);
+            }
+        }
+    }
+
+    private void possiblyFireTeslaTower(int x, ArrayList<Building> possibleTargets, Building teslaBuilding, TowerDefensePlayer missileOwner){
+        final int nextTargetpoint = x;
+        Building targetToHit;
 
-            ArrayList<Building> targetsInX = new ArrayList<>();
+        ArrayList<Building> targetsInX = new ArrayList<>();
 
-            possibleTargets.stream()
-                    .filter(target -> target.getX() == nextTargetpoint)
-                    .forEach(target -> {
-                        targetsInX.add(target);
-                    });
+        possibleTargets.stream()
+                .filter(target -> target.getX() == nextTargetpoint)
+                .forEach(target -> {
+                    targetsInX.add(target);
+                });
 
-            targetsInX.sort(Comparator.comparing(Building::getY));
+        targetsInX.sort(Comparator.comparing(Building::getY));
 
-            if (targetsInX.size() > 0) {
-                targetToHit = targetsInX.get(0);
+        if (targetsInX.size() > 0) {
+            targetToHit = targetsInX.get(0);
 
-                if (targetToHit != null) {
-                    targetToHit.damageSelfDirectly(teslaBuilding.getWeaponDamage(), missileOwner);
-                    possibleTargets.remove(targetToHit);
-                }
+            if (targetToHit != null) {
+                targetToHit.damageSelfDirectly(teslaBuilding.getWeaponDamage(), missileOwner);
+                possibleTargets.remove(targetToHit);
             }
         }
     }