Merge pull request #142 from UQcsse3200/Team-2--Alasdair-Branch

Team 2 code smell fixes
UQcsse3200 · Sep 12, 2023 · 6b321e6 · 6b321e6
2 parents d067d15 + 6a6575a
commit 6b321e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/TowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/TowerCombatTask.java
@@ -224,9 +224,7 @@ private boolean isTargetVisible() {
     private void changeFireRateInterval(int perMinute) {
         float oldFireSpeed = 1/fireRateInterval;
         float newFireSpeed = oldFireSpeed + perMinute/60f;
-        if (newFireSpeed == 0) {
-            return;
-        } else {
+        if (newFireSpeed != 0) {
             fireRateInterval = 1 / newFireSpeed;
         }
     }

diff --git a/source/core/src/main/com/csse3200/game/components/tower/TowerUpgraderComponent.java b/source/core/src/main/com/csse3200/game/components/tower/TowerUpgraderComponent.java
@@ -2,17 +2,23 @@
 
 import com.csse3200.game.components.CombatStatsComponent;
 import com.csse3200.game.components.Component;
-import static java.lang.Math.round;
 
 /**
  * Listens for an event from the popup menu to upgrade
  *     the turret entity this component is attached to.
  */
 public class TowerUpgraderComponent extends Component {
+    /**
+     * A set of specifiers allowing upgrade event triggers to specify the type of upgrade being requested.
+     */
     public enum UPGRADE {
         ATTACK, MAXHP, FIRERATE, REPAIR
     }
 
+    /**
+     * Called when the entity is created and registered.
+     * Sets up an event listener to detect when an upgrade request is sent to this tower.
+     */
     @Override
     public void create() {
         super.create();
@@ -28,10 +34,10 @@ public void create() {
      */
     void upgradeTower(UPGRADE upgradeType, int value) {
         switch (upgradeType) {
-            case ATTACK -> {upgradeTowerAttack(value);}
-            case MAXHP -> {upgradeTowerMaxHealth(value);}
-            case FIRERATE -> {getEntity().getEvents().trigger("addFireRate", value);}
-            case REPAIR -> {repairTower();}
+            case ATTACK -> upgradeTowerAttack(value);
+            case MAXHP -> upgradeTowerMaxHealth(value);
+            case FIRERATE -> getEntity().getEvents().trigger("addFireRate", value);
+            case REPAIR -> repairTower();
         }
     }