From 081d40cf82798eb273e0f8fa92ecdd23db1b5b1d Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 21 Dec 2021 21:55:05 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B5=AD=EA=B0=80=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95,=20=EB=AA=B0?=
 =?UTF-8?q?=EC=88=98=20type=20warning=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/processing/General/index.ts        | 2 ++
 hwe/ts/processing/Nation/che_몰수.vue     | 6 +++---
 hwe/ts/processing/Nation/che_선전포고.vue | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hwe/ts/processing/General/index.ts b/hwe/ts/processing/General/index.ts
index 346fd0bd..5e6f76df 100644
--- a/hwe/ts/processing/General/index.ts
+++ b/hwe/ts/processing/General/index.ts
@@ -4,6 +4,8 @@ import { default as che_등용} from "./che_등용.vue";
 import { default as CityProcess} from "./che_이동.vue";
 import { default as che_징병} from "./che_징병.vue";
 
+//TODO: 자주 쓰는 녀석들은 Slot으로 변경
+
 export const commandMap: Record<string, typeof CityProcess> = {
     che_강행: CityProcess,
     che_군량매매,
diff --git a/hwe/ts/processing/Nation/che_몰수.vue b/hwe/ts/processing/Nation/che_몰수.vue
index 0c33c9c6..1c58e190 100644
--- a/hwe/ts/processing/Nation/che_몰수.vue
+++ b/hwe/ts/processing/Nation/che_몰수.vue
@@ -54,7 +54,7 @@ import BottomBar from "@/components/BottomBar.vue";
 import {
   convertGeneralList,
   procGeneralItem,
-  procGeneralKeyList,
+  procGeneralKey,
   procGeneralRawItemList,
 } from "../processingRes";
 import { getNpcColor } from "@/common_legacy";
@@ -64,7 +64,7 @@ declare const procRes: {
   distanceList: Record<number, number[]>;
   cities: [number, string][];
   generals: procGeneralRawItemList;
-  generalsKey: procGeneralKeyList;
+  generalsKey: procGeneralKey[];
   minAmount: number;
   maxAmount: number;
   amountGuide: number[];
@@ -103,7 +103,7 @@ export default defineComponent({
       const name = nameColor
         ? `<span style="color:${nameColor}">${gen.name}</span>`
         : gen.name;
-      return `${name} (금${gen.gold.toLocaleString()}/쌀${gen.rice.toLocaleString()}) (${
+      return `${name} (금${unwrap(gen.gold).toLocaleString()}/쌀${unwrap(gen.rice).toLocaleString()}) (${
         gen.leadership
       }/${gen.leadership}/${gen.intel})`;
     }
diff --git a/hwe/ts/processing/Nation/che_선전포고.vue b/hwe/ts/processing/Nation/che_선전포고.vue
index 794075e4..2b2371f9 100644
--- a/hwe/ts/processing/Nation/che_선전포고.vue
+++ b/hwe/ts/processing/Nation/che_선전포고.vue
@@ -51,7 +51,6 @@ import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
 import { procNationItem, procNationList } from "../processingRes";
 declare const mapTheme: string;
-declare const currentNation: number;
 declare const commandName: string;
 
 declare const procRes: {
@@ -81,6 +80,7 @@ export default defineComponent({
     }
 
     const selectedNationID = ref(procRes.nations[0].id);
+    const selectedCityObj = ref();//mapping용
 
     function selectedNation(nationID: number) {
       selectedNationID.value = nationID;
@@ -96,8 +96,10 @@ export default defineComponent({
     }
 
     return {
+      startYear: procRes.startYear,
       mapTheme: ref(mapTheme),
       nations: ref(nations),
+      selectedCityObj,
       selectedNationID,
       commandName,
       selectedNation,