Merge branch 'main' into feature/nation-seizure-npc-message-parity

packages/common/src/ranking/types.ts

@@ -47,6 +47,71 @@ export const RANK_DATA_TYPES = [
 
 export type RankDataType = (typeof RANK_DATA_TYPES)[number];
 
+/**
+ * Legacy `sammo\Enums\RankColumn` values stored in `rank_data`.
+ *
+ * `experience`, `dedication`, and `dex1` through `dex5` are natural general
+ * columns in the reference implementation. core2026 currently keeps mirrored
+ * rank rows for those values as a compatibility cache, but differential
+ * snapshots must compare this legacy set rather than treating the mirrors as
+ * source-of-truth rows.
+ */
+export const LEGACY_RANK_DATA_TYPES = [
+    'firenum',
+    'warnum',
+    'killnum',
+    'deathnum',
+    'killcrew',
+    'deathcrew',
+    'ttw',
+    'ttd',
+    'ttl',
+    'ttg',
+    'ttp',
+    'tlw',
+    'tld',
+    'tll',
+    'tlg',
+    'tlp',
+    'tsw',
+    'tsd',
+    'tsl',
+    'tsg',
+    'tsp',
+    'tiw',
+    'tid',
+    'til',
+    'tig',
+    'tip',
+    'betwin',
+    'betgold',
+    'betwingold',
+    'killcrew_person',
+    'deathcrew_person',
+    'occupied',
+    'inherit_earned',
+    'inherit_spent',
+    'inherit_earned_dyn',
+    'inherit_earned_act',
+    'inherit_spent_dyn',
+] as const satisfies readonly RankDataType[];
+
+export type LegacyRankDataType = (typeof LEGACY_RANK_DATA_TYPES)[number];
+
+const PREFIXED_RANK_DATA_TYPES = new Set<RankDataType>([
+    'warnum',
+    'killnum',
+    'deathnum',
+    'occupied',
+    'killcrew',
+    'deathcrew',
+    'killcrew_person',
+    'deathcrew_person',
+]);
+
+export const rankDataMetaKey = (type: RankDataType): string =>
+    PREFIXED_RANK_DATA_TYPES.has(type) ? `rank_${type}` : type;
+
 export const HALL_OF_FAME_TYPES = [
     'experience',
     'dedication',

packages/logic/src/actions/turn/general/che_은퇴.ts

@@ -14,7 +14,7 @@ import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'
 import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js';
 import { tryApplyUniqueLottery } from '@sammo-ts/logic/rewards/uniqueLottery.js';
 import type { GeneralTurnCommandSpec } from './index.js';
-import { JosaUtil } from '@sammo-ts/common';
+import { JosaUtil, LEGACY_RANK_DATA_TYPES, rankDataMetaKey } from '@sammo-ts/common';
 
 export interface RetireArgs {}
 
@@ -22,7 +22,6 @@ const ACTION_NAME = '은퇴';
 const ACTION_KEY = 'che_은퇴';
 
 const REQ_AGE = 60;
-
 const reqGeneralValue = (): Constraint => ({
     name: 'reqGeneralValue',
     requires: (ctx) => [{ kind: 'general', id: ctx.actorId }],
@@ -51,46 +50,8 @@ export class ActionResolver<
         }
         nextMeta.specAge = 0;
         nextMeta.specAge2 = 0;
-        nextMeta.firenum = 0;
-        for (const key of [
-            'warnum',
-            'killnum',
-            'deathnum',
-            'killcrew',
-            'deathcrew',
-            'ttw',
-            'ttd',
-            'ttl',
-            'ttg',
-            'ttp',
-            'tlw',
-            'tld',
-            'tll',
-            'tlg',
-            'tlp',
-            'tsw',
-            'tsd',
-            'tsl',
-            'tsg',
-            'tsp',
-            'tiw',
-            'tid',
-            'til',
-            'tig',
-            'tip',
-            'betwin',
-            'betgold',
-            'betwingold',
-            'killcrew_person',
-            'deathcrew_person',
-            'occupied',
-            'inherit_earned',
-            'inherit_spent',
-            'inherit_earned_dyn',
-            'inherit_earned_act',
-            'inherit_spent_dyn',
-        ]) {
-            nextMeta[`rank_${key}`] = 0;
+        for (const type of LEGACY_RANK_DATA_TYPES) {
+            nextMeta[rankDataMetaKey(type)] = 0;
         }
 
         const josaYi = JosaUtil.pick(general.name, '이');

packages/logic/src/constraints/helpers.ts

@@ -124,8 +124,11 @@ export const parsePercent = (value: string): number | null => {
 export type CompareOperator = '>' | '>=' | '==' | '<=' | '<' | '!=' | '===' | '!==';
 
 export const compareValues = (target: unknown, op: CompareOperator, source: unknown): boolean => {
-    const lhs = target as any;
-    const rhs = source as any;
+    // The cast is type-only: JavaScript still applies its native relational
+    // coercion rules to the original runtime values, matching the legacy
+    // constraint evaluator without opting the whole comparison into `any`.
+    const lhs = target as number;
+    const rhs = source as number;
     switch (op) {
         case '<':
             return lhs < rhs;

packages/logic/src/war/engine.ts

@@ -196,10 +196,7 @@ const resolveUnitReport = (unit: WarUnit): WarUnitReport => {
     };
 };
 
-const buildTraceUnitSnapshot = (
-    unit: WarUnit,
-    defenderCity: City
-): WarBattleTraceUnitSnapshot => {
+const buildTraceUnitSnapshot = (unit: WarUnit, defenderCity: City): WarBattleTraceUnitSnapshot => {
     const common = {
         kind: unit instanceof WarUnitGeneral ? ('general' as const) : ('city' as const),
         id: unit instanceof WarUnitGeneral ? unit.getGeneral().id : (unit as WarUnitCity).getCityId(),
@@ -339,7 +336,6 @@ export const resolveWarBattle = <TriggerState extends GeneralTriggerState = Gene
     );
 
     const iter = defenderUnits.values();
-    let defender: WarUnit<TriggerState> | null = null;
 
     const getNextDefender = (
         _prevDefender: WarUnit<TriggerState> | null,
@@ -359,7 +355,7 @@ export const resolveWarBattle = <TriggerState extends GeneralTriggerState = Gene
         return candidate;
     };
 
-    defender = getNextDefender(null, true);
+    let defender = getNextDefender(null, true);
     let conquerCity = false;
     let logWritten = false;
     let traceSeq = 0;

packages/logic/test/scenarios/general/migratedGeneralCommands.test.ts

@@ -225,7 +225,7 @@ describe('migrated general commands', () => {
         expect(updatedLord.experience).toBe(700);
     });
 
-    it('che_증여: 최소 보유량을 넘는 자원만 이전한다', async () => {
+    it('che_증여: 금은 레거시 최소 보유량 0을 적용해 요청한 금액을 이전한다', async () => {
         const actor = makeGeneral({ id: 1, nationId: 1, cityId: 1, name: '증여자', gold: 1300 });
         const dest = makeGeneral({ id: 2, nationId: 1, cityId: 1, name: '수령자', gold: 200 });
         const nation = makeNation({ id: 1, name: '오', chiefGeneralId: 1, capitalCityId: 1, level: 1 });
@@ -246,8 +246,8 @@ describe('migrated general commands', () => {
             },
         ]);
 
-        expect(world.getGeneral(actor.id)!.gold).toBe(1000);
-        expect(world.getGeneral(dest.id)!.gold).toBe(500);
+        expect(world.getGeneral(actor.id)!.gold).toBe(800);
+        expect(world.getGeneral(dest.id)!.gold).toBe(700);
     });
 
     it('che_해산: 방랑군 해산 시 세력과 소속을 정리한다', async () => {

packages/logic/test/scenarios/general_commands_new.test.ts

@@ -258,7 +258,6 @@ describe('General Commands New Scenario', () => {
 
         // 6. Retire (Needs age >= 60)
         // Manually set age
-        // Manually set age
         const gToRetire = { ...g1_after_resign, age: 65 };
         world.snapshot.generals = world.snapshot.generals.map((g) => (g.id === 1 ? gToRetire : g));
         const retireDef = retireSpec.createDefinition(systemEnv);
@@ -274,7 +273,7 @@ describe('General Commands New Scenario', () => {
         const g1_after_retire = world.getGeneral(1)!;
         expect(g1_after_retire.age).toBe(20);
         // General::rebirth()는 앞선 명령으로 누적된 경험을 초기화하지 않고 절반으로 줄인다.
-        expect(g1_after_retire.experience).toBe(142);
+        expect(g1_after_retire.experience).toBe(Math.round(gToRetire.experience * 0.5));
     });
 
     it('should execute employ and sabotage commands', async () => {