1

2026-04-26 20:50:58 +08:00
parent a3a9bfa194
commit 67161bd6d1
142 changed files with 3349 additions and 10674 deletions
--- a/src/hooks/combat/battlePlan.ts
+++ b/src/hooks/combat/battlePlan.ts
@@ -814,9 +814,11 @@ export function buildBattlePlan({
      playerActionMode: 'idle' as const,
      activeCombatEffects: [],
      scrollWorld: false,
-      inBattle: simulatedState.currentNpcBattleOutcome === 'spar_complete'
-        ? false
-        : simulatedState.sceneHostileNpcs.length > 0,
+      inBattle:
+        simulatedState.currentNpcBattleOutcome === 'spar_complete' ||
+        simulatedState.playerHp <= 0
+          ? false
+          : simulatedState.sceneHostileNpcs.length > 0,
      sceneHostileNpcs: resetCombatPresentation(simulatedState.sceneHostileNpcs, simulatedState.playerX),
    },
  };