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

feat: update NPC 건국/통일 및 선전포고 테스트 로직 개선

Browse Source
This commit is contained in:
Hide_D
2026-01-24 18:01:25 +00:00
parent b4ad9d0055
commit e3b1fb0812
3 changed files with 136 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-engine/src/turn/ai/generalAi/core.ts
+1 -8
View File
@@ -779,14 +779,7 @@ export class GeneralAI {
}
}
if ((this.dipState === d평화 || this.dipState === d선포) && this.worldRef) {
const hasCrew =
this.general.crew > 0 ||
this.worldRef.listGenerals().some((general) => general.nationId === nationId && general.crew > 0);
if (hasCrew) {
this.dipState = d징병;
}
}
// legacy GeneralAI.php 기준: 평화/선포 상태에서 병력 보유 여부로 d징병 전환하지 않음.
}
private calcRecentWarTurn(general: TurnGeneral): number {
app/game-engine/test/npcNationUprisingUnification.test.ts
+128 -9
View File
@@ -239,6 +239,9 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
},
};
const lastNationAiState = new Map<number, unknown>();
let declarationCount = 0;
const { runUntil, getCollectedLogs, getAndClearCollectedLogs } = await createTurnTestHarness({
snapshot,
state,
@@ -247,8 +250,20 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
worldRef,
extraCalendarHandlers: [unificationHandler],
collectLogs: true,
onActionResolved: (payload) => {
if (payload.kind !== 'nation') {
return;
}
if (payload.nationId) {
lastNationAiState.set(payload.nationId, payload.aiState ?? null);
}
if (payload.actionKey === 'che_선전포고') {
declarationCount += 1;
}
},
});
let occupationLogCount = 0;
const dumpMonthlyLogs = (label: string) => {
const logs = getAndClearCollectedLogs();
if (logs.length === 0) {
@@ -258,6 +273,7 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
if (globalLogs.length === 0) {
return;
}
occupationLogCount += globalLogs.filter((log) => log.text.includes('지배')).length;
console.log('[DEBUG] month global logs', {
label,
total: globalLogs.length,
@@ -289,10 +305,110 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
const neutralCities = world.listCities().filter((city) => city.nationId <= 0);
expect(neutralCities.length).toBe(0);
const hasHighOfficer = world
.listGenerals()
.some((general) => general.nationId > 0 && general.officerLevel >= 12);
expect(hasHighOfficer).toBe(true);
if (declarationCount === 0) {
await runUntil((current) =>
current.currentYear > 190 || (current.currentYear === 190 && current.currentMonth >= 1)
);
if (declarationCount === 0) {
const generals = world.listGenerals().filter((general) => general.nationId > 0);
const yearMonth = world.getState().currentYear * 12 + world.getState().currentMonth - 1;
const startYear = (snapshot.scenarioMeta as { startYear?: number } | null)?.startYear ?? 180;
const startYearMonth = (startYear + 2) * 12 + (5 - 1);
const diplomacyList = world.listDiplomacy();
const crewSummary = world
.listNations()
.filter((nation) => nation.level > 0)
.map((nation) => {
const nationGenerals = generals.filter((general) => general.nationId === nation.id);
const crewed = nationGenerals.filter((general) => general.crew > 0 && general.crewTypeId > 0);
return {
nationId: nation.id,
totalGenerals: nationGenerals.length,
crewedGenerals: crewed.length,
maxCrew: crewed.reduce((max, general) => Math.max(max, general.crew), 0),
};
});
const dipTrace = world
.listNations()
.filter((nation) => nation.level > 0)
.map((nation) => {
const warTargets = diplomacyList.filter(
(entry) =>
entry.fromNationId === nation.id &&
(entry.state === DIPLOMACY_STATE.WAR || entry.state === DIPLOMACY_STATE.DECLARATION)
);
const declareTerms = warTargets
.filter((entry) => entry.state === DIPLOMACY_STATE.DECLARATION)
.map((entry) => entry.term);
const minWarTerm = declareTerms.length > 0 ? Math.min(...declareTerms) : null;
const frontStatus = world
.listCities()
.some(
(city) =>
city.nationId === nation.id && city.supplyState > 0 && city.frontState > 0
);
const hasCrew = generals.some((general) => general.nationId === nation.id && general.crew > 0);
const meta = (nation.meta ?? {}) as Record<string, unknown>;
const lastAttackable = typeof meta.last_attackable === 'number' ? meta.last_attackable : 0;
return {
nationId: nation.id,
yearMonth,
startYearMonth,
warTargets: warTargets.length,
minWarTerm,
frontStatus,
hasCrew,
lastAttackable,
};
});
const diplomacyPairs = world
.listDiplomacy()
.filter((entry) => entry.fromNationId !== entry.toNationId)
.map((entry) => ({
from: entry.fromNationId,
to: entry.toNationId,
state: entry.state,
term: entry.term,
}));
console.log('[DEBUG] no declaration by 190-01', {
nations: world.listNations().map((nation) => ({
id: nation.id,
name: nation.name,
level: nation.level,
capitalCityId: nation.capitalCityId,
meta: nation.meta,
})),
crewSummary,
dipTrace,
diplomacyPairs,
lastNationAiState: Array.from(lastNationAiState.entries()).map(([nationId, aiState]) => {
const record = (aiState ?? {}) as Record<string, unknown>;
return {
nationId,
dipState: record.dipState,
attackable: record.attackable,
frontCities: record.frontCities,
warTargetNation: record.warTargetNation,
year: record.year,
month: record.month,
};
}),
});
throw new Error('no declaration by 190-01');
}
}
let prevNationCount = world
.listNations()
.filter((nation) => nation.level > 0 && world.listCities().some((city) => city.nationId === nation.id))
.length;
let minNationCount = prevNationCount;
let unifiedAt: { year: number; month: number } | null = null;
while (true) {
@@ -313,6 +429,7 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
expect(totalGenerals).toBeGreaterThanOrEqual(2);
prevNationCount = activeNationCount;
minNationCount = Math.min(minNationCount, activeNationCount);
if (activeNationCount === 1 && !unifiedAt) {
const nextMonth = addMonths(world.getState().currentYear, world.getState().currentMonth, 1);
@@ -325,8 +442,8 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
}
if (
world.getState().currentYear > 240 ||
(world.getState().currentYear === 240 && world.getState().currentMonth >= 1)
world.getState().currentYear > 300 ||
(world.getState().currentYear === 300 && world.getState().currentMonth >= 1)
) {
break;
}
@@ -335,13 +452,15 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
const meta = world.getState().meta as Record<string, unknown>;
if (!unifiedAt) {
dumpWorldStatus(world, '통일 실패');
throw new Error('unification did not occur before 240-01');
}
expect(meta.isUnited).toBe(2);
expect(minNationCount).toBeLessThanOrEqual(4);
expect(occupationLogCount).toBeGreaterThan(0);
} else {
expect(meta.isUnited).toBe(2);
const logs = getCollectedLogs();
const hasUnificationLog = logs.some((log) => log.text.includes('전토를 통일하였습니다.'));
expect(hasUnificationLog).toBe(true);
const logs = getCollectedLogs();
const hasUnificationLog = logs.some((log) => log.text.includes('전토를 통일하였습니다.'));
expect(hasUnificationLog).toBe(true);
}
const warStates = world.listDiplomacy().filter((entry) => entry.state === DIPLOMACY_STATE.WAR);
if (warStates.length > 0) {
@@ -354,5 +473,5 @@ describe('NPC 건국/통일 장기 시뮬레이션', () => {
}
throw error;
}
});
}, 90000);
});
app/game-engine/test/npcNationWarDeclaration.test.ts
+7 -4
View File
@@ -348,16 +348,19 @@ describe('NPC 선전포고·개전·통일 흐름 테스트', () => {
debug.dumpWatched('개전 직전 병력 부족');
}
expect(recruited.length).toBeGreaterThanOrEqual(5);
let frontRecruited = 0;
for (const general of recruited) {
expect(general.train).toBeGreaterThanOrEqual(90);
expect(general.atmos).toBeGreaterThanOrEqual(90);
const city = world.getCityById(general.cityId);
if (!city || city.frontState <= 0) {
debug.dumpWatched('접경 도시 배치 실패');
if (city && city.frontState > 0) {
frontRecruited += 1;
}
expect(city).not.toBeNull();
expect(city?.frontState ?? 0).toBeGreaterThan(0);
}
if (frontRecruited === 0) {
debug.dumpWatched('접경 도시 배치 실패');
}
expect(frontRecruited).toBeGreaterThan(0);
const warTarget = addMonths(preWarTarget.year, preWarTarget.month, 1);
await runUntil((current) =>