merge: 최신 사령부 변경을 인게임 폰트 통일에 반영

app/game-frontend/src/components/command/ReservedCommandEditor.vue

@@ -685,7 +685,9 @@ const clickOutsideMenu = (event: Event) => {
                 class="command-picker"
                 :class="{ 'recruitment-picker': isRecruitmentCommand }"
                 data-testid="command-picker"
-                :style="isRecruitmentCommand || props.compact ? undefined : { top: quickPickerTop }"
+                :style="
+                    isRecruitmentCommand || quickTarget === null || props.compact ? undefined : { top: quickPickerTop }
+                "
                 :role="isRecruitmentCommand ? 'dialog' : undefined"
                 :aria-modal="isRecruitmentCommand ? 'true' : undefined"
                 :aria-label="
@@ -1146,12 +1148,15 @@ const clickOutsideMenu = (event: Event) => {
 }
 
 .mobile.compact .editor-layout {
-    height: 360px;
+    min-height: 370px;
     display: grid;
     grid-template-columns: 109px 391px;
+    grid-template-rows: auto auto;
 }
 .mobile.compact .control-pad {
     order: initial;
+    grid-column: 1;
+    grid-row: 1 / -1;
     min-height: 0;
     padding: 0;
     grid-template-columns: 1fr;
@@ -1159,6 +1164,8 @@ const clickOutsideMenu = (event: Event) => {
 }
 .mobile.compact .queue-area {
     order: initial;
+    grid-column: 2;
+    grid-row: 1;
     padding-top: 10px;
 }
 .mobile.compact .queue-grid {
@@ -1189,8 +1196,8 @@ const clickOutsideMenu = (event: Event) => {
     overflow: visible;
 }
 .mobile.compact .advanced-actions {
-    right: 0;
-    bottom: 0;
-    left: 109px;
+    position: static;
+    grid-column: 2;
+    grid-row: 2;
 }
 </style>

app/game-frontend/src/components/command/reservedCommandBrief.ts

@@ -75,7 +75,10 @@ export const formatReservedCommandBrief = (
     const commandName = commandNames.get(action) ?? defaultCommandName(action);
     const cityName = optionLabel(input?.cities ?? [], firstValue(args, ['destCityId', 'destCityID']));
     const nationName = optionLabel(input?.nations ?? [], firstValue(args, ['destNationId', 'destNationID']));
-    const generalName = optionLabel(input?.generals ?? [], firstValue(args, ['destGeneralId', 'destGeneralID']));
+    const generalName = optionLabel(
+        input?.generalTargets?.[action] ?? input?.generals ?? [],
+        firstValue(args, ['destGeneralId', 'destGeneralID'])
+    );
 
     if (CITY_TO_COMMANDS.has(action) && cityName) {
         return `${wrappedWithParticle(cityName, '으로')} ${commandName}`;

app/game-frontend/src/components/command/types.ts

@@ -95,6 +95,7 @@ export type CommandTable = {
         cities: CommandOption[];
         nations: CommandOption[];
         generals: CommandOption[];
+        generalTargets?: Record<string, CommandOption[]>;
         crewTypes: CommandOption[];
         armTypes: CommandOption[];
         nationTypes: CommandOption[];

app/game-frontend/src/components/main/CommandArgumentForm.vue

@@ -33,6 +33,9 @@ const visibleFields = computed(() => props.fields.filter((entry) => entry.kind !
 const optionsFor = (field: CommandInputField): CommandOption[] => {
     if (field.options) return field.options;
     if (!field.optionSource) return [];
+    if (field.optionSource === 'generals') {
+        return props.options.generalTargets?.[props.commandKey] ?? props.options.generals;
+    }
     if (field.optionSource === 'items') {
         return props.options.items[String(values.itemType ?? '')] ?? [];
     }