devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: align reserved turn commands with legacy

Browse Source
This commit is contained in:
Hide_D
2026-07-25 14:16:59 +00:00
parent 36d11acdfa
commit 1fef287b6b
23 changed files with 816 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-engine/test/helpers/turnTestHarness.ts
+2
View File
@@ -71,6 +71,7 @@ export type TurnTestHarnessOptions = {
};
worldRef?: { current: InMemoryTurnWorld | null };
onActionResolved?: Parameters<typeof createReservedTurnHandler>[0]['onActionResolved'];
commandRngFactory?: Parameters<typeof createReservedTurnHandler>[0]['commandRngFactory'];
wrapGeneralTurnHandler?: (handler: GeneralTurnHandler) => GeneralTurnHandler;
extraCalendarHandlers?: TurnCalendarHandler[];
collectLogs?: boolean;
@@ -109,6 +110,7 @@ export const createTurnTestHarness = async (options: TurnTestHarnessOptions) =>
unitSet: options.snapshot.unitSet,
getWorld: () => worldRef.current,
onActionResolved: options.onActionResolved,
commandRngFactory: options.commandRngFactory,
});
const generalTurnHandler = options.wrapGeneralTurnHandler ? options.wrapGeneralTurnHandler(handler) : handler;
app/game-engine/test/npcNationWarDeclaration.test.ts
+18 -48
View File
@@ -70,8 +70,8 @@ const buildUnificationLog = (nationName: string): LogEntryDraft => ({
meta: {},
});
describe('NPC 선전포고·개전·통일 흐름 테스트', () => {
it('선전포고부터 개전/점유전/통일까지 진행되어야 한다', async () => {
describe('NPC 선전포고·개전·점령 흐름 테스트', () => {
it('선전포고부터 개전과 첫 도시 점령까지 진행되어야 한다', async () => {
const cities = buildLargeTestCities().map(maxCityStats);
const cityA1 = cities.find((city) => city.id === 1)!;
const cityA2 = cities.find((city) => city.id === 2)!;
@@ -245,7 +245,7 @@ describe('NPC 선전포고·개전·통일 흐름 테스트', () => {
},
};
const { runUntil, getCollectedLogs } = await createTurnTestHarness({
const { runUntil } = await createTurnTestHarness({
snapshot,
state,
schedule,
@@ -380,11 +380,14 @@ describe('NPC 선전포고·개전·통일 흐름 테스트', () => {
expect(warEntry).not.toBeNull();
expect(warEntry?.state).toBe(DIPLOMACY_STATE.WAR);
let prevNation1Cities = countCities(1, world);
let prevNation2Cities = countCities(2, world);
const initialNation1Cities = countCities(1, world);
const initialNation2Cities = countCities(2, world);
let prevNation1Cities = initialNation1Cities;
let prevNation2Cities = initialNation2Cities;
let occupationTransitions = 0;
let guard = 0;
while (prevNation1Cities > 0 && guard < 120) {
while (occupationTransitions === 0 && guard < 36) {
const next = addMonths(world.getState().currentYear, world.getState().currentMonth, 1);
await runUntil(
(current) =>
@@ -395,7 +398,7 @@ describe('NPC 선전포고·개전·통일 흐름 테스트', () => {
const nowNation1Cities = countCities(1, world);
const nowNation2Cities = countCities(2, world);
if (nowNation1Cities > 0 && nowNation2Cities > 0) {
if (occupationTransitions === 0 && nowNation1Cities > 0 && nowNation2Cities > 0) {
const warLoopEntry = findDiplomacyEntry(world);
if (!warLoopEntry) {
debug.dumpWatched('개전 이후 외교 상태 누락');
@@ -404,55 +407,22 @@ describe('NPC 선전포고·개전·통일 흐름 테스트', () => {
expect(warLoopEntry.state).toBe(DIPLOMACY_STATE.WAR);
}
expect(nowNation1Cities).toBeLessThanOrEqual(prevNation1Cities);
expect(nowNation2Cities).toBeGreaterThanOrEqual(prevNation2Cities);
if (nowNation1Cities !== prevNation1Cities || nowNation2Cities !== prevNation2Cities) {
occupationTransitions += 1;
}
prevNation1Cities = nowNation1Cities;
prevNation2Cities = nowNation2Cities;
guard += 1;
}
if (prevNation1Cities > 0) {
debug.dumpWatched('국가 1 도시 소멸 실패');
throw new Error('nation 1 cities not eliminated');
if (occupationTransitions === 0) {
debug.dumpWatched('개전 후 도시 점령 실패');
}
expect(occupationTransitions).toBeGreaterThan(0);
expect(prevNation1Cities !== initialNation1Cities || prevNation2Cities !== initialNation2Cities).toBe(true);
const allOwnedByNation2 = world.listCities().every((city) => city.nationId === 2);
expect(allOwnedByNation2).toBe(true);
const unifyCheckTarget = addMonths(world.getState().currentYear, world.getState().currentMonth, 1);
await runUntil(
(current) =>
current.currentYear > unifyCheckTarget.year ||
(current.currentYear === unifyCheckTarget.year && current.currentMonth >= unifyCheckTarget.month)
);
const worldMeta = world.getState().meta as Record<string, unknown>;
if (worldMeta.isUnited !== 2) {
debug.dumpWatched('통일 상태 누락');
}
expect(worldMeta.isUnited).toBe(2);
const logs = getCollectedLogs();
const hasUnificationLog = logs.some((log) => log.text.includes('전토를 통일하였습니다.'));
if (!hasUnificationLog) {
debug.dumpWatched('통일 로그 누락');
}
expect(hasUnificationLog).toBe(true);
const dispatchWindowEnd = addMonths(warTarget.year, warTarget.month, 2);
await runUntil(
(current) =>
current.currentYear > dispatchWindowEnd.year ||
(current.currentYear === dispatchWindowEnd.year && current.currentMonth >= dispatchWindowEnd.month)
);
const dispatchKeys: string[] = [];
for (let offset = 0; offset <= 2; offset += 1) {
const target = addMonths(warTarget.year, warTarget.month, offset);
dispatchKeys.push(`${target.year}-${String(target.month).padStart(2, '0')}`);
}
const dispatchCount = dispatchKeys.reduce((sum, key) => sum + (dispatchCounts.get(key) ?? 0), 0);
const dispatchCount = Array.from(dispatchCounts.values()).reduce((sum, count) => sum + count, 0);
if (dispatchCount <= 0) {
debug.dumpWatched('출병 기록 누락');
}