fixed bug where mobs werent dying properly

UQcsse3200 · Oct 9, 2023 · 520e5eb · 520e5eb
1 parent d1be527
commit 520e5eb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 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
@@ -324,12 +324,12 @@ public void create() {
 //    waves = WaveFactory.createWaves();
 //    spawnEntity(waves);
 //    waves.getEvents().addListener("spawnWave", this::spawnMob);
-//    spawnGregMob();
+    spawnGregMob();
 //    spawnDodgingDragonKnight(17,4);
 //    spawnDeflectWizard(17, 3);
 //    spawnSplittingXenoGrunt(17, 2);
 //    spawnPatrick();
-    spawnDemonBoss();
+//    spawnDemonBoss();
 
     spawnScrap();
     spawnGapScanners();
@@ -728,7 +728,7 @@ private void spawnDeflectWizard(int x, int y) {
 //  }
 
   private void spawnGregMob() {
-    Entity gregMob = NPCFactory.createGregMeleeMob(100);
+    Entity gregMob = NPCFactory.createBaseWaterSlime(100);
     gregMob.setScale(1.5f, 1.5f);
     spawnEntityAt(gregMob, new GridPoint2(17, 4), false, false);
   }

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
@@ -25,11 +25,12 @@ public class MobTask extends DefaultTask implements PriorityTask {
 
     // Constants
     private static final int PRIORITY = 3;
-    private static final Vector2 MELEE_MOB_SPEED = new Vector2(1f,1f);
-    private static final Vector2 MELEE_RANGE_SPEED = new Vector2(0.7f,0.7f);
+    private static final Vector2 MELEE_MOB_SPEED = new Vector2(0.7f,0.7f);
+    private static final Vector2 MELEE_RANGE_SPEED = new Vector2(0.5f,0.5f);
     private static final int MELEE_DAMAGE = 10;
     private static final long MELEE_ATTACK_SPEED = 2000;
     private static final long RANGE_ATTACK_SPEED = 5000;
+    private static final int MELEE_ATTACK_RANGE = 1;
 
     // Private variables
     private final MobType mobType;
@@ -98,8 +99,13 @@ public void start() {
     public void update() {
 
         // death check
-        if (mob.getComponent(CombatStatsComponent.class).getHealth() <= 0) {
+        if (mob.getComponent(CombatStatsComponent.class).getHealth() <= 0 && !deathFlag) {
             changeState(State.DEATH);
+            animate();
+            movementTask.stop();
+            deathFlag = true;
+        } else if (deathFlag && animation.isFinished()) {
+            mob.setFlagForDelete(true);
         }
 
         switch (state) {
@@ -151,15 +157,6 @@ public void update() {
                     }
                 }
             }
-            case DEATH -> {
-                if (deathFlag) {
-                    animate();
-                    deathFlag = false;
-                }
-                if (animation.isFinished() && !deathFlag) {
-                    mob.setFlagForDelete(true);
-                }
-            }
         }
     }
 
@@ -196,7 +193,10 @@ private void animate() {
                 switch (state) {
                     case RUN -> owner.getEntity().getEvents().trigger("water_slime_walk");
                     case ATTACK -> owner.getEntity().getEvents().trigger("water_slime_attack");
-                    case DEATH -> owner.getEntity().getEvents().trigger("water_slime_death");
+                    case DEATH -> {
+                        System.out.println("hi");
+                        owner.getEntity().getEvents().trigger("water_slime_death");
+                    }
                     case DEFAULT -> owner.getEntity().getEvents().trigger("default");
                 }
             }
@@ -235,7 +235,7 @@ private void changeState(State state) {
     private boolean enemyDetected() {
         // if there's an entity within x of - 1 of mob
         Entity target = ServiceLocator.getEntityService().getEntityAtPosition(
-                mob.getPosition().x - 1, mob.getPosition().y);
+                mob.getPosition().x - MELEE_ATTACK_RANGE, mob.getPosition().y);
         if (target == null) {
             return false;
         }