Fixed enemy explosion

neki-dev · Oct 30, 2023 · a2f71de · a2f71de
1 parent f423dff
commit a2f71de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/game/scenes/world/entities/npc/variants/enemy/variants/explosive.ts b/src/game/scenes/world/entities/npc/variants/enemy/variants/explosive.ts
@@ -50,13 +50,23 @@ export class EnemyExplosive extends Enemy {
       },
     });
 
+    this.scene.sound.play(EffectAudio.EXPLOSION);
+
+    if (this.scene.game.isSettingEnabled(GameSettings.EFFECTS)) {
+      new Effect(this.scene, {
+        texture: EffectTexture.EXPLOSION,
+        position: this.body.center,
+        depth: this.depth + 1,
+      });
+    }
+
     let targets: IEnemyTarget[] = [this.scene.player];
 
     targets = targets.concat(this.scene.getEntities<IEnemy>(EntityType.ENEMY));
     targets = targets.concat(this.scene.getEntities<IBuilding>(EntityType.BUILDING));
 
     targets.forEach((target) => {
-      if (target !== this) {
+      if (target.active && target !== this) {
         const distance = getIsometricDistance(position, target.getBottomFace());
 
         if (distance <= EXPLOSION_RADIUS) {
@@ -66,15 +76,5 @@ export class EnemyExplosive extends Enemy {
         }
       }
     });
-
-    this.scene.sound.play(EffectAudio.EXPLOSION);
-
-    if (this.scene.game.isSettingEnabled(GameSettings.EFFECTS)) {
-      new Effect(this.scene, {
-        texture: EffectTexture.EXPLOSION,
-        position: this.body.center,
-        depth: this.depth + 1,
-      });
-    }
   }
 }
diff --git a/src/types/world/entities/npc/enemy.ts b/src/types/world/entities/npc/enemy.ts
@@ -28,6 +28,7 @@ export interface IEnemyFactory {
 
 export interface IEnemyTarget {
   readonly live: ILive
+  active: boolean
   getBottomFace(): PositionAtWorld
 }