feat(engine): migrate monthly wander disband

2026-07-25 22:20:55 +00:00
parent c23aa8ef65
commit 652e723457
5 changed files with 1029 additions and 62 deletions
@@ -1025,6 +1025,74 @@ export class InMemoryTurnWorld {
        return changes;
    }

+    collapseNation(nationId: number): boolean {
+        const nation = this.nations.get(nationId);
+        if (!nation) {
+            return false;
+        }
+        const generalIds = Array.from(this.generals.values())
+            .filter((general) => general.nationId === nationId)
+            .map((general) => general.id);
+
+        // Legacy deleteNation() calls DeleteConflict() before removing the
+        // nation. Without this, a later conquest can award a city to a
+        // nation ID that no longer exists.
+        for (const city of this.cities.values()) {
+            const rawConflict = city.meta.conflict;
+            if (rawConflict === null || rawConflict === undefined) {
+                continue;
+            }
+            let conflict: Record<string, unknown>;
+            try {
+                const parsed = typeof rawConflict === 'string' ? (JSON.parse(rawConflict) as unknown) : rawConflict;
+                if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+                    continue;
+                }
+                conflict = { ...(parsed as Record<string, unknown>) };
+            } catch {
+                continue;
+            }
+            const key = String(nationId);
+            if (!Object.prototype.hasOwnProperty.call(conflict, key)) {
+                continue;
+            }
+            delete conflict[key];
+            this.cities.set(city.id, {
+                ...city,
+                meta: {
+                    ...city.meta,
+                    conflict: JSON.stringify(conflict),
+                },
+            });
+            this.dirtyCityIds.add(city.id);
+        }
+
+        this.deletedNationSnapshots.push({
+            nation: { ...nation },
+            generalIds,
+            removedAt: new Date(this.state.lastTurnTime.getTime()),
+        });
+        for (const general of this.generals.values()) {
+            if (general.nationId !== nationId) {
+                continue;
+            }
+            const updated = applyGeneralPatch(general, {
+                nationId: 0,
+                officerLevel: 0,
+                troopId: 0,
+            });
+            this.generals.set(general.id, normalizeGeneralTurnTime(updated, this.state.lastTurnTime));
+            this.dirtyGeneralIds.add(general.id);
+        }
+        for (const troop of Array.from(this.troops.values())) {
+            if (troop.nationId === nationId) {
+                this.removeTroop(troop.id);
+            }
+        }
+        this.removeNation(nationId);
+        return true;
+    }
+
    private removeCollapsedNations(): void {
        const collapsedNationIds: number[] = [];
        for (const nation of this.nations.values()) {
@@ -1043,68 +1111,7 @@ export class InMemoryTurnWorld {
        }

        for (const nationId of collapsedNationIds) {
-            // Legacy deleteNation() calls DeleteConflict() before removing the
-            // nation. Without this, a later conquest can award a city to a
-            // nation ID that no longer exists.
-            for (const city of this.cities.values()) {
-                const rawConflict = city.meta.conflict;
-                if (rawConflict === null || rawConflict === undefined) {
-                    continue;
-                }
-                let conflict: Record<string, unknown>;
-                try {
-                    const parsed = typeof rawConflict === 'string' ? (JSON.parse(rawConflict) as unknown) : rawConflict;
-                    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
-                        continue;
-                    }
-                    conflict = { ...(parsed as Record<string, unknown>) };
-                } catch {
-                    continue;
-                }
-                const key = String(nationId);
-                if (!Object.prototype.hasOwnProperty.call(conflict, key)) {
-                    continue;
-                }
-                delete conflict[key];
-                this.cities.set(city.id, {
-                    ...city,
-                    meta: {
-                        ...city.meta,
-                        conflict: JSON.stringify(conflict),
-                    },
-                });
-                this.dirtyCityIds.add(city.id);
-            }
-
-            const nation = this.nations.get(nationId);
-            if (nation) {
-                const generalIds = Array.from(this.generals.values())
-                    .filter((general) => general.nationId === nationId)
-                    .map((general) => general.id);
-                this.deletedNationSnapshots.push({
-                    nation: { ...nation },
-                    generalIds,
-                    removedAt: new Date(this.state.lastTurnTime.getTime()),
-                });
-            }
-            for (const general of this.generals.values()) {
-                if (general.nationId !== nationId) {
-                    continue;
-                }
-                const updated = applyGeneralPatch(general, {
-                    nationId: 0,
-                    officerLevel: 0,
-                    troopId: 0,
-                });
-                this.generals.set(general.id, normalizeGeneralTurnTime(updated, this.state.lastTurnTime));
-                this.dirtyGeneralIds.add(general.id);
-            }
-            for (const troop of Array.from(this.troops.values())) {
-                if (troop.nationId === nationId) {
-                    this.removeTroop(troop.id);
-                }
-            }
-            this.removeNation(nationId);
+            this.collapseNation(nationId);
        }
    }

@@ -0,0 +1,166 @@
+import { JosaUtil } from '@sammo-ts/common';
+import { LogCategory, LogFormat, LogScope, type TurnCommandEnv } from '@sammo-ts/logic';
+
+import type { InMemoryTurnWorld, TurnCalendarHandler } from './inMemoryWorld.js';
+
+const readNumber = (value: unknown, fallback = 0): number => {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+    return fallback;
+};
+
+const formatHourMinute = (date: Date): string =>
+    `${String(date.getUTCHours()).padStart(2, '0')}:${String(date.getUTCMinutes()).padStart(2, '0')}`;
+
+export const createMonthlyWanderHandler = (options: {
+    getWorld: () => InMemoryTurnWorld | null;
+    startYear: number;
+    commandEnv: TurnCommandEnv;
+}): TurnCalendarHandler => ({
+    onMonthChanged: (context) => {
+        const world = options.getWorld();
+        if (!world || context.currentYear < options.startYear + 2) {
+            return;
+        }
+        const baseGold = options.commandEnv.baseGold > 0 ? options.commandEnv.baseGold : 1_000;
+        const baseRice = options.commandEnv.baseRice > 0 ? options.commandEnv.baseRice : 1_000;
+        const wanderers = world
+            .listGenerals()
+            .filter((general) => {
+                const nation = world.getNationById(general.nationId);
+                return nation?.level === 0 && general.officerLevel === 12;
+            })
+            .sort((left, right) => left.id - right.id);
+
+        for (const wanderer of wanderers) {
+            const nation = world.getNationById(wanderer.nationId);
+            if (!nation || nation.level !== 0 || wanderer.officerLevel !== 12) {
+                continue;
+            }
+            const nationGenerals = world
+                .listGenerals()
+                .filter((general) => general.nationId === nation.id)
+                .sort((left, right) => left.id - right.id);
+            const nationCities = world.listCities().filter((city) => city.nationId === nation.id);
+            const nationGeneralIds = nationGenerals.map((general) => general.id);
+            const nationNameJosaYi = JosaUtil.pick(nation.name, '이');
+            const nationNameJosaUl = JosaUtil.pick(nation.name, '을');
+            const nationNameJosaUn = JosaUtil.pick(nation.name, '은');
+            const wandererNameJosaYi = JosaUtil.pick(wanderer.name, '이');
+
+            // Preserve the legacy two-UPDATE bug: gold is capped first, then the
+            // rice UPDATE tests the already-capped gold column.
+            for (const general of nationGenerals) {
+                const gold = Math.min(general.gold, baseGold);
+                const rice = gold > baseRice ? Math.min(general.rice, baseRice) : general.rice;
+                const belong = readNumber(general.meta.belong);
+                const maxBelong = readNumber(general.meta.max_belong);
+                world.updateGeneral(general.id, {
+                    gold,
+                    rice,
+                    meta: {
+                        ...general.meta,
+                        belong: 0,
+                        officer_city: 0,
+                        officerCity: 0,
+                        ...(general.npcState < 2 ? { max_belong: Math.max(belong, maxBelong) } : {}),
+                    },
+                });
+            }
+            const updatedWanderer = world.getGeneralById(wanderer.id);
+            if (!updatedWanderer) {
+                continue;
+            }
+            world.updateGeneral(wanderer.id, {
+                gold: Math.min(updatedWanderer.gold, baseGold),
+                rice: Math.min(updatedWanderer.rice, baseRice),
+                lastTurn: { command: '해산', arg: {} },
+                meta: {
+                    ...updatedWanderer.meta,
+                    makelimit: 12,
+                },
+            });
+            for (const city of nationCities) {
+                world.updateCity(city.id, { nationId: 0, frontState: 0 });
+            }
+
+            world.pushLog({
+                scope: LogScope.SYSTEM,
+                category: LogCategory.HISTORY,
+                text: `<R><b>【멸망】</b></><D><b>${nation.name}</b></>${nationNameJosaUn} <R>멸망</>했습니다.`,
+                format: LogFormat.YEAR_MONTH,
+            });
+            for (const general of nationGenerals.filter((general) => general.id !== wanderer.id)) {
+                world.pushLog({
+                    scope: LogScope.GENERAL,
+                    category: LogCategory.HISTORY,
+                    generalId: general.id,
+                    text: `<D><b>${nation.name}</b></>${nationNameJosaYi} <R>멸망</>`,
+                    format: LogFormat.YEAR_MONTH,
+                });
+                world.pushLog({
+                    scope: LogScope.GENERAL,
+                    category: LogCategory.ACTION,
+                    generalId: general.id,
+                    text: `<D><b>${nation.name}</b></>${nationNameJosaYi} <R>멸망</>했습니다.`,
+                    format: LogFormat.PLAIN,
+                });
+            }
+            world.pushLog({
+                scope: LogScope.GENERAL,
+                category: LogCategory.HISTORY,
+                generalId: wanderer.id,
+                text: `<D><b>${nation.name}</b></>${nationNameJosaUl} 해산`,
+                format: LogFormat.YEAR_MONTH,
+            });
+            world.pushLog({
+                scope: LogScope.GENERAL,
+                category: LogCategory.HISTORY,
+                generalId: wanderer.id,
+                text: `<D><b>${nation.name}</b></>${nationNameJosaYi} <R>멸망</>`,
+                format: LogFormat.YEAR_MONTH,
+            });
+            world.pushLog({
+                scope: LogScope.GENERAL,
+                category: LogCategory.ACTION,
+                generalId: wanderer.id,
+                text: '초반 제한후 방랑군은 자동 해산됩니다.',
+                format: LogFormat.PLAIN,
+            });
+            world.pushLog({
+                scope: LogScope.GENERAL,
+                category: LogCategory.ACTION,
+                generalId: wanderer.id,
+                text: `세력을 해산했습니다. <1>${formatHourMinute(wanderer.turnTime)}</>`,
+                format: LogFormat.MONTH,
+            });
+            world.pushLog({
+                scope: LogScope.GENERAL,
+                category: LogCategory.ACTION,
+                generalId: wanderer.id,
+                text: `<D><b>${nation.name}</b></>${nationNameJosaYi} <R>멸망</>했습니다.`,
+                format: LogFormat.PLAIN,
+            });
+            world.pushLog({
+                scope: LogScope.SYSTEM,
+                category: LogCategory.ACTION,
+                text: `<Y>${wanderer.name}</>${wandererNameJosaYi} 세력을 해산했습니다.`,
+                format: LogFormat.MONTH,
+            });
+
+            if (!world.collapseNation(nation.id)) {
+                throw new Error(`Monthly wander disband could not remove nation ${nation.id}.`);
+            }
+            if (nationGeneralIds.some((generalId) => world.getGeneralById(generalId)?.nationId !== 0)) {
+                throw new Error(`Monthly wander disband did not detach every general of nation ${nation.id}.`);
+            }
+        }
+    },
+});
@@ -27,6 +27,7 @@ import { composeCalendarHandlers } from './calendarHandlers.js';
 import { createIncomeHandler } from './incomeHandler.js';
 import { createNationTurnMonthlyHandler } from './nationTurnMonthlyHandler.js';
 import { createMonthlyBoundaryPreHandler } from './monthlyBoundaryPreHandler.js';
+import { createMonthlyWanderHandler } from './monthlyWanderHandler.js';
 import {
    createMonthlyDiplomacyHandler,
    createMonthlyNationCountHandler,
@@ -467,6 +468,11 @@ const createTurnDaemonRuntimeWithLease = async (
    const monthlyWarSettingHandler = createMonthlyWarSettingHandler({
        getWorld: () => worldRef,
    });
+    const monthlyWanderHandler = createMonthlyWanderHandler({
+        getWorld: () => worldRef,
+        startYear: snapshot.scenarioMeta?.startYear ?? state.currentYear,
+        commandEnv: monthlyCommandEnv,
+    });
    const frontStateHandler = createFrontStateHandler({
        getWorld: () => worldRef,
        map: snapshot.map ?? null,
@@ -497,6 +503,7 @@ const createTurnDaemonRuntimeWithLease = async (
        monthlyNationStatsHandler,
        monthlyDiplomacyHandler,
        monthlyWarSettingHandler,
+        monthlyWanderHandler,
        monthlyNationCountHandler,
        options.calendarHandler ?? unification?.handler,
        hasEventAction('ProcessIncome') ? null : incomeHandler,