fix(engine): preserve core monthly event arguments
This commit is contained in:
@@ -0,0 +1,259 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { LogCategory, LogFormat, LogScope, type City, type MapDefinition, type Nation } from '@sammo-ts/logic';
|
||||
|
||||
import { createIncomeHandler } from '../src/turn/incomeHandler.js';
|
||||
import { InMemoryTurnWorld } from '../src/turn/inMemoryWorld.js';
|
||||
import {
|
||||
createNewYearHandler,
|
||||
createNoticeToHistoryLogHandler,
|
||||
createProcessIncomeActionHandler,
|
||||
createResetOfficerLockHandler,
|
||||
} from '../src/turn/monthlyCoreEventAction.js';
|
||||
import { createMonthlyEventHandler, type MonthlyEventActionHandler } from '../src/turn/monthlyEventHandler.js';
|
||||
import type { TurnGeneral, TurnWorldSnapshot, TurnWorldState } from '../src/turn/types.js';
|
||||
|
||||
const map: MapDefinition = {
|
||||
id: 'core-event-test',
|
||||
name: 'core-event-test',
|
||||
cities: [],
|
||||
defaults: { trust: 50, trade: 100, supplyState: 1, frontState: 0 },
|
||||
};
|
||||
|
||||
const buildNation = (): Nation => ({
|
||||
id: 1,
|
||||
name: '갑국',
|
||||
color: '#777777',
|
||||
capitalCityId: 1,
|
||||
chiefGeneralId: 1,
|
||||
gold: 10_000,
|
||||
rice: 20_000,
|
||||
power: 0,
|
||||
level: 1,
|
||||
typeCode: 'che_중립',
|
||||
meta: { rate: 20, bill: 0, chief_set: 1 },
|
||||
});
|
||||
|
||||
const buildCity = (): City => ({
|
||||
id: 1,
|
||||
name: '갑성',
|
||||
nationId: 1,
|
||||
level: 4,
|
||||
state: 0,
|
||||
population: 10_000,
|
||||
populationMax: 20_000,
|
||||
agriculture: 1_000,
|
||||
agricultureMax: 2_000,
|
||||
commerce: 1_000,
|
||||
commerceMax: 2_000,
|
||||
security: 1_000,
|
||||
securityMax: 2_000,
|
||||
supplyState: 1,
|
||||
frontState: 0,
|
||||
defence: 500,
|
||||
defenceMax: 1_000,
|
||||
wall: 500,
|
||||
wallMax: 1_000,
|
||||
conflict: {},
|
||||
meta: { trust: 80, trade: 100, officer_set: 1 },
|
||||
});
|
||||
|
||||
const buildGeneral = (id: number, nationId: number, belong: number): TurnGeneral => ({
|
||||
id,
|
||||
name: `장수${id}`,
|
||||
nationId,
|
||||
cityId: 1,
|
||||
troopId: 0,
|
||||
stats: { leadership: 50, strength: 50, intelligence: 50 },
|
||||
experience: 0,
|
||||
dedication: 100,
|
||||
officerLevel: 5,
|
||||
role: {
|
||||
personality: null,
|
||||
specialDomestic: null,
|
||||
specialWar: null,
|
||||
items: { horse: null, weapon: null, book: null, item: null },
|
||||
},
|
||||
injury: 0,
|
||||
gold: 1_000,
|
||||
rice: 1_000,
|
||||
crew: 100,
|
||||
crewTypeId: 1100,
|
||||
train: 50,
|
||||
atmos: 50,
|
||||
age: 30,
|
||||
npcState: 0,
|
||||
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
|
||||
meta: { killturn: 24, belong },
|
||||
turnTime: new Date('0190-06-01T00:00:00.000Z'),
|
||||
});
|
||||
|
||||
const buildWorld = (
|
||||
events: TurnWorldSnapshot['events'],
|
||||
registerActions: (world: () => InMemoryTurnWorld | null) => Map<string, MonthlyEventActionHandler>,
|
||||
options: {
|
||||
currentMonth: number;
|
||||
generals?: TurnGeneral[];
|
||||
nations?: Nation[];
|
||||
cities?: City[];
|
||||
}
|
||||
): InMemoryTurnWorld => {
|
||||
const state: TurnWorldState = {
|
||||
id: 1,
|
||||
currentYear: 190,
|
||||
currentMonth: options.currentMonth,
|
||||
tickSeconds: 600,
|
||||
lastTurnTime: new Date(`0190-${String(options.currentMonth).padStart(2, '0')}-01T00:00:00.000Z`),
|
||||
meta: { hiddenSeed: 'monthly-core-actions' },
|
||||
};
|
||||
const snapshot: TurnWorldSnapshot = {
|
||||
scenarioConfig: {
|
||||
stat: { total: 300, min: 10, max: 100, npcTotal: 150, npcMax: 50, npcMin: 10, chiefMin: 70 },
|
||||
iconPath: '',
|
||||
map: {},
|
||||
const: { baseGold: 0, baseRice: 0 },
|
||||
environment: { mapName: map.id, unitSet: 'default' },
|
||||
},
|
||||
scenarioMeta: {
|
||||
title: 'core event test',
|
||||
startYear: 190,
|
||||
life: null,
|
||||
fiction: null,
|
||||
history: [],
|
||||
ignoreDefaultEvents: false,
|
||||
},
|
||||
map,
|
||||
diplomacy: [],
|
||||
events,
|
||||
initialEvents: [],
|
||||
generals: options.generals ?? [],
|
||||
cities: options.cities ?? [],
|
||||
nations: options.nations ?? [],
|
||||
troops: [],
|
||||
};
|
||||
let world: InMemoryTurnWorld | null = null;
|
||||
const actions = registerActions(() => world);
|
||||
world = new InMemoryTurnWorld(state, snapshot, {
|
||||
schedule: { entries: [{ startMinute: 0, tickMinutes: 10 }] },
|
||||
calendarHandler: createMonthlyEventHandler({
|
||||
getWorld: () => world,
|
||||
startYear: 190,
|
||||
actions,
|
||||
}),
|
||||
});
|
||||
return world;
|
||||
};
|
||||
|
||||
describe('core monthly event actions at the real month boundary', () => {
|
||||
it('preserves notice format, NewYear month log, age/belong, and officer lock reset', async () => {
|
||||
const world = buildWorld(
|
||||
[
|
||||
{
|
||||
id: 1,
|
||||
targetCode: 'month',
|
||||
priority: 1,
|
||||
condition: true,
|
||||
action: [
|
||||
['NoticeToHistoryLog', '<S>새해 알림</>', LogFormat.EVENT_YEAR_MONTH],
|
||||
['NewYear'],
|
||||
['ResetOfficerLock'],
|
||||
],
|
||||
meta: {},
|
||||
},
|
||||
],
|
||||
(getWorld) =>
|
||||
new Map([
|
||||
['NoticeToHistoryLog', createNoticeToHistoryLogHandler({ getWorld })],
|
||||
['NewYear', createNewYearHandler({ getWorld })],
|
||||
['ResetOfficerLock', createResetOfficerLockHandler({ getWorld })],
|
||||
]),
|
||||
{
|
||||
currentMonth: 12,
|
||||
generals: [buildGeneral(1, 1, 3), buildGeneral(2, 0, 4)],
|
||||
nations: [buildNation()],
|
||||
cities: [buildCity()],
|
||||
}
|
||||
);
|
||||
|
||||
await world.advanceMonth(new Date('0191-01-01T00:00:00.000Z'));
|
||||
|
||||
expect(world.getGeneralById(1)).toMatchObject({ age: 31, meta: { belong: 4 } });
|
||||
expect(world.getGeneralById(2)).toMatchObject({ age: 31, meta: { belong: 4 } });
|
||||
expect(world.getNationById(1)?.meta.chief_set).toBe(0);
|
||||
expect(world.getCityById(1)?.meta.officer_set).toBe(0);
|
||||
expect(world.peekDirtyState().logs).toEqual([
|
||||
{
|
||||
scope: LogScope.SYSTEM,
|
||||
category: LogCategory.HISTORY,
|
||||
text: '<S>새해 알림</>',
|
||||
format: LogFormat.EVENT_YEAR_MONTH,
|
||||
},
|
||||
{
|
||||
scope: LogScope.SYSTEM,
|
||||
category: LogCategory.ACTION,
|
||||
text: '<C>191</>년이 되었습니다.',
|
||||
format: LogFormat.MONTH,
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it('uses the ProcessIncome resource argument instead of inferring it from the month', async () => {
|
||||
const world = buildWorld(
|
||||
[
|
||||
{
|
||||
id: 2,
|
||||
targetCode: 'month',
|
||||
priority: 1,
|
||||
condition: true,
|
||||
action: [['ProcessIncome', 'gold']],
|
||||
meta: {},
|
||||
},
|
||||
],
|
||||
(getWorld) => {
|
||||
const incomeHandler = createIncomeHandler({
|
||||
getWorld,
|
||||
scenarioConfig: {
|
||||
stat: {
|
||||
total: 300,
|
||||
min: 10,
|
||||
max: 100,
|
||||
npcTotal: 150,
|
||||
npcMax: 50,
|
||||
npcMin: 10,
|
||||
chiefMin: 70,
|
||||
},
|
||||
iconPath: '',
|
||||
map: {},
|
||||
const: { baseGold: 0, baseRice: 0 },
|
||||
environment: { mapName: map.id, unitSet: 'default' },
|
||||
},
|
||||
nationTraits: new Map(),
|
||||
});
|
||||
return new Map([['ProcessIncome', createProcessIncomeActionHandler(incomeHandler)]]);
|
||||
},
|
||||
{
|
||||
currentMonth: 6,
|
||||
generals: [buildGeneral(1, 1, 3)],
|
||||
nations: [buildNation()],
|
||||
cities: [buildCity()],
|
||||
}
|
||||
);
|
||||
|
||||
await world.advanceMonth(new Date('0190-07-01T00:00:00.000Z'));
|
||||
|
||||
expect(world.getNationById(1)).toMatchObject({
|
||||
gold: 10_210,
|
||||
rice: 20_000,
|
||||
meta: {
|
||||
prev_income_gold: 210,
|
||||
},
|
||||
});
|
||||
expect(world.getGeneralById(1)).toMatchObject({ gold: 1_000, rice: 1_000 });
|
||||
expect(world.getNationById(1)?.meta.prev_income_rice).toBeUndefined();
|
||||
expect(world.peekDirtyState().logs).toContainEqual(
|
||||
expect.objectContaining({
|
||||
category: LogCategory.HISTORY,
|
||||
text: '<W><b>【지급】</b></>봄이 되어 봉록에 따라 자금이 지급됩니다.',
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user