feat: register delayed scenario NPCs

2026-07-25 18:39:58 +00:00
parent 29851666ad
commit 5ed1cbe951
6 changed files with 1218 additions and 6 deletions
@@ -161,6 +161,64 @@ const resolveAge = (startYear: number | null, birthYear: number): number => {
    return Math.max(startYear - birthYear, 0);
 };

+const ADULT_GENERAL_AGE = 14;
+
+type GeneralBootstrapDisposition = 'active' | 'delayed' | 'expired';
+
+const resolveGeneralBootstrapDisposition = (
+    general: ScenarioGeneral,
+    startYear: number | null
+): GeneralBootstrapDisposition => {
+    if (startYear === null) {
+        return 'active';
+    }
+    if (general.deathYear <= startYear) {
+        return 'expired';
+    }
+    if (startYear - general.birthYear < ADULT_GENERAL_AGE) {
+        return 'delayed';
+    }
+    return 'active';
+};
+
+const buildDelayedGeneralAction = (
+    general: ScenarioGeneral,
+    nationId: number,
+    npcType: 2 | 6
+): unknown[] => {
+    const common = [
+        general.affinity ?? 0,
+        general.name,
+        general.picture,
+        nationId,
+        general.city,
+        general.leadership,
+        general.strength,
+        general.intelligence,
+    ];
+    if (npcType === 2) {
+        return [
+            'RegNPC',
+            ...common,
+            general.officerLevel,
+            general.birthYear,
+            general.deathYear,
+            general.personality,
+            general.special,
+            general.text ?? '',
+        ];
+    }
+    return [
+        'RegNeutralNPC',
+        ...common,
+        general.birthYear,
+        general.deathYear,
+        general.personality,
+        general.special,
+        general.text ?? '',
+    ];
+};
+
 const resolveOfficerLevel = (officerLevel: number, nationId: number): number => {
    if (officerLevel > 0) {
        return officerLevel;
@@ -590,9 +648,33 @@ export const buildScenarioBootstrap = (input: ScenarioBootstrapInput): ScenarioB
    let nextGeneralId = 1;
    const allGeneralSeeds: GeneralSeed[] = [];
    const allGenerals: General[] = [];
+    const delayedActionsByBirthYear = new Map<number, unknown[][]>();
+
+    const partitionGenerals = (rows: ScenarioGeneral[], npcType: 2 | 6): ScenarioGeneral[] => {
+        const active: ScenarioGeneral[] = [];
+        for (const general of rows) {
+            const disposition = resolveGeneralBootstrapDisposition(general, scenario.startYear);
+            if (disposition === 'active') {
+                active.push(general);
+                continue;
+            }
+            if (disposition === 'expired') {
+                continue;
+            }
+            const nationId = resolveNationId(general.nation, nationNameToId, warnings, general.name);
+            const actions = delayedActionsByBirthYear.get(general.birthYear) ?? [];
+            actions.push(buildDelayedGeneralAction(general, nationId, npcType));
+            delayedActionsByBirthYear.set(general.birthYear, actions);
+        }
+        return active;
+    };
+
+    const activeGenerals = partitionGenerals(scenario.generals, 2);
+    const activeGeneralsEx = partitionGenerals(scenario.generalsEx, 2);
+    const activeGeneralsNeutral = partitionGenerals(scenario.generalsNeutral, 6);

    const generalResult = buildGeneralSeeds(
-        scenario.generals,
+        activeGenerals,
        2,
        nextGeneralId,
        'general',
@@ -608,7 +690,7 @@ export const buildScenarioBootstrap = (input: ScenarioBootstrapInput): ScenarioB
    nextGeneralId = generalResult.nextId;

    const generalExResult = buildGeneralSeeds(
-        scenario.generalsEx,
+        activeGeneralsEx,
        2,
        nextGeneralId,
        'general_ex',
@@ -624,7 +706,7 @@ export const buildScenarioBootstrap = (input: ScenarioBootstrapInput): ScenarioB
    nextGeneralId = generalExResult.nextId;

    const generalNeutralResult = buildGeneralSeeds(
-        scenario.generalsNeutral,
+        activeGeneralsNeutral,
        6,
        nextGeneralId,
        'general_neutral',
@@ -638,6 +720,17 @@ export const buildScenarioBootstrap = (input: ScenarioBootstrapInput): ScenarioB
    allGeneralSeeds.push(...generalNeutralResult.seeds);
    allGenerals.push(...generalNeutralResult.generals);

+    const delayedGeneralEvents = Array.from(delayedActionsByBirthYear.entries()).map(
+        ([birthYear, actions]) => [
+            'Month',
+            1_000,
+            ['Date', '>=', birthYear + ADULT_GENERAL_AGE, 1],
+            ...actions,
+            ['DeleteEvent'],
+        ]
+    );
+    const events = [...scenario.events, ...delayedGeneralEvents];
+
    const seed: WorldSeedPayload = {
        scenarioConfig: scenario.config,
        scenarioMeta,
@@ -648,7 +741,7 @@ export const buildScenarioBootstrap = (input: ScenarioBootstrapInput): ScenarioB
        generals: allGeneralSeeds,
        troops: [],
        diplomacy: scenario.diplomacy,
-        events: scenario.events,
+        events,
        initialEvents: scenario.initialEvents,
    };

@@ -662,7 +755,7 @@ export const buildScenarioBootstrap = (input: ScenarioBootstrapInput): ScenarioB
        generals: allGenerals,
        troops: [],
        diplomacy: scenario.diplomacy,
-        events: scenario.events,
+        events,
        initialEvents: scenario.initialEvents,
    };

@@ -122,4 +122,123 @@ describe('scenario bootstrap', () => {
        expect(result.seed.generals[0]?.npcType).toBe(2);
        expect(result.snapshot.scenarioMeta?.title).toBe('Test Scenario');
    });
+
+    it('defers future generals into birth-year registration events and omits expired rows', () => {
+        const general = (
+            name: string,
+            birthYear: number,
+            deathYear: number,
+            nation: number | string | null = 1
+        ): ScenarioDefinition['generals'][number] => ({
+            affinity: 0,
+            name,
+            picture: null,
+            nation,
+            city: null,
+            leadership: 50,
+            strength: 60,
+            intelligence: 40,
+            officerLevel: 3,
+            birthYear,
+            deathYear,
+            personality: null,
+            special: '',
+            text: '',
+        });
+        const scenario: ScenarioDefinition = {
+            title: 'Delayed generals',
+            startYear: 200,
+            life: null,
+            fiction: null,
+            history: [],
+            config: {
+                stat: { total: 100, min: 10, max: 70, npcTotal: 80, npcMax: 60, npcMin: 5, chiefMin: 50 },
+                iconPath: '.',
+                map: {},
+                const: {},
+                environment: { mapName: 'test-map', unitSet: 'test-unit' },
+            },
+            nations: [
+                {
+                    id: 1,
+                    name: 'TestNation',
+                    color: '#123456',
+                    gold: 5_000,
+                    rice: 3_000,
+                    infoText: '',
+                    tech: 100,
+                    type: 'Test',
+                    level: 3,
+                    cities: ['Alpha'],
+                },
+            ],
+            diplomacy: [],
+            generals: [
+                general('현재', 180, 240),
+                general('미래1', 190, 250, 'TestNation'),
+                general('만료', 170, 200),
+            ],
+            generalsEx: [general('미래확장', 190, 260)],
+            generalsNeutral: [general('미래재야', 191, 260, 0)],
+            cities: [],
+            events: [['Month', 500, ['Date', '>=', 200, 1], ['Existing']]],
+            initialEvents: [],
+            ignoreDefaultEvents: false,
+        };
+        const map: MapDefinition = {
+            id: 'test-map',
+            name: 'test-map',
+            cities: [
+                {
+                    id: 1,
+                    name: 'Alpha',
+                    level: 3,
+                    region: 1,
+                    position: { x: 0, y: 0 },
+                    connections: [],
+                    max: {
+                        population: 100_000,
+                        agriculture: 20_000,
+                        commerce: 20_000,
+                        security: 15_000,
+                        defence: 5_000,
+                        wall: 3_000,
+                    },
+                    initial: {
+                        population: 50_000,
+                        agriculture: 10_000,
+                        commerce: 10_000,
+                        security: 8_000,
+                        defence: 2_500,
+                        wall: 1_500,
+                    },
+                },
+            ],
+        };
+
+        const result = buildScenarioBootstrap({ scenario, map });
+
+        expect(result.seed.generals.map((row) => row.name)).toEqual(['현재']);
+        expect(result.snapshot.generals.map((row) => row.name)).toEqual(['현재']);
+        expect(result.seed.events).toEqual([
+            ['Month', 500, ['Date', '>=', 200, 1], ['Existing']],
+            [
+                'Month',
+                1_000,
+                ['Date', '>=', 204, 1],
+                ['RegNPC', 0, '미래1', null, 1, null, 50, 60, 40, 3, 190, 250, null, '', ''],
+                ['RegNPC', 0, '미래확장', null, 1, null, 50, 60, 40, 3, 190, 260, null, '', ''],
+                ['DeleteEvent'],
+            ],
+            [
+                'Month',
+                1_000,
+                ['Date', '>=', 205, 1],
+                ['RegNeutralNPC', 0, '미래재야', null, 0, null, 50, 60, 40, 191, 260, null, '', ''],
+                ['DeleteEvent'],
+            ],
+        ]);
+        expect(result.snapshot.events).toEqual(result.seed.events);
+        expect(result.seed.events.flat(3)).not.toContain('만료');
+    });
 });