Merge branch 'main' into audit/lint-test-baseline-20260726

# Conflicts: # app/game-api/src/battleSim/worker.ts # app/game-api/src/router/general/index.ts
2026-07-26 05:57:45 +00:00
parent fe45b9b7a5 06179cbd4f
commit 7c2cf84384
80 changed files with 9334 additions and 1428 deletions
@@ -35,6 +35,8 @@ const DEFAULT_INITIAL_NATION_GEN_LIMIT = 10;
 const DEFAULT_MAX_TECH_LEVEL = 12;
 const DEFAULT_BASE_GOLD = 0;
 const DEFAULT_BASE_RICE = 2000;
+const DEFAULT_GENERAL_MINIMUM_GOLD = 0;
+const DEFAULT_GENERAL_MINIMUM_RICE = 500;
 const DEFAULT_MAX_RESOURCE_ACTION_AMOUNT = 10000;

 const normalizeCode = (value: string | null | undefined): string | null => {
@@ -132,6 +134,8 @@ export const buildCommandEnv = (config: ScenarioConfig, unitSet?: UnitSetDefinit
        initialAllowedTechLevel: resolveNumber(constValues, ['initialAllowedTechLevel'], 1),
        baseGold: resolveNumber(constValues, ['baseGold', 'basegold'], DEFAULT_BASE_GOLD),
        baseRice: resolveNumber(constValues, ['baseRice', 'baserice'], DEFAULT_BASE_RICE),
+        generalMinimumGold: resolveNumber(constValues, ['generalMinimumGold'], DEFAULT_GENERAL_MINIMUM_GOLD),
+        generalMinimumRice: resolveNumber(constValues, ['generalMinimumRice'], DEFAULT_GENERAL_MINIMUM_RICE),
        maxResourceActionAmount: resolveNumber(
            constValues,
            ['maxResourceActionAmount'],
@@ -809,9 +809,35 @@ async function handleVacation(
    if (!general) {
        return { type: 'vacation', ok: false, generalId: command.generalId, reason: '장수 정보를 찾을 수 없습니다.' };
    }
+    const autorunUser = asRecord(world.getState().meta.autorun_user);
+    if (autorunUser.limit_minutes) {
+        return {
+            type: 'vacation',
+            ok: false,
+            generalId: command.generalId,
+            reason: '자동 턴인 경우에는 휴가 명령이 불가능합니다.',
+        };
+    }
+    const killturn = readMetaNumber(asRecord(world.getState().meta), 'killturn', 0);
+    world.updateGeneral(general.id, {
+        meta: {
+            ...general.meta,
+            killturn: killturn * 3,
+        },
+    });
    return { type: 'vacation', ok: true, generalId: command.generalId };
 }

+const normalizeDefenceTrain = (value: number): number => {
+    if (value <= 40) {
+        return 40;
+    }
+    if (value <= 90) {
+        return Math.round(value / 10) * 10;
+    }
+    return 999;
+};
+
 async function handleSetMySetting(
    ctx: CommandHandlerContext,
    command: Extract<TurnDaemonCommand, { type: 'setMySetting' }>
@@ -826,11 +852,48 @@ async function handleSetMySetting(
            reason: '장수 정보를 찾을 수 없습니다.',
        };
    }
+
+    const settings = command.settings;
+    const previousDefenceTrain = readMetaNumber(general.meta, 'defence_train', 80);
+    const nextDefenceTrain =
+        settings.defence_train === undefined ? previousDefenceTrain : normalizeDefenceTrain(settings.defence_train);
+    const nextMeta = { ...general.meta };
+
+    if (settings.tnmt !== undefined) {
+        nextMeta.tnmt = settings.tnmt < 0 || settings.tnmt > 1 ? 1 : settings.tnmt;
+    }
+    if (settings.use_treatment !== undefined) {
+        nextMeta.use_treatment = Math.max(10, Math.min(100, settings.use_treatment));
+    }
+    if (settings.use_auto_nation_turn !== undefined) {
+        nextMeta.use_auto_nation_turn = settings.use_auto_nation_turn;
+    }
+
+    let nextTrain = general.train;
+    let nextAtmos = general.atmos;
+    if (nextDefenceTrain !== previousDefenceTrain) {
+        nextMeta.myset = readMetaNumber(general.meta, 'myset', 0) - 1;
+        nextMeta.defence_train = nextDefenceTrain;
+        if (nextDefenceTrain === 999) {
+            const scenarioEffect = world.getScenarioConfig().environment.scenarioEffect;
+            const ignoresPenalty =
+                scenarioEffect === 'event_UnlimitedDefenceThresholdChange' ||
+                scenarioEffect === 'event_StrongAttacker' ||
+                scenarioEffect === 'event_MoreEffect';
+            const constValues = asRecord(world.getScenarioConfig().const);
+            const maxTrain = readMetaNumber(constValues, 'maxTrainByWar', 100);
+            const maxAtmos = readMetaNumber(constValues, 'maxAtmosByWar', 100);
+            const trainDelta = ignoresPenalty ? 0 : -3;
+            const atmosDelta = ignoresPenalty ? 0 : -6;
+            nextTrain = Math.max(20, Math.min(maxTrain, general.train + trainDelta));
+            nextAtmos = Math.max(20, Math.min(maxAtmos, general.atmos + atmosDelta));
+        }
+    }
+
    world.updateGeneral(command.generalId, {
-        meta: {
-            ...general.meta,
-            ...command.settings,
-        },
+        meta: nextMeta,
+        train: nextTrain,
+        atmos: nextAtmos,
    });
    return { type: 'setMySetting', ok: true, generalId: command.generalId };
 }
@@ -844,10 +907,8 @@ async function handleDropItem(
    if (!general) {
        return { type: 'dropItem', ok: false, generalId: command.generalId, reason: '장수 정보를 찾을 수 없습니다.' };
    }
-    const slot = (['horse', 'weapon', 'book', 'item'] as const).find(
-        (candidate) => general.role.items[candidate] === command.itemType
-    );
-    if (!slot) {
+    const slot = (['horse', 'weapon', 'book', 'item'] as const).find((candidate) => candidate === command.itemType);
+    if (!slot || !general.role.items[slot]) {
        return { type: 'dropItem', ok: false, generalId: command.generalId, reason: '아이템을 가지고 있지 않습니다.' };
    }
    const nextGeneral = {
@@ -0,0 +1,179 @@
+import { describe, expect, it } from 'vitest';
+
+import type { TurnSchedule } from '@sammo-ts/logic';
+
+import { InMemoryTurnWorld } from '../src/turn/inMemoryWorld.js';
+import type { TurnGeneral, TurnWorldSnapshot, TurnWorldState } from '../src/turn/types.js';
+import { createTurnDaemonCommandHandler } from '../src/turn/worldCommandHandler.js';
+
+const schedule: TurnSchedule = { entries: [{ startMinute: 0, tickMinutes: 10 }] };
+
+const buildGeneral = (overrides: Partial<TurnGeneral> = {}): TurnGeneral => ({
+    id: 7,
+    userId: 'user-7',
+    name: '테스트장수',
+    nationId: 1,
+    cityId: 1,
+    troopId: 0,
+    stats: { leadership: 70, strength: 60, intelligence: 50 },
+    turnTime: new Date('0185-01-01T00:00:00Z'),
+    recentWarTime: null,
+    role: {
+        items: { horse: 'che_명마', weapon: null, book: null, item: null },
+        personality: null,
+        specialDomestic: null,
+        specialWar: null,
+    },
+    triggerState: { flags: {}, counters: {}, modifiers: {}, meta: {} },
+    meta: {
+        killturn: 12,
+        myset: 3,
+        defence_train: 80,
+        tnmt: 0,
+        use_treatment: 10,
+        use_auto_nation_turn: 1,
+    },
+    penalty: {},
+    officerLevel: 1,
+    experience: 0,
+    dedication: 0,
+    injury: 0,
+    gold: 1_000,
+    rice: 1_000,
+    crew: 100,
+    crewTypeId: 0,
+    train: 90,
+    atmos: 90,
+    age: 20,
+    npcState: 0,
+    ...overrides,
+});
+
+const buildWorld = (
+    general = buildGeneral(),
+    options: { autorunLimit?: boolean; scenarioEffect?: string | null } = {}
+) => {
+    const state: TurnWorldState = {
+        id: 1,
+        currentYear: 185,
+        currentMonth: 1,
+        tickSeconds: 600,
+        lastTurnTime: new Date('0185-01-01T00:00:00Z'),
+        meta: {
+            killturn: 24,
+            autorun_user: options.autorunLimit ? { limit_minutes: 60 } : {},
+        },
+    };
+    const snapshot: TurnWorldSnapshot = {
+        generals: [general],
+        cities: [],
+        nations: [],
+        troops: [],
+        diplomacy: [],
+        events: [],
+        initialEvents: [],
+        scenarioConfig: {
+            stat: { total: 300, min: 10, max: 100, npcTotal: 150, npcMax: 50, npcMin: 10, chiefMin: 65 },
+            iconPath: '',
+            map: {},
+            const: { maxTrainByWar: 100, maxAtmosByWar: 100 },
+            environment: {
+                mapName: 'test',
+                unitSet: 'test',
+                ...(options.scenarioEffect !== undefined ? { scenarioEffect: options.scenarioEffect } : {}),
+            },
+        },
+        scenarioMeta: {
+            title: 'test',
+            startYear: 180,
+            life: null,
+            fiction: null,
+            history: [],
+            ignoreDefaultEvents: false,
+        },
+        map: {
+            id: 'test',
+            name: 'test',
+            cities: [],
+            defaults: { trust: 50, trade: 100, supplyState: 1, frontState: 0 },
+        },
+    };
+    const world = new InMemoryTurnWorld(state, snapshot, { schedule });
+    return { world, handler: createTurnDaemonCommandHandler({ world }) };
+};
+
+describe('my information world commands', () => {
+    it('normalizes legacy settings and charges myset only when defence mode changes', async () => {
+        const fixture = buildWorld();
+
+        await expect(
+            fixture.handler.handle({
+                type: 'setMySetting',
+                generalId: 7,
+                settings: {
+                    tnmt: 9,
+                    defence_train: 94,
+                    use_treatment: 200,
+                    use_auto_nation_turn: 0,
+                },
+            })
+        ).resolves.toMatchObject({ ok: true });
+
+        expect(fixture.world.getGeneralById(7)).toMatchObject({
+            train: 87,
+            atmos: 84,
+            meta: {
+                tnmt: 1,
+                defence_train: 999,
+                use_treatment: 100,
+                use_auto_nation_turn: 0,
+                myset: 2,
+            },
+        });
+
+        await fixture.handler.handle({
+            type: 'setMySetting',
+            generalId: 7,
+            settings: { tnmt: 0, defence_train: 999, use_treatment: 1 },
+        });
+        expect(fixture.world.getGeneralById(7)?.meta).toMatchObject({
+            tnmt: 0,
+            use_treatment: 10,
+            myset: 2,
+        });
+    });
+
+    it('preserves the event scenarios that waive the no-defence penalty', async () => {
+        const fixture = buildWorld(buildGeneral(), { scenarioEffect: 'event_StrongAttacker' });
+        await fixture.handler.handle({
+            type: 'setMySetting',
+            generalId: 7,
+            settings: { defence_train: 999 },
+        });
+        expect(fixture.world.getGeneralById(7)).toMatchObject({ train: 90, atmos: 90 });
+    });
+
+    it('applies vacation killturn and rejects it in automatic-turn mode', async () => {
+        const allowed = buildWorld();
+        await expect(allowed.handler.handle({ type: 'vacation', generalId: 7 })).resolves.toMatchObject({ ok: true });
+        expect(allowed.world.getGeneralById(7)?.meta.killturn).toBe(72);
+
+        const blocked = buildWorld(buildGeneral(), { autorunLimit: true });
+        await expect(blocked.handler.handle({ type: 'vacation', generalId: 7 })).resolves.toMatchObject({
+            ok: false,
+            reason: '자동 턴인 경우에는 휴가 명령이 불가능합니다.',
+        });
+        expect(blocked.world.getGeneralById(7)?.meta.killturn).toBe(12);
+    });
+
+    it('drops only the authenticated command target slot and rejects an empty slot', async () => {
+        const fixture = buildWorld();
+        await expect(
+            fixture.handler.handle({ type: 'dropItem', generalId: 7, itemType: 'weapon' })
+        ).resolves.toMatchObject({ ok: false });
+        await expect(
+            fixture.handler.handle({ type: 'dropItem', generalId: 7, itemType: 'horse' })
+        ).resolves.toMatchObject({ ok: true });
+        expect(fixture.world.getGeneralById(7)?.role.items.horse).toBeNull();
+    });
+});