fixed tower select bug if 4 towers selected

UQcsse3200 · Oct 16, 2023 · db8dd72 · db8dd72
1 parent 2846aec
commit db8dd72
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/maingame/MainGameDisplay.java b/source/core/src/main/com/csse3200/game/components/maingame/MainGameDisplay.java
@@ -181,16 +181,16 @@ private void setTowers() {
 
         // If no towers set, populate with default towers
         if (towers.isEmpty() || towers.size < 5) {
-            if (towers.isEmpty()) {
-                towers.addAll(defaultTowers);
-            } else {
-                for (TowerType tower : defaultTowers) {
-                    if (towers.size < 5 && !towers.contains(tower, false)) {
-                        towers.add(tower);
-                    }
+//            if (towers.isEmpty()) {
+//                towers.addAll(defaultTowers);
+//            } else {
+            for (TowerType tower : defaultTowers) {
+                if (towers.size < 5 && !towers.contains(tower, true)) {
+                    towers.add(tower);
                 }
             }
         }
+        ServiceLocator.setTowerTypes(towers);
     }
 
     private void createTowerButtons() {
@@ -289,6 +289,10 @@ public void updateLevelProgressBar() {
      * depending on button selection and currency balance
      */
     private void towerUpdate() {
+        // Check for small tower array
+        if (towers.size < 5) {
+            setTowers();
+        }
         // no tower selected, set all to off
         if (ServiceLocator.getCurrencyService().getTower() == null) {
             // toggle all buttons to off

diff --git a/source/core/src/main/com/csse3200/game/input/BuildInputComponent.java b/source/core/src/main/com/csse3200/game/input/BuildInputComponent.java
@@ -51,9 +51,12 @@ public BuildInputComponent(Camera camera) {
         Array<TowerType> defaultTowers = new Array<>();
         defaultTowers.addAll(defaultTowerTypes);
 
-        if (towers.isEmpty()) {
-            ServiceLocator.setTowerTypes(defaultTowers);
-            towers = defaultTowers;
+        if (towers.isEmpty() || towers.size < 5) {
+            for (TowerType tower : defaultTowers) {
+                if (towers.size < 5 && !towers.contains(tower, true)) {
+                    towers.add(tower);
+                }
+            }
         }
     }