Fixed issue where mob count was not decreasing. Added in updateEnemyC…

…ount call to MobTask
UQcsse3200 · Oct 14, 2023 · ad771f0 · ad771f0
1 parent 3d08ddf
commit ad771f0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
@@ -293,11 +293,12 @@ public void create() {
     spawnTerrain();
 
     // Set up infrastructure for end game tracking
-    player = spawnPlayer();
+//    player = spawnPlayer();
 
-   waves = WaveFactory.createWaves();
-   spawnEntity(waves);
-   waves.getEvents().addListener("spawnWave", this::spawnMob);
+    logger.info("Creating waves");
+    waves = WaveFactory.createWaves();
+    spawnEntity(waves);
+    waves.getEvents().addListener("spawnWave", this::spawnMob);
     // spawnCoat();
 //    spawnDodgingDragonKnight(17,4);
 //    spawnDeflectWizard(17, 3);

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java
@@ -105,6 +105,7 @@ public void update() {
             movementTask.stop();
             deathFlag = true;
         } else if (deathFlag && animation.isFinished()) {
+            ServiceLocator.getWaveService().updateEnemyCount();
             mob.setFlagForDelete(true);
         }
 

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/waves/WaveTask.java b/source/core/src/main/com/csse3200/game/components/tasks/waves/WaveTask.java
@@ -82,7 +82,7 @@ public void start() {
     this.level = (LevelWaves) this.owner.getEntity();
     this.currentWave = level.getWave(currentWaveIndex);
     ServiceLocator.getWaveService().setEnemyCount(currentWave.getSize());
-//    logger.info("Wave {} starting with {} enemies", currentWaveIndex, ServiceLocator.getWaveService().getEnemyCount());
+    logger.info("Wave {} starting with {} enemies", currentWaveIndex, ServiceLocator.getWaveService().getEnemyCount());
     this.waveStart.play();
     // endTime = globalTime.getTime() + (SPAWNING_INTERVAL * 1000);
   }
@@ -116,7 +116,6 @@ public void update() {
           ServiceLocator.getWaveService().setNextWaveTime(nextWaveAt);
         } else {
           if (globalTime.getTime() >= nextWaveAt || ServiceLocator.getWaveService().shouldSkip()) {
-            logger.info("Next wave starting");
             ServiceLocator.getWaveService().toggleDelay();
             currentWaveIndex++;
             ServiceLocator.getWaveService().setNextWaveTime(0);
@@ -128,6 +127,7 @@ public void update() {
             ServiceLocator.getWaveService().setWaveCount(currentWaveIndex);
             this.currentWave = this.level.getWave(currentWaveIndex);
             ServiceLocator.getWaveService().setEnemyCount(currentWave.getSize());
+            logger.info("Next wave {} starting with {} enemies", currentWaveIndex, ServiceLocator.getWaveService().getEnemyCount());
             //endTime = globalTime.getTime() + (SPAWNING_INTERVAL * 1000L); // reset end time
           }
         }

diff --git a/source/core/src/main/com/csse3200/game/entities/factories/WaveFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/WaveFactory.java
@@ -53,7 +53,7 @@ public static Entity createWaves() {
         break;
       default:
         difficulty = 2;
-        maxWaves = 5;
+        maxWaves = 2; //change back to 5
     }
 
     LevelWaves level = createLevel(difficulty, maxWaves, chosenLevel);