1

2026-04-20 11:30:19 +08:00
parent 50759f3c1e
commit 8a7bd90458
85 changed files with 7290 additions and 1903 deletions
--- a/src/hooks/useGameFlow.ts
+++ b/src/hooks/useGameFlow.ts
@@ -9,23 +9,43 @@ import {
 } from '../data/characterPresets';
 import { setRuntimeCustomWorldProfile } from '../data/customWorldRuntime';
 import { getInitialPlayerCurrency } from '../data/economy';
-import { applyEquipmentLoadoutToState, buildInitialEquipmentLoadout, createEmptyEquipmentLoadout } from '../data/equipmentEffects';
-import { buildInitialNpcState, buildInitialPlayerInventory } from '../data/npcInteractions';
+import {
+  applyEquipmentLoadoutToState,
+  buildInitialEquipmentLoadout,
+  createEmptyEquipmentLoadout,
+} from '../data/equipmentEffects';
+import {
+  buildInitialNpcState,
+  buildInitialPlayerInventory,
+} from '../data/npcInteractions';
+import { createInitialPlayerProgressionState } from '../data/playerProgression';
 import { createInitialGameRuntimeStats } from '../data/runtimeStats';
-import { ensureSceneEncounterPreview,RESOLVED_ENTITY_X_METERS } from '../data/sceneEncounterPreviews';
-import { getScenePreset,getWorldCampScenePreset } from '../data/scenePresets';
+import {
+  ensureSceneEncounterPreview,
+  RESOLVED_ENTITY_X_METERS,
+} from '../data/sceneEncounterPreviews';
+import { getScenePreset, getWorldCampScenePreset } from '../data/scenePresets';
 import { createEmptyStoryEngineMemoryState } from '../services/storyEngine/visibilityEngine';
-import { AnimationState, Character, CustomWorldProfile, Encounter, EquipmentLoadout, GameState, InventoryItem, SceneNpc, WorldType } from '../types';
+import {
+  AnimationState,
+  Character,
+  CustomWorldProfile,
+  Encounter,
+  EquipmentLoadout,
+  GameState,
+  InventoryItem,
+  SceneNpc,
+  WorldType,
+} from '../types';
 import type { BottomTab } from '../types/navigation';

 const PLAYER_BASE_MAX_HP = 180;

-export type {BottomTab} from '../types/navigation';
+export type { BottomTab } from '../types/navigation';

-function mergeStarterInventoryItems<T extends { category: string; name: string }>(
-  explicitItems: T[],
-  fallbackItems: T[],
-) {
+function mergeStarterInventoryItems<
+  T extends { category: string; name: string },
+>(explicitItems: T[], fallbackItems: T[]) {
  const merged = new Map<string, T>();

  [...explicitItems, ...fallbackItems].forEach((item) => {
@@ -117,13 +137,15 @@ function createInitialCampEncounter(
 ): Encounter | null {
  if (!worldType) return null;

-  const campScenePreset = getWorldCampScenePreset(worldType) ?? getScenePreset(worldType, 0);
+  const campScenePreset =
+    getWorldCampScenePreset(worldType) ?? getScenePreset(worldType, 0);
  const npcCandidates = (campScenePreset?.npcs ?? [])
    .filter((npc: SceneNpc) => Boolean(npc.characterId))
    .filter((npc: SceneNpc) => npc.characterId !== playerCharacter.id);
  if (npcCandidates.length === 0) return null;

-  const npc = npcCandidates[Math.floor(Math.random() * npcCandidates.length)] ?? null;
+  const npc =
+    npcCandidates[Math.floor(Math.random() * npcCandidates.length)] ?? null;
  if (!npc) return null;

  return {
@@ -145,6 +167,7 @@ function createInitialGameState(): GameState {
    customWorldProfile: null,
    playerCharacter: null,
    runtimeStats: createInitialGameRuntimeStats(),
+    playerProgression: createInitialPlayerProgressionState(),
    currentScene: 'Selection',
    storyHistory: [],
    storyEngineMemory: createEmptyStoryEngineMemoryState(),
@@ -191,14 +214,18 @@ function createInitialGameState(): GameState {
 }

 export function useGameFlow() {
-  const [gameState, setGameState] = useState<GameState>(() => createInitialGameState());
+  const [gameState, setGameState] = useState<GameState>(() =>
+    createInitialGameState(),
+  );
  const [bottomTab, setBottomTab] = useState<BottomTab>('adventure');
  const [isMapOpen, setIsMapOpen] = useState(false);

  useEffect(() => {
    setRuntimeCustomWorldProfile(gameState.customWorldProfile);
    setRuntimeCharacterOverrides(
-      gameState.customWorldProfile ? buildCustomWorldRuntimeCharacters(gameState.customWorldProfile) : null,
+      gameState.customWorldProfile
+        ? buildCustomWorldRuntimeCharacters(gameState.customWorldProfile)
+        : null,
    );
  }, [gameState.customWorldProfile]);

@@ -216,7 +243,7 @@ export function useGameFlow() {
    );
    const initialScenePreset = getScenePreset(resolvedWorldType, 0) ?? null;
    setIsMapOpen(false);
-    setGameState(prev =>
+    setGameState((prev) =>
      ensureSceneEncounterPreview({
        ...prev,
        worldType: resolvedWorldType,
@@ -225,6 +252,7 @@ export function useGameFlow() {
        sceneHostileNpcs: [],
        currentEncounter: null,
        npcInteractionActive: false,
+        playerProgression: createInitialPlayerProgressionState(),
        storyEngineMemory: createEmptyStoryEngineMemoryState(),
        chapterState: null,
        campaignState: null,
@@ -257,110 +285,114 @@ export function useGameFlow() {
    setBottomTab('adventure');
    setIsMapOpen(false);

-    setGameState(prev =>
-      {
-        const resolvedWorldType = prev.worldType;
-        const resolvedCustomWorldProfile = prev.customWorldProfile;
-        const initialScenePreset = resolvedWorldType
-          ? getWorldCampScenePreset(resolvedWorldType) ?? getScenePreset(resolvedWorldType, 0)
-          : null;
-        const initialEncounter = createInitialCampEncounter(
-          resolvedWorldType,
-          character,
-        );
-        const initialNpcState = initialEncounter
-          ? buildInitialNpcState(initialEncounter, resolvedWorldType, prev)
-          : null;
-        const initialEquipment = buildInitialEquipmentLoadout(
-          character,
-          resolvedCustomWorldProfile,
-        );
-        const explicitStarterItems =
-          resolvedWorldType === WorldType.CUSTOM
-            ? buildExplicitCustomWorldRoleStarterState(
-                resolvedCustomWorldProfile!,
-                character,
-              )
-            : null;
-        const mergedStarterEquipment = {
-          weapon:
-            explicitStarterItems?.equipment.weapon ?? initialEquipment.weapon,
-          armor:
-            explicitStarterItems?.equipment.armor ?? initialEquipment.armor,
-          relic:
-            explicitStarterItems?.equipment.relic ?? initialEquipment.relic,
-        };
-        const playerMaxHp = getCharacterMaxHp(
-          character,
-          resolvedWorldType,
-          resolvedCustomWorldProfile,
-        );
-
-        return ensureSceneEncounterPreview(
-          applyEquipmentLoadoutToState({
-          ...prev,
-          playerCharacter: character,
-          runtimeStats: createInitialGameRuntimeStats({ isActiveRun: true }),
-           currentScene: 'Story',
-           storyHistory: [],
-           storyEngineMemory: createEmptyStoryEngineMemoryState(),
-           chapterState: null,
-           campaignState: null,
-           activeScenarioPackId: gameState.customWorldProfile?.scenarioPackId ?? null,
-           activeCampaignPackId: gameState.customWorldProfile?.campaignPackId ?? null,
-           characterChats: {},
-          currentEncounter: initialEncounter,
-          npcInteractionActive: false,
-          currentScenePreset: initialScenePreset,
-          lastObserveSignsSceneId: null,
-          lastObserveSignsReport: null,
-          animationState: AnimationState.IDLE,
-          sceneHostileNpcs: [],
-          playerX: 0,
-          playerOffsetY: 0,
-          playerFacing: 'right',
-          playerActionMode: 'idle',
-          scrollWorld: false,
-          inBattle: false,
-          playerHp: playerMaxHp,
-          playerMaxHp: playerMaxHp,
-          playerMana: getCharacterMaxMana(character),
-          playerMaxMana: getCharacterMaxMana(character),
-          playerSkillCooldowns: createCharacterSkillCooldowns(character),
-          activeBuildBuffs: [],
-          activeCombatEffects: [],
-          playerCurrency: getInitialPlayerCurrency(
-            resolvedWorldType,
-            resolvedCustomWorldProfile,
-          ),
-          playerInventory: mergeStarterInventoryItems(
-            explicitStarterItems?.inventory ?? [],
-            buildInitialPlayerInventory(
+    setGameState((prev) => {
+      const resolvedWorldType = prev.worldType;
+      const resolvedCustomWorldProfile = prev.customWorldProfile;
+      const initialScenePreset = resolvedWorldType
+        ? (getWorldCampScenePreset(resolvedWorldType) ??
+          getScenePreset(resolvedWorldType, 0))
+        : null;
+      const initialEncounter = createInitialCampEncounter(
+        resolvedWorldType,
+        character,
+      );
+      const initialNpcState = initialEncounter
+        ? buildInitialNpcState(initialEncounter, resolvedWorldType, prev)
+        : null;
+      const initialEquipment = buildInitialEquipmentLoadout(
+        character,
+        resolvedCustomWorldProfile,
+      );
+      const explicitStarterItems =
+        resolvedWorldType === WorldType.CUSTOM
+          ? buildExplicitCustomWorldRoleStarterState(
+              resolvedCustomWorldProfile!,
              character,
+            )
+          : null;
+      const mergedStarterEquipment = {
+        weapon:
+          explicitStarterItems?.equipment.weapon ?? initialEquipment.weapon,
+        armor: explicitStarterItems?.equipment.armor ?? initialEquipment.armor,
+        relic: explicitStarterItems?.equipment.relic ?? initialEquipment.relic,
+      };
+      const playerMaxHp = getCharacterMaxHp(
+        character,
+        resolvedWorldType,
+        resolvedCustomWorldProfile,
+      );
+
+      return ensureSceneEncounterPreview(
+        applyEquipmentLoadoutToState(
+          {
+            ...prev,
+            playerCharacter: character,
+            runtimeStats: createInitialGameRuntimeStats({ isActiveRun: true }),
+            playerProgression: createInitialPlayerProgressionState(),
+            currentScene: 'Story',
+            storyHistory: [],
+            storyEngineMemory: createEmptyStoryEngineMemoryState(),
+            chapterState: null,
+            campaignState: null,
+            activeScenarioPackId:
+              gameState.customWorldProfile?.scenarioPackId ?? null,
+            activeCampaignPackId:
+              gameState.customWorldProfile?.campaignPackId ?? null,
+            characterChats: {},
+            currentEncounter: initialEncounter,
+            npcInteractionActive: false,
+            currentScenePreset: initialScenePreset,
+            lastObserveSignsSceneId: null,
+            lastObserveSignsReport: null,
+            animationState: AnimationState.IDLE,
+            sceneHostileNpcs: [],
+            playerX: 0,
+            playerOffsetY: 0,
+            playerFacing: 'right',
+            playerActionMode: 'idle',
+            scrollWorld: false,
+            inBattle: false,
+            playerHp: playerMaxHp,
+            playerMaxHp: playerMaxHp,
+            playerMana: getCharacterMaxMana(character),
+            playerMaxMana: getCharacterMaxMana(character),
+            playerSkillCooldowns: createCharacterSkillCooldowns(character),
+            activeBuildBuffs: [],
+            activeCombatEffects: [],
+            playerCurrency: getInitialPlayerCurrency(
              resolvedWorldType,
              resolvedCustomWorldProfile,
            ),
-          ),
-          playerEquipment: createEmptyEquipmentLoadout(),
-          npcStates: initialEncounter && initialNpcState
-            ? {
-                [initialEncounter.id!]: initialNpcState,
-              }
-            : {},
-          quests: [],
-          roster: [],
-          companions: [],
-          currentBattleNpcId: null,
-          currentNpcBattleMode: null,
-          currentNpcBattleOutcome: null,
-          sparReturnEncounter: null,
-          sparPlayerHpBefore: null,
-          sparPlayerMaxHpBefore: null,
-          sparStoryHistoryBefore: null,
-          }, mergedStarterEquipment),
-        );
-      },
-    );
+            playerInventory: mergeStarterInventoryItems<InventoryItem>(
+              explicitStarterItems?.inventory ?? [],
+              buildInitialPlayerInventory(
+                character,
+                resolvedWorldType,
+                resolvedCustomWorldProfile,
+              ),
+            ),
+            playerEquipment: createEmptyEquipmentLoadout(),
+            npcStates:
+              initialEncounter && initialNpcState
+                ? {
+                    [initialEncounter.id!]: initialNpcState,
+                  }
+                : {},
+            quests: [],
+            roster: [],
+            companions: [],
+            currentBattleNpcId: null,
+            currentNpcBattleMode: null,
+            currentNpcBattleOutcome: null,
+            sparReturnEncounter: null,
+            sparPlayerHpBefore: null,
+            sparPlayerMaxHpBefore: null,
+            sparStoryHistoryBefore: null,
+          },
+          mergedStarterEquipment,
+        ),
+      );
+    });
  };

  return {