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

fix general founding and rebellion parity

Browse Source
This commit is contained in:
Hide_D
2026-07-26 17:50:56 +00:00
parent 80a2c9502f
commit 3fb75ccf03
16 changed files with 473 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-engine/src/turn/ai/generalAi/general/politicsActions.ts
+1 -3
View File
@@ -154,12 +154,10 @@ export const do거병 = (ai: GeneralAI) => {
};
export const do건국 = (ai: GeneralAI) => {
const mapName = ai.scenarioConfig.environment.mapName ?? 'sammo';
const prefix = mapName.endsWith('_') ? mapName : `${mapName}_`;
const nationType =
ai.aiConst.availableNationTypes.length > 0
? (ai.rng.choice(ai.aiConst.availableNationTypes) as string)
: `${prefix}def`;
: 'che_도적';
const colorType = ai.rng.nextRangeInt(0, 32);
const nationName = `㉿${Array.from(ai.general.name).slice(1).join('')}`;
app/game-engine/src/turn/reservedTurnHandler.ts
+6
View File
@@ -1261,6 +1261,12 @@ export const createReservedTurnHandler = async (options: {
if (resolution.created?.nations) {
const newNations = resolution.created.nations as Nation[];
createdNations.push(...newNations);
if (actionKey === 'che_거병') {
for (const nation of newNations) {
options.reservedTurns.ensureNationTurns(nation.id, 12);
options.reservedTurns.ensureNationTurns(nation.id, 11);
}
}
if (worldOverlay) {
for (const nation of newNations) {
worldOverlay.syncNation(nation);
app/game-engine/test/reservedTurnExecution.test.ts
+11 -6
View File
@@ -787,7 +787,7 @@ describe('Reserved Turn Execution Integration', () => {
generalId: 1,
turnIdx: 1,
actionCode: 'che_건국',
arg: { nationName: 'NewEmpire', nationType: 'che_def', colorType: 0 },
arg: { nationName: 'NewEmpire', nationType: 'che_도적', colorType: 0 },
},
{ generalId: 2, turnIdx: 1, actionCode: 'che_농지개간', arg: {} },
// 2
@@ -798,7 +798,7 @@ describe('Reserved Turn Execution Integration', () => {
generalId: 1,
turnIdx: 3,
actionCode: 'che_건국',
arg: { nationName: 'NewEmpire', nationType: 'che_def', colorType: 0 },
arg: { nationName: 'NewEmpire', nationType: 'che_도적', colorType: 0 },
},
{ generalId: 2, turnIdx: 3, actionCode: 'che_농지개간', arg: {} },
// 4
@@ -809,7 +809,7 @@ describe('Reserved Turn Execution Integration', () => {
generalId: 1,
turnIdx: 5,
actionCode: 'che_건국',
arg: { nationName: 'NewEmpire', nationType: 'che_def', colorType: 0 },
arg: { nationName: 'NewEmpire', nationType: 'che_도적', colorType: 0 },
},
{ generalId: 2, turnIdx: 5, actionCode: 'che_농지개간', arg: {} },
];
@@ -1058,7 +1058,7 @@ describe('Reserved Turn Execution Integration', () => {
generalId: 1,
turnIdx: 0,
actionCode: 'che_건국',
arg: { nationName: 'Empire', nationType: 'che_def', colorType: 0 },
arg: { nationName: 'Empire', nationType: 'che_도적', colorType: 0 },
},
];
@@ -1102,7 +1102,7 @@ describe('Reserved Turn Execution Integration', () => {
turnsG1[0] = { action: 'che_거병', args: {} };
turnsG1[1] = {
action: 'che_건국',
args: { nationName: 'Empire', nationType: 'che_def', colorType: 0 },
args: { nationName: 'Empire', nationType: 'che_도적', colorType: 0 },
};
await reservedTurnStore.flushChanges();
@@ -1112,6 +1112,11 @@ describe('Reserved Turn Execution Integration', () => {
maxGenerals: 100,
catchUpCap: 10,
});
const uprisingNationId = world.getGeneralById(1)!.nationId;
expect(reservedTurnStore.peekDirtyState().nationInitializationKeys).toEqual([
`${uprisingNationId}:12`,
`${uprisingNationId}:11`,
]);
world.consumeDirtyState(); // clear logs
// Execute Founding attempt (Turn 2)
@@ -1145,7 +1150,7 @@ describe('Reserved Turn Execution Integration', () => {
const turnsG1_v2 = reservedTurnStore.getGeneralTurns(1);
turnsG1_v2[0] = {
action: 'che_건국',
args: { nationName: 'Empire', nationType: 'che_def', colorType: 0 },
args: { nationName: 'Empire', nationType: 'che_도적', colorType: 0 },
};
await reservedTurnStore.flushChanges();