Reset the killer flag if a healing action saved the target's life (#292)

fwo-online · Sep 19, 2023 · 976a819 · 976a819
1 parent ab6d9ac
commit 976a819
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/arena/Constuructors/HealMagicConstructor.ts b/src/arena/Constuructors/HealMagicConstructor.ts
@@ -125,6 +125,13 @@ export abstract class Heal {
     return 0;
   }
 
+  checkTargetIsDead({ target } = this.params) {
+    const hpNow = target.stats.val('hp');
+    if (hpNow > 0 && target.getKiller()) {
+      target.resetKiller();
+    }
+  }
+
   /**
    * Функция положительного прохождения
    */

diff --git a/src/arena/PlayersService/Player.ts b/src/arena/PlayersService/Player.ts
@@ -150,6 +150,10 @@ export default class Player {
     this.flags.isDead = player.id;
   }
 
+  resetKiller(): void {
+    this.flags.isDead = '';
+  }
+
   setProc(proc: number) {
     this.proc = proc;
   }

diff --git a/src/arena/magics/heal.ts b/src/arena/magics/heal.ts
@@ -25,6 +25,13 @@ export class HealMagic extends CommonMagic {
     initiator.stats.mode('up', 'exp', this.status.exp);
   }
 
+  checkTargetIsDead({ target } = this.params) {
+    const hpNow = target.stats.val('hp');
+    if (hpNow > 0 && target.getKiller()) {
+      target.resetKiller();
+    }
+  }
+
   next(): void {
     const { target, initiator, game } = this.params;
     const args: HealMagicNext = {