Merge branch 'main' into feature/general-icon-names

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 () => {