merge from main, fixed engineer and mob outside map bugs

UQcsse3200 · Oct 17, 2023 · 6bf18e3 · 6bf18e3
1 parent 7ecd745
commit 6bf18e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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
@@ -136,7 +136,7 @@ public void update() {
         if ((mob.getComponent(CombatStatsComponent.class).getHealth() <= 0 && !deathFlag)) {
             // decrement engineer count
             // ! tests failing because of textbox
-            ServiceLocator.getGameEndService().updateEngineerCount();
+//            ServiceLocator.getGameEndService().updateEngineerCount();
             changeState(State.DEATH);
             animate();
             movementTask.stop();

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/waves/LevelWaves.java b/source/core/src/main/com/csse3200/game/components/tasks/waves/LevelWaves.java
@@ -63,7 +63,7 @@ public WaveClass getWave(int index) {
     public void spawnWave() {
         if (gameTime.getTime() >= startTime + spawnDelay * 1000) {
             do {
-                currentRandom = MathUtils.random(0, ServiceLocator.getMapService().getHeight());
+                currentRandom = MathUtils.random(0, ServiceLocator.getMapService().getHeight() - 1);
             } while (currentRandom == previousRandom);
             ServiceLocator.getWaveService().setNextLane(currentRandom);
             GridPoint2 randomPos = new GridPoint2(19, currentRandom);