fix nation personnel command parity

packages/logic/src/actions/turn/nation/che_발령.ts

@@ -1,13 +1,6 @@
-import type {
-    City,
-    General,
-    GeneralMeta,
-    GeneralTriggerState,
-    TriggerValue,
-} from '@sammo-ts/logic/domain/entities.js';
+import type { City, General, GeneralMeta, GeneralTriggerState, TriggerValue } from '@sammo-ts/logic/domain/entities.js';
 import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js';
 import {
-    denyWithReason,
     beChief,
     existsDestGeneral,
     friendlyDestGeneral,
@@ -32,11 +25,11 @@ import { resolveTurnTermMinutes } from '@sammo-ts/logic/actions/turn/actionConte
 import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js';
 import type { NationTurnCommandSpec } from './index.js';
 import { z } from 'zod';
-import { parseArgsWithSchema } from '../parseArgs.js';
+import { normalizeLegacyIntegerArg, parseArgsWithSchema } from '../parseArgs.js';
 
 const ARGS_SCHEMA = z.object({
-    destGeneralId: z.number(),
-    destCityId: z.number(),
+    destGeneralId: z.preprocess(normalizeLegacyIntegerArg, z.number().int()),
+    destCityId: z.preprocess(normalizeLegacyIntegerArg, z.number().int()),
 });
 export type AssignmentArgs = z.infer<typeof ARGS_SCHEMA>;
 
@@ -101,6 +94,18 @@ export class ActionResolver<
         void _args;
         const destGeneral = context.destGeneral;
         const destCity = context.destCity;
+        if (destGeneral.id === context.general.id) {
+            return {
+                completed: false,
+                effects: [
+                    createLogEffect(`본인입니다 <Y>${destGeneral.name}</> ${ACTION_NAME} 실패.`, {
+                        scope: LogScope.GENERAL,
+                        category: LogCategory.ACTION,
+                        format: LogFormat.MONTH,
+                    }),
+                ],
+            };
+        }
         const cityName = this.env.formatCityName ? this.env.formatCityName(destCity) : destCity.name;
         const cityJosa = JosaUtil.pick(cityName, '로');
         const generalJosa = JosaUtil.pick(destGeneral.name, '을');
@@ -158,11 +163,7 @@ export class ActionDefinition<
         return [beChief(), notBeNeutral(), occupiedCity(), suppliedCity()];
     }
 
-    buildConstraints(ctx: ConstraintContext, _args: AssignmentArgs): Constraint[] {
-        void _args;
-        if (ctx.destGeneralId === ctx.actorId) {
-            return [denyWithReason('본인입니다')];
-        }
+    buildConstraints(_ctx: ConstraintContext, _args: AssignmentArgs): Constraint[] {
         return [
             beChief(),
             notBeNeutral(),

packages/logic/src/actions/turn/nation/che_부대탈퇴지시.ts

@@ -1,12 +1,6 @@
 import type { General, GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js';
 import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js';
-import {
-    denyWithReason,
-    beChief,
-    existsDestGeneral,
-    friendlyDestGeneral,
-    notBeNeutral,
-} from '@sammo-ts/logic/constraints/presets.js';
+import { beChief, existsDestGeneral, friendlyDestGeneral, notBeNeutral } from '@sammo-ts/logic/constraints/presets.js';
 import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js';
 import type {
     GeneralActionEffect,
@@ -23,10 +17,7 @@ import { z } from 'zod';
 import { parseArgsWithSchema } from '../parseArgs.js';
 
 const ARGS_SCHEMA = z.object({
-    destGeneralId: z.preprocess(
-        (value) => (typeof value === 'number' ? Math.floor(value) : value),
-        z.number().int().positive()
-    ),
+    destGeneralId: z.number().int().positive(),
 });
 export type TroopKickArgs = z.infer<typeof ARGS_SCHEMA>;
 
@@ -52,10 +43,7 @@ export class ActionDefinition<
         return [notBeNeutral(), beChief()];
     }
 
-    buildConstraints(ctx: ConstraintContext, _args: TroopKickArgs): Constraint[] {
-        if (ctx.destGeneralId !== undefined && ctx.destGeneralId === ctx.actorId) {
-            return [denyWithReason('본인입니다')];
-        }
+    buildConstraints(_ctx: ConstraintContext, _args: TroopKickArgs): Constraint[] {
         return [notBeNeutral(), beChief(), existsDestGeneral(), friendlyDestGeneral()];
     }
 
@@ -66,6 +54,19 @@ export class ActionDefinition<
         const josaUn = JosaUtil.pick(destGeneralName, '은');
         const effects: Array<GeneralActionEffect<TriggerState>> = [];
 
+        if (destGeneral.id === general.id) {
+            return {
+                completed: false,
+                effects: [
+                    createLogEffect(`본인입니다 ${ACTION_NAME} 실패.`, {
+                        scope: LogScope.GENERAL,
+                        category: LogCategory.ACTION,
+                        format: LogFormat.MONTH,
+                    }),
+                ],
+            };
+        }
+
         if (destGeneral.troopId === 0) {
             context.addLog(`<Y>${destGeneralName}</>${josaUn} 부대원이 아닙니다.`);
             return { effects };