merge: 최신 main을 메인 도시 정보 호환에 통합

app/game-api/src/context.ts

@@ -44,6 +44,7 @@ export type WorldStateConfig = z.infer<typeof zWorldStateConfig>;
 
 export const zWorldStateMeta = z.object({
     serverId: z.string().optional(),
+    gameIdx: z.number().int().positive().optional(),
     starttime: z.string().optional(),
     opentime: z.string().optional(),
     preopenAt: z.string().optional(),

app/game-api/src/router/inherit/index.ts

@@ -12,6 +12,7 @@ import {
     isWarTraitKey,
 } from '@sammo-ts/logic';
 import type { InheritBuffType } from '@sammo-ts/logic';
+import type { ItemSlot } from '@sammo-ts/logic';
 import { simpleSerialize } from '@sammo-ts/logic/war/utils.js';
 import { resolveLegacyCompatibleUniqueConfig } from '@sammo-ts/logic/rewards/legacyUniqueItemPool.js';
 import {
@@ -39,6 +40,8 @@ const BUFF_KEYS: InheritBuffType[] = [
     'warMagicTrialProbOppose',
 ];
 
+const UNIQUE_ITEM_SLOT_ORDER: readonly ItemSlot[] = ['horse', 'weapon', 'book', 'item'];
+
 const BUFF_LABELS: Record<InheritBuffType, string> = {
     warAvoidRatio: '회피 확률 증가',
     warCriticalRatio: '필살 확률 증가',
@@ -79,7 +82,8 @@ const loadAvailableUniqueItems = async (worldState: WorldStateRow) => {
     const loader = new ItemLoader();
     const { allItems } = await resolveLegacyCompatibleUniqueConfig(configConst, loader);
     const enabledKeys: Array<Parameters<ItemLoader['load']>[0]> = [];
-    for (const entries of Object.values(allItems)) {
+    for (const slot of UNIQUE_ITEM_SLOT_ORDER) {
+        const entries = allItems[slot] ?? {};
         for (const [key, amount] of Object.entries(asRecord(entries))) {
             if (asNumber(amount, 0) !== 0 && isItemKey(key)) {
                 enabledKeys.push(key);
@@ -94,10 +98,11 @@ const loadAvailableUniqueItems = async (worldState: WorldStateRow) => {
                 name: item.name,
                 rawName: item.rawName,
                 info: item.info ?? '',
+                slot: item.slot,
             };
         })
     );
-    return items.sort((left, right) => left.name.localeCompare(right.name, 'ko'));
+    return items;
 };
 
 const resolveWorld = async (ctx: { db: { worldState: { findFirst: () => Promise<unknown> } } }) => {

app/game-api/src/router/lobby/index.ts

@@ -53,6 +53,8 @@ export const lobbyRouter = router({
 
         return {
             serverId: worldState.meta.serverId?.trim() || ctx.profile?.name || 'game',
+            profile: ctx.profile.id,
+            gameIdx: worldState.meta.gameIdx ?? 1,
             year: worldState.currentYear,
             month: worldState.currentMonth,
             userCnt,