diff --git a/src/renderer/game/engine/GameEngine.ts b/src/renderer/game/engine/GameEngine.ts index 2985d9c..ea3d8e8 100644 --- a/src/renderer/game/engine/GameEngine.ts +++ b/src/renderer/game/engine/GameEngine.ts @@ -13,6 +13,11 @@ export interface GameEngineOptions { seed?: string datapack?: Partial noAutoCreate?: boolean + /** 建档参数(NewGame 透传;缺省林氏兜底) */ + surname?: string + familyName?: string + motto?: string + difficulty?: 'easy' | 'normal' | 'hard' } export type EngineStatus = 'idle' | 'running' | 'gameover' @@ -39,10 +44,10 @@ export class GameEngine { // 组装World(内核注入→时钟/随机/总线单源) const state = opts.seed ? createWorldState({ seed: this._seed, - surname: '林', - familyName: '林氏', - motto: '耕读传家,术法继世', - difficulty: 'normal' + surname: opts.surname?.trim() || '林', + familyName: opts.familyName?.trim() || `${opts.surname?.trim() || '林'}氏`, + motto: opts.motto?.trim() || '耕读传家,术法继世', + difficulty: opts.difficulty ?? 'normal' }) : (globalThis as never as { __state?: GameState }).__state this.world = new World(state!, [], this.kernel) this.facade = new ApiFacade(this.world, 1) diff --git a/src/renderer/ui/store.ts b/src/renderer/ui/store.ts index 5610fa0..17fcaff 100644 --- a/src/renderer/ui/store.ts +++ b/src/renderer/ui/store.ts @@ -149,7 +149,7 @@ export const useGameStore = create((set, get) => ({ startNewGame: async (opts, slot) => { stopTimer() - const engine = new GameEngine({ seed: opts.seed }) + const engine = new GameEngine({ seed: opts.seed, surname: opts.surname, familyName: opts.familyName, motto: opts.motto, difficulty: opts.difficulty }) const world = engine.world set({ world, engine, slot, screen: 'game', panel: 'family', logFeed: [], battleView: undefined, pendingEventId: undefined, pendingEventDef: undefined, revision: 1, speed: 0, gameOverReason: undefined, paperReport: undefined, toast: undefined, selectedMemberId: undefined, selectedMissionDef: undefined }) const st = get() diff --git a/tests/gameengine.test.ts b/tests/gameengine.test.ts index 37f67de..edd5529 100644 --- a/tests/gameengine.test.ts +++ b/tests/gameengine.test.ts @@ -120,3 +120,18 @@ describe('Sim 与外层联动', () => { expect(before).toBeLessThan(1.4) }) }) + +describe('GameEngine 建档参数', () => { + it('姓氏透传:新档用玩家输入的姓氏/家号(0.1.22 修复)', () => { + const e = new GameEngine({ seed: 'name-fix', surname: '慕容', familyName: '慕容家', motto: '铁血丹心', difficulty: 'normal' }) + expect(e.world.state.family.name).toBe('慕容家') + const head = Object.values(e.world.state.members).find((c) => c.isHead) + expect(head?.name.startsWith('慕容')).toBe(true) + expect(e.world.state.family.motto ?? '').toBeTruthy() + }) + + it('缺省建档仍为林氏(兜底不破)', () => { + const e = new GameEngine({ seed: 'name-default' }) + expect(e.world.state.family.name).toBe('林氏') + }) +})