Add melee attack for Final Boss

UQcsse3200 · Sep 11, 2023 · fb9309d · fb9309d
1 parent 052fecd
commit fb9309d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/FinalBossMovementTask.java b/source/core/src/main/com/csse3200/game/components/tasks/FinalBossMovementTask.java
@@ -29,13 +29,18 @@ public class FinalBossMovementTask extends DefaultTask implements PriorityTask {
     private MovementTask swapLaneTask;
     private WaitTask waitTask;
     private Task currentTask;
+    private PhysicsEngine physics;
+    private static final short TARGET = PhysicsLayer.TOWER;
+    private final RaycastHit hit = new RaycastHit();
 
     /**
      * @param waitTime    How long in seconds to wait between moving.
      */
     public FinalBossMovementTask(float waitTime, int numLane) {
         this.waitTime = waitTime;
         this.currLane = numLane;
+
+        physics = ServiceLocator.getPhysicsService().getPhysics();
     }
 
     @Override
@@ -68,6 +73,14 @@ public void start() {
     public void update() {
         if (currentTask.getStatus() != Status.ACTIVE) {
             if (currentTask == movementTask) {
+                // Melee attack
+                if (towerAhead()) {
+                    Entity newProjectile = ProjectileFactory.createEffectProjectile(PhysicsLayer.TOWER, new Vector2(0,currentPos.y + 0.75f), new Vector2(2f,2f), ProjectileEffects.BURN, false);
+                    newProjectile.scaleHeight(-0.4f);
+                    newProjectile.setPosition((float) (currentPos.x), (float) (currentPos.y+0.75f));
+                    ServiceLocator.getEntityService().register(newProjectile);
+                }
+
                 startWaiting();
             } else if (currentTask == waitTask) {
 //                startSwappingLane();
@@ -133,4 +146,8 @@ private void swapTask(Task newTask) {
         currentTask = newTask;
         currentTask.start();
     }
+
+    private boolean towerAhead() {
+        return physics.raycast(currentPos, new Vector2(currentPos.x - 1, currentPos.y), TARGET, hit);
+    }
 }
diff --git a/source/core/src/main/com/csse3200/game/entities/factories/BossKingFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/BossKingFactory.java
@@ -30,7 +30,7 @@ public static Entity createBossKing1(Entity target, int numLane) {
         BossKingConfigs config = configs.BossKing;
         Entity bossKing1 = createBaseBoss(target);
 
-        AITaskComponent aiTaskComponent1 = new AITaskComponent().addTask(new RangeBossTask(1f));
+        AITaskComponent aiTaskComponent1 = new AITaskComponent().addTask(new FinalBossMovementTask(1f, numLane));
 
         // Animation section
         AnimationRenderComponent animator1 = new AnimationRenderComponent(

diff --git a/source/core/src/test/com/csse3200/game/components/tasks/FinalBossMovementTaskTest.java b/source/core/src/test/com/csse3200/game/components/tasks/FinalBossMovementTaskTest.java
@@ -4,6 +4,7 @@
 import com.csse3200.game.entities.Entity;
 import com.csse3200.game.events.listeners.EventListener0;
 import com.csse3200.game.extensions.GameExtension;
+import com.csse3200.game.physics.PhysicsService;
 import com.csse3200.game.physics.components.PhysicsMovementComponent;
 import com.csse3200.game.services.GameTime;
 import com.csse3200.game.services.ServiceLocator;
@@ -25,6 +26,7 @@ class FinalBossMovementTaskTest {
     @BeforeEach
     void beforeEach() {
         ServiceLocator.registerTimeSource(gameTime);
+        ServiceLocator.registerPhysicsService(new PhysicsService());
     }
 
     @Test