Fix blinking enemies

Closes #1
Jupi007 · Oct 2, 2021 · 589bf58 · 589bf58
1 parent 8cd9c1e
commit 589bf58
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 47 deletions.
diff --git a/build/Enemies.js b/build/Enemies.js
@@ -23,6 +23,7 @@ export class Enemy extends MovingBox {
         this.hasViewportCollision = true;
         this.hasBricksCollisions = true;
         this.requirePassBetweenBoxHelper = false;
+        this.isKilledAnimationFinished = false;
         this.killedSprites[1] = SpriteLoader.load("./sprites/png/killed1.png");
         this.killedSprites[2] = SpriteLoader.load("./sprites/png/killed2.png");
         this.invincibleObserver = new StateObserver(false);

diff --git a/build/EnemyManager.js b/build/EnemyManager.js
@@ -14,16 +14,6 @@ export class EnemyManager {
             callback(enemy);
         });
     }
-    removeEnemy(enemy) {
-        const enemyIndex = this.enemies.indexOf(enemy);
-        if (enemyIndex > -1) {
-            this.enemies.splice(enemyIndex, 1);
-        }
-        if (this.Game.EnemyManager.enemies.length <= 0) {
-            this.Game.Player.increaseScore();
-        }
-        enemy.dropItem();
-    }
     aiThinking() {
         this.loopEnemies((enemy) => {
             enemy.aiThinking();
@@ -64,7 +54,7 @@ export class EnemyManager {
                     this.Game.Viewport.currentScene.drawImage(enemy.killedSprites[2], enemy.x, enemy.y, enemy.width, enemy.height);
                 }
                 else {
-                    this.Game.EnemyManager.removeEnemy(enemy);
+                    enemy.isKilledAnimationFinished = true;
                 }
                 return;
             }
@@ -80,6 +70,20 @@ export class EnemyManager {
                 enemy.spritesAnimation.update(this.Game.dt);
         });
     }
+    removeKilled(forceRemoving = false) {
+        this.loopEnemies((enemy) => {
+            if (enemy.isKilledAnimationFinished || (forceRemoving && enemy.state.is(EnemyState.Killed))) {
+                const enemyIndex = this.enemies.indexOf(enemy);
+                if (enemyIndex > -1) {
+                    this.enemies.splice(enemyIndex, 1);
+                }
+                if (this.Game.EnemyManager.enemies.length <= 0) {
+                    this.Game.Player.increaseScore();
+                }
+                enemy.dropItem();
+            }
+        });
+    }
     updateObservers() {
         this.loopEnemies((enemy) => {
             enemy.state.update(this.Game.dt);

diff --git a/build/Game.js b/build/Game.js
@@ -132,6 +132,7 @@ export class Game {
         this.EnemyManager.move();
         this.ProjectileManager.move();
         this.drawGame();
+        this.EnemyManager.removeKilled();
         this.Player.updateObservers();
         this.EnemyManager.updateObservers();
         this.ProjectileManager.updateObservers();

diff --git a/build/Viewport.js b/build/Viewport.js
@@ -1,7 +1,6 @@
 import { GameState } from "./Game.js";
 import { Direction } from "./Libraries/Direction.js";
 import { Collisions } from "./Libraries/Collisions.js";
-import { EnemyState } from "./Enemies.js";
 import { EnemyManager } from "./EnemyManager.js";
 export class Viewport {
     constructor(game) {
@@ -174,11 +173,7 @@ export class Viewport {
             this.currentScene.permanentItems = this.Game.ItemManager.permanentItems;
             this.currentScene = this.nextScene;
             this.nextScene = null;
-            this.Game.EnemyManager.loopEnemies((enemy) => {
-                if (enemy.state.is(EnemyState.Killed)) {
-                    this.Game.EnemyManager.removeEnemy(enemy);
-                }
-            });
+            this.Game.EnemyManager.removeKilled(true);
             this.Game.EnemyManager = new EnemyManager(this.Game);
             this.Game.ProjectileManager.deleteAllProjectiles();
             this.Game.ItemManager.deleteAllItems();
@@ -225,11 +220,7 @@ export class Viewport {
         this.currentScene = this.nextScene;
         this.nextWorld = null;
         this.nextScene = null;
-        this.Game.EnemyManager.loopEnemies((enemy) => {
-            if (enemy.state.is(EnemyState.Killed)) {
-                this.Game.EnemyManager.removeEnemy(enemy);
-            }
-        });
+        this.Game.EnemyManager.removeKilled(true);
         this.Game.EnemyManager = new EnemyManager(this.Game);
         this.Game.ProjectileManager.deleteAllProjectiles();
         this.Game.ItemManager.deleteAllItems();

diff --git a/src/ts/Enemies.ts b/src/ts/Enemies.ts
@@ -19,6 +19,8 @@ export class Enemy extends MovingBox {
     speed: number;
     damage: number;
 
+    isKilledAnimationFinished: boolean;
+
     hasPlayerCollision: boolean;
     hasViewportCollision: boolean;
     hasBricksCollisions: boolean;
@@ -45,6 +47,8 @@ export class Enemy extends MovingBox {
         this.hasBricksCollisions = true;
         this.requirePassBetweenBoxHelper = false;
 
+        this.isKilledAnimationFinished = false;
+
         this.killedSprites[1] = SpriteLoader.load("./sprites/png/killed1.png");
         this.killedSprites[2] = SpriteLoader.load("./sprites/png/killed2.png");
 

diff --git a/src/ts/EnemyManager.ts b/src/ts/EnemyManager.ts
@@ -23,20 +23,6 @@ export class EnemyManager {
         });
     }
 
-    removeEnemy(enemy: Enemy): void {
-        const enemyIndex = this.enemies.indexOf(enemy);
-
-        if (enemyIndex > -1) {
-            this.enemies.splice(enemyIndex, 1);
-        }
-
-        if (this.Game.EnemyManager.enemies.length <= 0) {
-            this.Game.Player.increaseScore();
-        }
-
-        enemy.dropItem();
-    }
-
     aiThinking(): void {
         this.loopEnemies((enemy: Enemy) => {
             enemy.aiThinking();
@@ -95,7 +81,7 @@ export class EnemyManager {
                     );
                 }
                 else {
-                    this.Game.EnemyManager.removeEnemy(enemy);
+                    enemy.isKilledAnimationFinished = true;
                 }
                 return;
             }
@@ -112,6 +98,24 @@ export class EnemyManager {
         });
     }
 
+    removeKilled(forceRemoving: boolean = false): void {
+        this.loopEnemies((enemy: Enemy) => {
+            if (enemy.isKilledAnimationFinished || (forceRemoving && enemy.state.is(EnemyState.Killed))) {
+                const enemyIndex = this.enemies.indexOf(enemy);
+
+                if (enemyIndex > -1) {
+                    this.enemies.splice(enemyIndex, 1);
+                }
+
+                if (this.Game.EnemyManager.enemies.length <= 0) {
+                    this.Game.Player.increaseScore();
+                }
+
+                enemy.dropItem();
+            }
+        });
+    }
+
     updateObservers(): void {
         this.loopEnemies((enemy: Enemy) => {
             enemy.state.update(this.Game.dt);

diff --git a/src/ts/Game.ts b/src/ts/Game.ts
@@ -177,6 +177,8 @@ export class Game {
 
         this.drawGame();
 
+        this.EnemyManager.removeKilled();
+
         this.Player.updateObservers();
         this.EnemyManager.updateObservers();
         this.ProjectileManager.updateObservers();

diff --git a/src/ts/Viewport.ts b/src/ts/Viewport.ts
@@ -274,11 +274,7 @@ export class Viewport {
             this.currentScene = this.nextScene;
             this.nextScene = null;
 
-            this.Game.EnemyManager.loopEnemies((enemy: Enemy) => {
-                if (enemy.state.is(EnemyState.Killed)) {
-                    this.Game.EnemyManager.removeEnemy(enemy);
-                }
-            })
+            this.Game.EnemyManager.removeKilled(true);
             this.Game.EnemyManager = new EnemyManager(this.Game);
             this.Game.ProjectileManager.deleteAllProjectiles();
             this.Game.ItemManager.deleteAllItems();
@@ -340,11 +336,7 @@ export class Viewport {
         this.nextWorld = null;
         this.nextScene = null;
 
-        this.Game.EnemyManager.loopEnemies((enemy: Enemy) => {
-            if (enemy.state.is(EnemyState.Killed)) {
-                this.Game.EnemyManager.removeEnemy(enemy);
-            }
-        });
+        this.Game.EnemyManager.removeKilled(true);
 
         this.Game.EnemyManager = new EnemyManager(this.Game);
         this.Game.ProjectileManager.deleteAllProjectiles();