fix: 사령부 모바일 현재 턴과 NPC 대상을 호환

daemon 진행 뒤 국가 명령을 현재 슬롯에 재기준화하고 Ref 명령별 장수 대상 필터를 적용한다. 모바일 고급 편집기 12턴과 500px 8수뇌 행렬을 실제 Chromium 기준으로 복원한다.

app/game-api/src/turns/commandInput.ts

@@ -71,6 +71,7 @@ export interface TurnCommandInputOptions {
     cities: TurnCommandOption[];
     nations: TurnCommandOption[];
     generals: TurnCommandOption[];
+    generalTargets?: Record<string, TurnCommandOption[]>;
     crewTypes: TurnCommandOption[];
     armTypes: TurnCommandOption[];
     nationTypes: TurnCommandOption[];

app/game-api/src/turns/commandTable.ts

@@ -771,6 +771,7 @@ export const buildTurnCommandTable = async (options: {
             cities: [],
             nations: [],
             generals: [],
+            generalTargets: {},
             crewTypes: [],
             armTypes: [],
             nationTypes: [],

app/game-api/src/turns/commandTargets.ts

@@ -0,0 +1,55 @@
+import type { TurnCommandOption } from './commandInput.js';
+
+export interface GeneralTargetSource {
+    id: number;
+    name: string;
+    nationId: number;
+    cityId: number;
+    npcState: number;
+    officerLevel: number;
+}
+
+export interface RefGeneralTargetOptions {
+    generals: TurnCommandOption[];
+    generalTargets: Record<string, TurnCommandOption[]>;
+}
+
+const SAME_NATION_GENERAL_COMMANDS = ['che_증여'] as const;
+const SAME_NATION_NATION_COMMANDS = ['che_발령', 'che_포상', 'che_몰수', 'che_부대탈퇴지시'] as const;
+
+/** Ref 각 처리 화면의 SELECT 조건을 공통 command table의 명령별 option으로 투영한다. */
+export const buildRefGeneralTargetOptions = (options: {
+    actorId: number;
+    actorNationId: number;
+    generals: readonly GeneralTargetSource[];
+    nationNames: ReadonlyMap<number, string>;
+    cityNames: ReadonlyMap<number, string>;
+}): RefGeneralTargetOptions => {
+    const toOption = (entry: GeneralTargetSource): TurnCommandOption => ({
+        value: entry.id,
+        label: `${entry.name} (${options.nationNames.get(entry.nationId) ?? '무소속'} · ${
+            options.cityNames.get(entry.cityId) ?? '재야'
+        })`,
+    });
+    const project = (predicate: (entry: GeneralTargetSource) => boolean): TurnCommandOption[] =>
+        options.generals.filter(predicate).map(toOption);
+
+    const sameNation = project((entry) => entry.nationId === options.actorNationId);
+    const generalTargets: Record<string, TurnCommandOption[]> = {};
+    for (const action of SAME_NATION_GENERAL_COMMANDS) generalTargets[action] = sameNation;
+    for (const action of SAME_NATION_NATION_COMMANDS) generalTargets[action] = sameNation;
+
+    generalTargets.che_선양 = project(
+        (entry) => entry.nationId !== 0 && entry.nationId === options.actorNationId && entry.id !== options.actorId
+    );
+    generalTargets.che_등용 = project(
+        (entry) => entry.npcState < 2 && entry.officerLevel !== 12 && entry.id !== options.actorId
+    );
+    generalTargets.che_장수대상임관 = project((entry) => entry.id !== options.actorId);
+
+    return {
+        // 기존 profile의 공통 fallback은 유저장 목록을 유지한다.
+        generals: project((entry) => entry.npcState < 2),
+        generalTargets,
+    };
+};

app/game-api/src/turns/reservedTurns.ts

@@ -396,6 +396,32 @@ export const setNationTurns = async (
     return { revision, turns: serializeTurnList(turns) };
 };
 
+/**
+ * 국가 턴 입력은 화면을 연 뒤 daemon이 선두 턴을 소비했더라도 사용자가 고른
+ * 슬롯 번호를 현재 큐에 적용한다. 큐 lease가 실제로 잡혀 있는 충돌은 그대로
+ * 거절하고, revision이 앞으로 진행한 경우에만 새 revision으로 재기준화한다.
+ */
+export const setNationTurnsAtCurrentPositions = async (
+    db: DatabaseClient,
+    nationId: number,
+    officerLevel: number,
+    updates: readonly ReservedTurnUpdate[],
+    expectedRevision: number
+): Promise<ReservedTurnSnapshot> => {
+    let revision = expectedRevision;
+    for (let attempt = 0; attempt < 8; attempt += 1) {
+        try {
+            return await setNationTurns(db, nationId, officerLevel, updates, revision);
+        } catch (error) {
+            if (!(error instanceof ReservedTurnRevisionConflictError) || error.currentRevision === revision) {
+                throw error;
+            }
+            revision = error.currentRevision;
+        }
+    }
+    throw new ReservedTurnRevisionConflictError(revision, revision);
+};
+
 export const setNationTurn = async (
     db: DatabaseClient,
     nationId: number,
@@ -407,6 +433,23 @@ export const setNationTurn = async (
 ): Promise<ReservedTurnSnapshot> =>
     setNationTurns(db, nationId, officerLevel, [{ turnIndices: [turnIndex], action, args }], expectedRevision);
 
+export const setNationTurnAtCurrentPosition = async (
+    db: DatabaseClient,
+    nationId: number,
+    officerLevel: number,
+    turnIndex: number,
+    action: string,
+    args: unknown,
+    expectedRevision: number
+): Promise<ReservedTurnSnapshot> =>
+    setNationTurnsAtCurrentPositions(
+        db,
+        nationId,
+        officerLevel,
+        [{ turnIndices: [turnIndex], action, args }],
+        expectedRevision
+    );
+
 export const shiftNationTurns = async (
     db: DatabaseClient,
     nationId: number,