fixed demon boss inability to sense nearby towers

UQcsse3200 · Oct 11, 2023 · 2897788 · 2897788
1 parent 3887a2c
commit 2897788
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 38 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
@@ -321,11 +321,11 @@ public void create() {
     // Set up infrastructure for end game tracking
     player = spawnPlayer();
 
-    waves = WaveFactory.createWaves();
-    spawnEntity(waves);
-    waves.getEvents().addListener("spawnWave", this::spawnMob);
+//    waves = WaveFactory.createWaves();
+//    spawnEntity(waves);
+//    waves.getEvents().addListener("spawnWave", this::spawnMob);
 //    spawnGregMob(18, 2);
-//    spawnDemonBoss();
+    spawnDemonBoss();
 //    spawnEffectProjectile(new Vector2(10f,2f), PhysicsLayer.NPC, 20, new Vector2(2f,2f), ProjectileEffects.SLOW, false);
 
     spawnScrap();

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
@@ -64,6 +64,7 @@ public class DemonBossTask extends DefaultTask implements PriorityTask {
     private static int xLeftBoundary = 12;
     private ProjectileEffects effect = ProjectileEffects.BURN;
     private boolean aoe = true;
+    private Array<Entity> nearbyEntities;
 
     // Flags
     private boolean startFlag = false;
@@ -167,11 +168,10 @@ public void update() {
             case IDLE -> jump(getJumpPos());
             case SMASH -> {
                 if (jumpComplete()) {
-                    if (getNearbyHumans(SMASH_RADIUS).isEmpty()) {
-                        fireBreath();
-                    }
-                    else {
+                    if (nearbyEntities != null && !nearbyEntities.isEmpty()) {
                         cleave();
+                    } else {
+                        fireBreath();
                     }
                 }
             }
@@ -247,34 +247,34 @@ public int getPriority() {
         return PRIORITY;
     }
 
-    /**
-     * Returns a list of nearby entities with PhysicsLayer.HUMAN.
-     * 
-     * @return nearby entities with the PhysicsLayer of HUMAN
-     */
-    private Array<Entity> getNearbyHumans(int radius) {
-        Array<Entity> nearbyEntities = ServiceLocator.getEntityService().
-                getNearbyEntities(demon, radius);
-        Array<Entity> nearbyHumans = new Array<>();
-
-        // iterate through nearby entities checking if they have desired properties
-        for (int i = 0; i < nearbyEntities.size; i++) {
-            Entity targetEntity = nearbyEntities.get(i);
-            HitboxComponent targetHitbox = targetEntity.getComponent(HitboxComponent.class);
-            if (targetHitbox == null) {
-                break;
-            }
-
-            // check target layer
-            if (!PhysicsLayer.contains(PhysicsLayer.HUMANS, targetHitbox.
-                    getLayer())) {
-                break;
-            }
-
-            nearbyHumans.add(targetEntity);
-        }
-        return nearbyHumans;
-    }
+//    /**
+//     * Returns a list of nearby entities with PhysicsLayer.HUMAN.
+//     *
+//     * @return nearby entities with the PhysicsLayer of HUMAN
+//     */
+//    private Array<Entity> getNearbyHumans(int radius) {
+//        Array<Entity> nearbyEntities = ServiceLocator.getEntityService().
+//                getNearbyEntities(demon, radius);
+//        Array<Entity> nearbyHumans = new Array<>();
+//
+//        // iterate through nearby entities checking if they have desired properties
+//        for (int i = 0; i < nearbyEntities.size; i++) {
+//            Entity targetEntity = nearbyEntities.get(i);
+//            HitboxComponent targetHitbox = targetEntity.getComponent(HitboxComponent.class);
+//            if (targetHitbox == null) {
+//                break;
+//            }
+//
+//            // check target layer
+//            if (!PhysicsLayer.contains(PhysicsLayer.HUMANS, targetHitbox.
+//                    getLayer())) {
+//                break;
+//            }
+//
+//            nearbyHumans.add(targetEntity);
+//        }
+//        return nearbyHumans;
+//    }
 
     /**
      * Changes state of demon and moves it to the desired position.
@@ -346,7 +346,9 @@ private Vector2 getJumpPos() {
      */
     private boolean jumpComplete() {
         if (animation.isFinished() && isJumping) {
-            applyAoeDamage(getNearbyHumans(SMASH_RADIUS), SMASH_DAMAGE); // do damage upon landing
+            nearbyEntities = ServiceLocator.getEntityService().getEntitiesInLayer(
+                    demon, SMASH_RADIUS, PhysicsLayer.HUMANS);
+            applyAoeDamage(nearbyEntities, SMASH_DAMAGE); // do damage upon landing
             isJumping = false;
             jumpTask.stop();
             return true;

diff --git a/source/core/src/main/com/csse3200/game/entities/factories/MobBossFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/MobBossFactory.java
@@ -291,7 +291,6 @@ public static Entity createBaseBoss() {
                 .addComponent(new TouchAttackComponent(PhysicsLayer.HUMANS, 1.5f));
 
 //        PhysicsUtils.setScaledCollider(boss, 0.9f, 0.4f);
-
         return boss;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -291,7 +291,6 @@ public static Entity createBaseBoss() { @@
                     .addComponent(new TouchAttackComponent(PhysicsLayer.HUMANS, 1.5f));
     //        PhysicsUtils.setScaledCollider(boss, 0.9f, 0.4f);
             return boss;
         }
@@ Expand Down @@