feat: add killturn to general meta and update related tests

- Introduced a new meta property `killturn` to the GeneralMeta interface.
- Implemented a function `readMetaNumber` to handle the retrieval of numeric values from meta.
- Updated the `mapGeneralRow` function to ensure `killturn` is required and properly handled.
- Modified various tests to include the `killturn` property in the general's meta data.
- Adjusted related action files to utilize the new GeneralMeta type for better type safety.
- Ensured backward compatibility by updating existing test cases across multiple scenarios.
This commit is contained in:
2026-01-25 05:48:56 +00:00
parent 340cadb8ce
commit 5d5ed9ee2a
39 changed files with 164 additions and 99 deletions
+23 -1
View File
@@ -38,6 +38,20 @@ const normalizeCode = (value: string | null | undefined): string | null => {
return value;
};
const readMetaNumber = (meta: Record<string, unknown>, key: string): number | null => {
const value = meta[key];
if (typeof value === 'number' && Number.isFinite(value)) {
return value;
}
if (typeof value === 'string') {
const parsed = Number(value);
if (Number.isFinite(parsed)) {
return parsed;
}
}
return null;
};
const zScenarioStatBlock = z.object({
total: z.number(),
min: z.number(),
@@ -120,6 +134,14 @@ const mapScenarioConfig = (raw: JsonValue): ScenarioConfig => {
};
const mapGeneralRow = (row: TurnEngineGeneralRow): TurnGeneral => ({
...((): { meta: TurnGeneral['meta'] } => {
const meta = asTriggerRecord(row.meta) as Record<string, unknown>;
const killturn = readMetaNumber(meta, 'killturn');
if (killturn === null) {
throw new Error(`general.meta.killturn is required (generalId=${row.id}).`);
}
return { meta: { ...meta, killturn } as TurnGeneral['meta'] };
})(),
id: row.id,
name: row.name,
nationId: row.nationId,
@@ -159,7 +181,7 @@ const mapGeneralRow = (row: TurnEngineGeneralRow): TurnGeneral => ({
modifiers: {},
meta: {},
},
meta: asTriggerRecord(row.meta),
// meta는 상단에서 보장 처리됨.
turnTime: row.turnTime,
recentWarTime: row.recentWarTime ?? null,
});
@@ -30,7 +30,7 @@ const createNpcGeneral = (
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel,
experience: 0,
dedication: 0,
@@ -40,7 +40,7 @@ const createNpcGeneral = (
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel: 1,
experience: 0,
dedication: 0,
@@ -30,7 +30,7 @@ const createNpcGeneral = (
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel,
experience: 0,
dedication: 0,
@@ -27,7 +27,7 @@ const createNpcGeneral = (
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel: 1,
experience: 0,
dedication: 0,
@@ -29,7 +29,7 @@ const createNpcGeneral = (
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel,
experience: 0,
dedication: 0,
+1 -1
View File
@@ -28,7 +28,7 @@ const createNpcGeneral = (
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel,
experience: 0,
dedication: 0,
@@ -93,7 +93,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -122,7 +122,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -340,7 +340,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -480,7 +480,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 800 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -646,7 +646,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 24 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -675,7 +675,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 24 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -947,7 +947,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 24 },
officerLevel: 5,
experience: 0,
dedication: 0,
@@ -976,7 +976,7 @@ describe('Reserved Turn Execution Integration', () => {
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 24 },
officerLevel: 5,
experience: 0,
dedication: 0,
+1 -1
View File
@@ -21,7 +21,7 @@ const buildGeneral = (id: number, turnTime: Date): TurnGeneral => ({
specialWar: null,
},
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: {},
meta: { killturn: 24 },
officerLevel: 5,
experience: 0,
dedication: 0,