merge: 최신 main을 transport 권한과 커맨드 내구 행렬에 통합한다

2026-08-24 07:41:28 +00:00
parent 8d966d3152 1e79611089
commit 90d43547fe
34 changed files with 974 additions and 300 deletions
@@ -164,15 +164,15 @@ integration('core ↔ legacy command-boundary differential', () => {
            }
            if (fixturePath.endsWith('live-sortie-emergency-capital.json')) {
                const defenderNation = reference.after.nations.find((nation) => nation.id === 2);
-                expect(defenderNation?.capitalCityId).toBe(71);
+                expect(defenderNation?.capitalCityId).toBe(35);
                expect(defenderNation?.gold).toBe(50_000);
                expect(defenderNation?.rice).toBe(40_000);
                expect(reference.after.generals.find((general) => general.id === 2)).toMatchObject({
                    nationId: 2,
-                    cityId: 71,
+                    cityId: 35,
                    atmos: 80,
                });
-                expect(reference.after.cities.find((city) => city.id === 71)?.supplyState).toBe(1);
+                expect(reference.after.cities.find((city) => city.id === 35)?.supplyState).toBe(1);
            }
            if (fixturePath.endsWith('live-sortie-collapse-conflict.json')) {
                expect(reference.before.cities.find((city) => city.id === 71)?.conflict).toEqual({ 2: 1234 });