fix: Ref 게임 로직과 시나리오 풀 호환을 보정
월 경계, 전투 기술 상한, 연감과 베팅·설문·경매 정산 순서를 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:
@@ -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 },
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user