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

fix: Ref 게임 로직과 시나리오 풀 호환을 보정

Browse Source 
월 경계, 전투 기술 상한, 연감과 베팅·설문·경매 정산 순서를 Ref 계약에 맞춘다.\n\n시나리오 일반 풀을 ENGINE mutation과 logical tick 기반으로 직렬화하고 914·915 catalog 및 조건부 100기 pool 실행 경계를 추가한다.\n\n경매 worker는 세대별 durable event만 만들고 ENGINE이 row lock 후 상태 전이와 정산을 단일 transaction으로 소유한다.
This commit is contained in:
Hide_D
2026-08-23 16:26:14 +00:00
parent bf6b7be7b0
commit 85591c68ad
114 changed files with 13327 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/logic/test/actions/turn/generalPool.test.ts
+129
View File
@@ -0,0 +1,129 @@
import { describe, expect, it } from 'vitest';
import {
buildScenarioGeneralPoolClaimMeta,
getScenarioGeneralPoolCandidateWeight,
parseScenarioGeneralPoolCandidate,
pickUniqueScenarioGeneralPoolCandidates,
readScenarioGeneralPoolClaim,
resolveLegacyNpcStatTypeFromFixedStats,
type ScenarioGeneralPoolCandidate,
} from '../../../src/actions/turn/generalPool.js';
const candidate = (poolEntryId: number, name: string, weight: number): ScenarioGeneralPoolCandidate => ({
poolEntryId,
uniqueName: name,
name,
dex: [weight, 0, 0, 0, 0],
sourceInfo: {},
});
describe('scenario general pool', () => {
it('keeps the Ref weighted array and consumes duplicate draws before selecting a new row', () => {
const draws = [0, 0, 0.75];
let drawCount = 0;
const rng = {
nextFloat1: () => {
const value = draws[drawCount];
drawCount += 1;
return value ?? 0;
},
nextBool: () => false,
nextInt: () => 0,
};
expect(pickUniqueScenarioGeneralPoolCandidates(rng, [candidate(1, '갑', 1), candidate(2, '을', 1)], 2)).toEqual(
[expect.objectContaining({ poolEntryId: 1 }), expect.objectContaining({ poolEntryId: 2 })]
);
expect(drawCount).toBe(3);
});
it('fails with the Ref pool-shortage message instead of using a random-name fallback', () => {
const rng = { nextFloat1: () => 0, nextBool: () => false, nextInt: () => 0 };
expect(() => pickUniqueScenarioGeneralPoolCandidates(rng, [candidate(1, '갑', 1)], 2)).toThrow('pool 부족');
});
it('keeps zero-dex centennial NPC candidates selectable with the Ref minimum weight', () => {
const centennial = {
...candidate(3, '성장후보', 0),
sourceInfo: { event100Growth: true },
};
let draws = 0;
const rng = {
nextFloat1: () => {
draws += 1;
return 0;
},
nextBool: () => false,
nextInt: () => 0,
};
expect(getScenarioGeneralPoolCandidateWeight(centennial)).toBe(100_000);
expect(pickUniqueScenarioGeneralPoolCandidates(rng, [centennial], 1)).toEqual([centennial]);
expect(draws).toBe(1);
});
it('parses the U30 builder fields and round-trips the persisted claim marker', () => {
const parsed = parseScenarioGeneralPoolCandidate({
id: 17,
uniqueName: '풀장수',
info: {
generalName: '풀장수',
leadership: 69,
strength: 12,
intel: 80,
specialDomestic: 'che_event_징병',
dex: [1, 2, 3, 4, 5],
imgsvr: 1,
picture: 'pool.gif',
},
});
const claimedAt = new Date('0200-05-01T00:00:00.000Z');
const meta = { killturn: 1, ...buildScenarioGeneralPoolClaimMeta(parsed, claimedAt) };
expect(parsed).toMatchObject({
poolEntryId: 17,
uniqueName: '풀장수',
name: '풀장수',
stats: { leadership: 69, strength: 12, intelligence: 80 },
dex: [1, 2, 3, 4, 5],
specialDomestic: 'che_event_징병',
imageServer: 1,
picture: 'pool.gif',
});
expect(readScenarioGeneralPoolClaim(meta)).toEqual({
poolEntryId: 17,
uniqueName: '풀장수',
claimedAt: claimedAt.toISOString(),
});
});
it('only consumes a stat-type draw for an ambiguous fixed-stat candidate', () => {
let draws = 0;
const rng = {
nextFloat1: () => {
draws += 1;
return 0;
},
nextBool: () => false,
nextInt: () => 0,
};
expect(
resolveLegacyNpcStatTypeFromFixedStats(rng, {
leadership: 70,
strength: 80,
intelligence: 10,
})
).toBe('무');
expect(draws).toBe(0);
expect(
resolveLegacyNpcStatTypeFromFixedStats(rng, {
leadership: 70,
strength: 50,
intelligence: 50,
})
).toBe('무');
expect(draws).toBe(1);
});
});
packages/logic/test/actions/turn/nationVolunteerRecruit.test.ts
+163 -2
View File
@@ -2,6 +2,7 @@ import { ConstantRNG, RandUtil } from '@sammo-ts/common';
import { describe, expect, it } from 'vitest';
import type { General, Nation } from '../../../src/domain/entities.js';
import { parseScenarioGeneralPoolCandidate } from '../../../src/actions/turn/generalPool.js';
import {
ActionResolver,
type VolunteerRecruitEnvironment,
@@ -80,10 +81,19 @@ describe('nation volunteer recruitment lifespan', () => {
currentYear: 190,
currentMonth: 1,
startYear: 180,
centennialRules: {
defaultStatMin: 15,
defaultStatMax: 80,
defaultStatTotal: 165,
maxStatLevel: 255,
defaultSpecialDomestic: null,
dexLimit: 1_000_000,
},
centennialNpcDexTargetRatio: 0.4,
averageNationGeneralCount: 0,
nationAverageStats: { leadership: 50, strength: 50, intelligence: 50 },
nationAverageExperience: 1_000,
nationAverageDedication: 1_000,
nationAverageExperience: 0,
nationAverageDedication: 0,
nationAverageDex: [100, 100, 100, 100, 100],
friendlyGenerals: [general],
createGeneralId: () => 2,
@@ -104,10 +114,161 @@ describe('nation volunteer recruitment lifespan', () => {
name: 'ⓖ장수',
bornYear: 170,
deadYear: 200,
experience: 2_000,
dedication: 2_000,
meta: {
birthYear: 170,
deathYear: 200,
},
});
});
it('uses a U30 candidate batch while keeping the Ref volunteer overrides', () => {
const resolver = new ActionResolver([], environment);
const turnTimeBase = new Date('0190-01-01T00:00:00.000Z');
const poolCandidate = parseScenarioGeneralPoolCandidate({
id: 17,
uniqueName: '의병후보',
info: {
generalName: '의병후보',
leadership: 70,
strength: 80,
intel: 10,
specialDomestic: 'che_event_징병',
dex: [11, 22, 33, 44, 55],
imgsvr: 1,
picture: 'volunteer.gif',
},
});
const context = {
general: structuredClone(general),
nation: structuredClone(nation),
rng: new RandUtil(new ConstantRNG(0)),
addLog: () => undefined,
currentYear: 190,
currentMonth: 1,
startYear: 180,
centennialRules: {
defaultStatMin: 15,
defaultStatMax: 80,
defaultStatTotal: 165,
maxStatLevel: 255,
defaultSpecialDomestic: null,
dexLimit: 1_000_000,
},
centennialNpcDexTargetRatio: 0.4,
averageNationGeneralCount: 0,
nationAverageStats: { leadership: 50, strength: 50, intelligence: 50 },
nationAverageExperience: 1_000,
nationAverageDedication: 1_000,
nationAverageDex: [100, 100, 100, 100, 100],
friendlyGenerals: [general],
generalPool: [poolCandidate],
existingGeneralNames: ['군주'],
createGeneralId: () => 2,
turnTermSeconds: 60,
turnTimeBase,
ticksPerSecond: 1,
} as VolunteerRecruitResolveContext;
const outcome = resolver.resolve(context, {});
const createdEffect = outcome.effects.find((effect) => effect.type === 'general:add');
expect(createdEffect?.type).toBe('general:add');
if (!createdEffect || createdEffect.type !== 'general:add') {
return;
}
expect(createdEffect.general).toMatchObject({
name: 'ⓖ의병후보',
stats: { leadership: 70, strength: 80, intelligence: 10 },
picture: 'volunteer.gif',
imageServer: 1,
role: { specialDomestic: null, specialWar: null },
meta: {
dex1: 11,
dex2: 22,
dex3: 33,
dex4: 44,
dex5: 55,
scenarioGeneralPoolClaim: {
poolEntryId: 17,
uniqueName: '의병후보',
claimedAt: turnTimeBase.toISOString(),
},
},
});
});
it('generates ordinary volunteer stats and dex before applying the S100 .9/.4 target', () => {
const resolver = new ActionResolver([], environment);
const turnTimeBase = new Date('0195-01-01T00:00:00.000Z');
const poolCandidate = parseScenarioGeneralPoolCandidate({
id: 101,
uniqueName: 'A1000101',
info: {
uniqueName: 'A1000101',
generalName: '100기의병',
leadership: 100,
strength: 80,
intel: 10,
specialDomestic: 'che_event_징병',
dex: [900_000, 800_000, 700_000, 600_000, 500_000],
imgsvr: 1,
picture: 'centennial-volunteer.gif',
event100Growth: true,
},
});
const context = {
general: structuredClone(general),
nation: structuredClone(nation),
rng: new RandUtil(new ConstantRNG(0)),
addLog: () => undefined,
currentYear: 195,
currentMonth: 1,
startYear: 180,
centennialRules: {
defaultStatMin: 15,
defaultStatMax: 80,
defaultStatTotal: 165,
maxStatLevel: 255,
defaultSpecialDomestic: null,
dexLimit: 1_000_000,
},
centennialNpcDexTargetRatio: 0.4,
averageNationGeneralCount: 0,
nationAverageStats: { leadership: 50, strength: 50, intelligence: 50 },
nationAverageExperience: 1_000,
nationAverageDedication: 1_000,
nationAverageDex: [100, 100, 100, 100, 100],
friendlyGenerals: [general],
generalPool: [poolCandidate],
existingGeneralNames: ['군주'],
createGeneralId: () => 2,
turnTermSeconds: 60,
turnTimeBase,
ticksPerSecond: 1,
} as VolunteerRecruitResolveContext;
const outcome = resolver.resolve(context, {});
const createdEffect = outcome.effects.find((effect) => effect.type === 'general:add');
expect(createdEffect?.type).toBe('general:add');
if (!createdEffect || createdEffect.type !== 'general:add') {
return;
}
expect(createdEffect.general).toMatchObject({
name: 'ⓖ100기의병',
stats: { leadership: 91, strength: 73, intelligence: 10 },
role: { specialDomestic: 'che_event_징병' },
meta: {
dex1: 360_000,
dex2: 320_000,
dex3: 280_000,
dex4: 240_000,
dex5: 200_000,
scenarioGeneralPoolClaim: { poolEntryId: 101, uniqueName: 'A1000101' },
event100_allstar: { targetId: 'A1000101', milestone: 4, dexTargetRatio: 0.4 },
},
});
});
});
packages/logic/test/actions/turn/talentScoutGeneralPool.test.ts
+229
View File
@@ -0,0 +1,229 @@
import { ConstantRNG, RandUtil } from '@sammo-ts/common';
import { describe, expect, it } from 'vitest';
import { ActionResolver, type TalentScoutResolveContext } from '../../../src/actions/turn/general/che_인재탐색.js';
import { parseScenarioGeneralPoolCandidate } from '../../../src/actions/turn/generalPool.js';
import type { City, General } from '../../../src/domain/entities.js';
const general: General = {
id: 1,
name: '탐색자',
nationId: 1,
cityId: 3,
troopId: 0,
stats: { leadership: 70, strength: 70, intelligence: 70 },
experience: 1_000,
dedication: 1_000,
officerLevel: 1,
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: 0,
crewTypeId: 0,
train: 0,
atmos: 0,
age: 30,
npcState: 0,
triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
meta: { killturn: 24 },
};
const city: City = {
id: 3,
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: 1_000,
defenceMax: 2_000,
wall: 1_000,
wallMax: 2_000,
meta: {},
};
describe('talent scout scenario general pool', () => {
it('keeps the U30 fixed stats and dex while applying the Ref scout overrides', () => {
const resolver = new ActionResolver([], {
develCost: 100,
maxGeneral: 100,
defaultNpcGold: 1_000,
defaultNpcRice: 1_000,
defaultCrewTypeId: 0,
defaultSpecialDomestic: null,
defaultSpecialWar: null,
availablePersonalities: ['che_안전'],
});
const turnTimeBase = new Date('0190-01-01T00:00:00.000Z');
const poolCandidate = parseScenarioGeneralPoolCandidate({
id: 23,
uniqueName: '탐색후보',
info: {
generalName: '탐색후보',
leadership: 70,
strength: 80,
intel: 10,
specialDomestic: 'che_event_징병',
dex: [12, 24, 36, 48, 60],
imgsvr: 1,
picture: 'scout.gif',
},
});
const context = {
general: structuredClone(general),
rng: new RandUtil(new ConstantRNG(0)),
addLog: () => undefined,
currentYear: 190,
currentMonth: 1,
startYear: 180,
retirementYear: 80,
centennialRules: {
defaultStatMin: 15,
defaultStatMax: 80,
defaultStatTotal: 165,
maxStatLevel: 255,
defaultSpecialDomestic: null,
dexLimit: 1_000_000,
},
centennialNpcDexTargetRatio: 0.4,
worldSummary: {
totalGeneralCount: 0,
totalNpcCount: 0,
averageStats: { leadership: 50, strength: 50, intelligence: 50 },
averageDex: [100, 100, 100, 100, 100],
},
generalPool: [poolCandidate],
cityPool: [city],
existingGeneralNames: ['탐색자'],
createGeneralId: () => 2,
turnTermMinutes: 10,
turnTimeBase,
ticksPerSecond: 1,
} as TalentScoutResolveContext;
const outcome = resolver.resolve(context, {});
const createdEffect = outcome.effects.find((effect) => effect.type === 'general:add');
expect(createdEffect?.type).toBe('general:add');
if (!createdEffect || createdEffect.type !== 'general:add') {
return;
}
expect(createdEffect.general).toMatchObject({
name: 'ⓜ탐색후보',
stats: { leadership: 70, strength: 80, intelligence: 10 },
picture: 'scout.gif',
imageServer: 1,
role: { specialDomestic: null, specialWar: null },
meta: {
dex1: 12,
dex2: 24,
dex3: 36,
dex4: 48,
dex5: 60,
scenarioGeneralPoolClaim: {
poolEntryId: 23,
uniqueName: '탐색후보',
claimedAt: turnTimeBase.toISOString(),
},
},
});
});
it('generates ordinary stats and dex before applying the S100 .9/.4 target', () => {
const resolver = new ActionResolver([], {
develCost: 100,
maxGeneral: 100,
defaultNpcGold: 1_000,
defaultNpcRice: 1_000,
defaultCrewTypeId: 0,
defaultSpecialDomestic: null,
defaultSpecialWar: null,
availablePersonalities: ['che_안전'],
});
const turnTimeBase = new Date('0195-01-01T00:00:00.000Z');
const poolCandidate = parseScenarioGeneralPoolCandidate({
id: 100,
uniqueName: 'A1000100',
info: {
uniqueName: 'A1000100',
generalName: '100기탐색',
leadership: 100,
strength: 80,
intel: 10,
specialDomestic: 'che_event_징병',
dex: [900_000, 800_000, 700_000, 600_000, 500_000],
imgsvr: 1,
picture: 'centennial-scout.gif',
event100Growth: true,
},
});
const context = {
general: structuredClone(general),
rng: new RandUtil(new ConstantRNG(0)),
addLog: () => undefined,
currentYear: 195,
currentMonth: 1,
startYear: 180,
retirementYear: 80,
centennialRules: {
defaultStatMin: 15,
defaultStatMax: 80,
defaultStatTotal: 165,
maxStatLevel: 255,
defaultSpecialDomestic: null,
dexLimit: 1_000_000,
},
centennialNpcDexTargetRatio: 0.4,
worldSummary: {
totalGeneralCount: 0,
totalNpcCount: 0,
averageStats: { leadership: 50, strength: 50, intelligence: 50 },
averageDex: [100, 100, 100, 100, 100],
},
generalPool: [poolCandidate],
cityPool: [city],
existingGeneralNames: ['탐색자'],
createGeneralId: () => 2,
turnTermMinutes: 10,
turnTimeBase,
ticksPerSecond: 1,
} as TalentScoutResolveContext;
const outcome = resolver.resolve(context, {});
const createdEffect = outcome.effects.find((effect) => effect.type === 'general:add');
expect(createdEffect?.type).toBe('general:add');
if (!createdEffect || createdEffect.type !== 'general:add') {
return;
}
expect(createdEffect.general).toMatchObject({
name: 'ⓜ100기탐색',
stats: { leadership: 91, strength: 73, intelligence: 10 },
role: { specialDomestic: 'che_event_징병' },
meta: {
dex1: 360_000,
dex2: 320_000,
dex3: 280_000,
dex4: 240_000,
dex5: 200_000,
scenarioGeneralPoolClaim: { poolEntryId: 100, uniqueName: 'A1000100' },
event100_allstar: { targetId: 'A1000100', milestone: 4, dexTargetRatio: 0.4 },
},
});
});
});