1

src/hooks/rpg-runtime-story/storyChoiceContinuation.ts

@@ -151,6 +151,14 @@ function buildDeterministicStoryForState(params: {
   } satisfies StoryMoment;
 }
 
+function isLocalNpcBattleVictoryOutcome(
+  battleOutcome: GameState['currentNpcBattleOutcome'],
+) {
+  return (
+    battleOutcome === 'fight_victory' || battleOutcome === 'spar_complete'
+  );
+}
+
 export async function runLocalStoryChoiceContinuation(params: {
   gameState: GameState;
   currentStory: StoryMoment | null;
@@ -239,9 +247,7 @@ export async function runLocalStoryChoiceContinuation(params: {
     const shouldUseLocalNpcVictory = Boolean(
       baseChoiceState.currentBattleNpcId &&
         resolvedChoice.optionKind === 'battle' &&
-        (projectedState.currentNpcBattleOutcome ||
-          (baseChoiceState.currentNpcBattleMode === 'fight' &&
-            !projectedState.inBattle)),
+        isLocalNpcBattleVictoryOutcome(projectedState.currentNpcBattleOutcome),
     );
     const projectedBattleReward = shouldUseLocalNpcVictory
       ? null
@@ -447,7 +453,11 @@ export async function runLocalStoryChoiceContinuation(params: {
 
       if (
         resolvedChoice.optionKind === 'battle' &&
-        (!nextState.inBattle || nextState.currentNpcBattleOutcome === 'spar_complete')
+        (
+          nextState.currentNpcBattleOutcome === 'fight_victory' ||
+          nextState.currentNpcBattleOutcome === 'spar_complete' ||
+          (!baseChoiceState.currentBattleNpcId && !nextState.inBattle)
+        )
       ) {
         const postBattleState = buildPostBattleVictoryState(nextState);
         const postBattle = buildPostBattleVictoryStory(