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

시나리오 기본 시작 연도와 출병 제한 기준 통일

Browse Source
This commit is contained in:
Hide_D
2026-09-17 00:53:24 +00:00
parent 581ecd6a7b
commit d89bdc439f
16 changed files with 393 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-api/src/turns/commandTable.ts
+12 -9
View File
@@ -18,7 +18,13 @@ import type {
TriggerValue,
UnitSetDefinition,
} from '@sammo-ts/logic';
import { evaluateConstraints, LEGACY_DEFAULT_MAX_LEVEL, resolveNonAggressionMaxEndYear } from '@sammo-ts/logic';
import {
resolveScenarioStartYear,
LEGACY_DEFAULT_OPENING_PART_YEAR,
evaluateConstraints,
LEGACY_DEFAULT_MAX_LEVEL,
resolveNonAggressionMaxEndYear,
} from '@sammo-ts/logic';
import type { GeneralActionModule } from '@sammo-ts/logic/actionModules/general.js';
import { CommandResolver as RecruitmentCommandResolver } from '@sammo-ts/logic/actions/turn/general/che_징병.js';
import { projectItemSlots, readItemInventoryFromMeta } from '@sammo-ts/logic/items/index.js';
@@ -344,7 +350,7 @@ const buildCommandEnv = (worldState: WorldStateRow): CommandEnv => {
sabotageDefenceCoefByGeneralCount: resolveNumber(constValues, ['sabotageDefenceCoefByGeneralCount'], 0),
sabotageDamageMin: resolveNumber(constValues, ['sabotageDamageMin'], 0),
sabotageDamageMax: resolveNumber(constValues, ['sabotageDamageMax'], 0),
openingPartYear: resolveNumber(constValues, ['openingPartYear'], 0),
openingPartYear: resolveNumber(constValues, ['openingPartYear'], LEGACY_DEFAULT_OPENING_PART_YEAR),
maxGeneral: resolveNumber(constValues, ['defaultMaxGeneral', 'maxGeneral'], 0),
defaultNpcGold: resolveNumber(constValues, ['defaultNpcGold', 'defaultGold'], DEFAULT_GENERAL_GOLD),
defaultNpcRice: resolveNumber(constValues, ['defaultNpcRice', 'defaultRice'], DEFAULT_GENERAL_RICE),
@@ -370,8 +376,8 @@ const buildConstraintEnv = (worldState: WorldStateRow): Record<string, unknown>
const constValues = asRecord(config.const);
const meta = asRecord(worldState.meta);
const scenarioMeta = asRecord(meta.scenarioMeta);
const startYear = typeof scenarioMeta.startYear === 'number' ? scenarioMeta.startYear : undefined;
const relYear = typeof startYear === 'number' ? worldState.currentYear - startYear : undefined;
const startYear = resolveScenarioStartYear(scenarioMeta.startYear);
const relYear = worldState.currentYear - startYear;
const joinModeRaw = config.join_mode ?? config.joinMode;
const joinMode = typeof joinModeRaw === 'string' ? joinModeRaw : 'full';
@@ -383,7 +389,7 @@ const buildConstraintEnv = (worldState: WorldStateRow): Record<string, unknown>
startYear,
relYear,
join_mode: joinMode,
openingPartYear: resolveNumber(constValues, ['openingPartYear'], 0),
openingPartYear: resolveNumber(constValues, ['openingPartYear'], LEGACY_DEFAULT_OPENING_PART_YEAR),
maxTechLevel: resolveNumber(constValues, ['maxTechLevel'], 12),
};
};
@@ -559,10 +565,7 @@ export const buildRecruitmentCommandInfo = (options: {
avoid: crewType.avoid,
baseCost: displayCost.gold,
baseRice: displayCost.rice,
info: [
...crewType.info,
...crewType.requirements.map(formatCrewTypeRequirement).filter(Boolean),
],
info: [...crewType.info, ...crewType.requirements.map(formatCrewTypeRequirement).filter(Boolean)],
};
}),
}));
app/game-api/test/commandTable.test.ts
+24
View File
@@ -102,6 +102,30 @@ const buildNation = (): NationRow =>
}) as unknown as NationRow;
describe('buildTurnCommandTable', () => {
it.each([null, 180, 189, 2025, 0])(
'uses the resolved calendar for sortie reservation when startYear=%s',
async (startYear) => {
const base = startYear ?? 180;
for (const offset of [0, 1, 2, 3]) {
const worldState = buildWorldState('full');
worldState.currentYear = base + offset;
worldState.meta = { scenarioMeta: { startYear } };
const general = buildGeneral();
general.rice = 10000;
const table = await buildTurnCommandTable({
worldState,
general,
city: buildCity(),
nation: buildNation(),
nationGenerals: [],
});
const sortie = table.general.flatMap(({ values }) => values).find(({ key }) => key === 'che_출병');
expect(sortie).toBeDefined();
expect(sortie?.status === 'blocked').toBe(offset === 0);
}
}
);
const findCommand = (table: Awaited<ReturnType<typeof buildTurnCommandTable>>, key: string) =>
[...table.general, ...table.nation].flatMap(({ values }) => values).find((command) => command.key === key);