bastian/ashen-realms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(combat): clear the monster's pending action once it is defeated

Browse Source
This commit is contained in:
Bastian Wagner
2026-08-20 23:10:47 +02:00
parent e2f29d5eb6
commit 1aac3416fa
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/api/src/combat/combat-engine.service.spec.ts
View File

@@ -252,6 +252,7 @@ describe('CombatEngineService', () => {
expect(result.state.status).toBe(CombatStatus.WON);
expect(result.state.player.currentHp).toBe(100);
expect(result.state.monster.stats.pendingAction).toBeUndefined();
expect(result.events).toEqual([
{ source: Combatant.PLAYER, target: Combatant.MONSTER, type: CombatEventType.DAMAGE, amount: 14 },
{ source: Combatant.PLAYER, target: Combatant.MONSTER, type: CombatEventType.COMBAT_WON },

3
apps/api/src/combat/combat-engine.service.ts
View File

@@ -124,7 +124,8 @@ export class CombatEngineService {
): CombatEngineResult {
if (monster.currentHp <= 0) {
events.push({ source: Combatant.PLAYER, target: Combatant.MONSTER, type: CombatEventType.COMBAT_WON });
return { state: { ...state, player, monster, status: CombatStatus.WON }, events };
const defeatedMonster = { ...monster, stats: { ...monster.stats, pendingAction: undefined } };
return { state: { ...state, player, monster: defeatedMonster, status: CombatStatus.WON }, events };
}
if (!interrupted) {