fix(combat): ending combat should clear player buffs

WorldSellerGame · Mar 26, 2023 · f8398f7 · f8398f7
1 parent 73143d4
commit f8398f7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/app/helpers/combat.ts b/src/app/helpers/combat.ts
@@ -127,6 +127,7 @@ export function handleCombatEnd(ctx: StateContext<IGameCombat>) {
     }
 
   } else if(hasEnemyWonCombat(ctx)) {
+
     ctx.dispatch([
       new AddCombatLogMessage('You have lost combat!'),
       new PlaySFX('combat-lose'),

diff --git a/src/stores/combat/combat.functions.ts b/src/stores/combat/combat.functions.ts
@@ -480,6 +480,19 @@ export function tickPlayerEffects(ctx: StateContext<IGameCombat>) {
   }));
 }
 
+/**
+ * Unapply all player status effects (when they die).
+ */
+export function unapplyAllEffectsForPlayer(ctx: StateContext<IGameCombat>) {
+  const currentPlayer = ctx.getState().currentPlayer;
+  if(!currentPlayer) {
+    return;
+  }
+
+  applyDeltas(ctx, currentPlayer, currentPlayer,
+    currentPlayer.statusEffects.map(effect => ({ target: 'source', attribute: '', delta: 0, unapplyStatusEffect: effect })));
+}
+
 /**
  * Tick all of the enemy effects down by 1.
  */

diff --git a/src/stores/combat/combat.ts b/src/stores/combat/combat.ts
@@ -32,7 +32,8 @@ import {
 import { attachments } from './combat.attachments';
 import {
   acquireItemDrops,
-  defaultCombat
+  defaultCombat,
+  unapplyAllEffectsForPlayer
 } from './combat.functions';
 import { EnterDungeon } from './dungeon.actions';
 
@@ -611,6 +612,7 @@ export class CombatState {
 
       // check for combat ending and get out soon
       if(state.currentEncounter.resetInSeconds === 0) {
+        unapplyAllEffectsForPlayer(ctx);
         dispatchCorrectCombatEndEvent(ctx, state.currentEncounter);
         return;
       }