Fix code smells DroidCombatTask (still remains 1)

UQcsse3200 · Oct 11, 2023 · 2e1107b · 2e1107b
1 parent 7d8efa9
commit 2e1107b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/DroidCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/DroidCombatTask.java
@@ -48,12 +48,13 @@ public class DroidCombatTask extends DefaultTask implements PriorityTask {
     public enum STATE {
         IDLE, UP, DOWN, SHOOT_UP, SHOOT_DOWN, WALK, DIE
     }
-    public STATE towerState = STATE.WALK;
+    private STATE towerState = STATE.WALK;
 
     /**
      * @param priority Task priority when targets are detected (0 when nothing detected). Must be a positive integer.
      * @param maxRange Maximum effective range of the weapon tower. This determines the detection distance of targets
      */
+
     public DroidCombatTask(int priority, float maxRange) {
         this.priority = priority;
         this.maxRange = maxRange;
@@ -90,7 +91,7 @@ public void update() {
             } else {
                 endTime = timeSource.getTime() + (INTERVAL * 1000);
             }
-            }
+        }
     }
 
     /**
@@ -166,13 +167,6 @@ public void updateTowerState() {
             }
         }
     }
-    /**
-     * For stopping the running task
-     */
-    @Override
-    public void stop() {
-        super.stop();
-    }
 
     /**
      * Returns the current state of the tower.
@@ -214,4 +208,21 @@ public float getFireRateInterval() {
         return fireRateInterval;
     }
 
+    /**
+     * Function for getting the tower's state
+     *
+     * @return The tower's state
+     */
+    public STATE getTowerState() {
+        return towerState;
+    }
+
+    /**
+     * Function setting the tower state
+     *
+     * @param newState New state needs to setted to the tower state
+     */
+    public void setTowerState(STATE newState) {
+        this.towerState = newState;
+    }
 }
diff --git a/source/core/src/test/com/csse3200/game/components/tasks/DroidCombatTaskTest.java b/source/core/src/test/com/csse3200/game/components/tasks/DroidCombatTaskTest.java
@@ -64,7 +64,7 @@ public void testUpdateTowerStateWithTargetInRange() {
         entity.getEvents().addListener(DroidCombatTask.SHOOT_DOWN,shootDown);
         //Jump to IDLE state
         droidCombatTask.start();
-        droidCombatTask.towerState = DroidCombatTask.STATE.IDLE;
+        droidCombatTask.setTowerState(DroidCombatTask.STATE.IDLE);
 
         ServiceLocator.getPhysicsService().getPhysics().update();
         entity.update();
@@ -110,7 +110,7 @@ public void testUpdateTowerStateWithTargetNotInRange() {
         entity.getEvents().addListener(DroidCombatTask.IDLE, idle);
         entity.getEvents().addListener(DroidCombatTask.ATTACK_UP,attackUp);
         //Jump to IDLE state
-        droidCombatTask.towerState = DroidCombatTask.STATE.IDLE;
+        droidCombatTask.setTowerState(DroidCombatTask.STATE.IDLE);
 
         ServiceLocator.getPhysicsService().getPhysics().update();
         entity.update();