getJumpPos now handles the case where boundary has shifted casugin de…

…mon to be out of bounds
UQcsse3200 · Sep 20, 2023 · be35ccc · be35ccc
1 parent 9191bd2
commit be35ccc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 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
@@ -235,7 +235,7 @@ public void create() {
 
     // Set up infrastructure for end game tracking
     player = spawnPlayer();
-    player.getEvents().addListener("spawnWave", this::spawnWave);
+    //player.getEvents().addListener("spawnWave", this::spawnWave);
 
     //playMusic();
 

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/bosstask/DemonBossTask.java b/source/core/src/main/com/csse3200/game/components/tasks/bosstask/DemonBossTask.java
@@ -115,7 +115,7 @@ public void run() {
                     xLeftBoundary -= 2;
                     xRightBoundary -= 2;
                 }
-            }, MOVE_FORWARD_DELAY);
+            }, MOVE_FORWARD_DELAY * i);
         }
     }
 
@@ -218,6 +218,7 @@ private Array<Entity> getNearbyHumans() {
     }
 
     private void jump(Vector2 finalPos) {
+        System.out.println(finalPos);
         changeState(DemonState.SMASH);
         isJumping = true;
 
@@ -230,6 +231,12 @@ private void jump(Vector2 finalPos) {
     }
 
     private Vector2 getJumpPos() {
+        // check if boundary has shifted causing demon to be out of bounds
+        if (currentPos.x > xRightBoundary) {
+            jumpPos = new Vector2(currentPos.x - JUMP_DISTANCE, currentPos.y); //jump back into boundary
+            return jumpPos;
+        }
+
         float randomAngle = MathUtils.random(0, 2 * MathUtils.PI);
         float x = JUMP_DISTANCE * MathUtils.cos(randomAngle);
         float y = JUMP_DISTANCE * MathUtils.sin(randomAngle);