diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php
index 2c7ca7ea..eef6119d 100644
--- a/hwe/sammo/Command/General/che_출병.php
+++ b/hwe/sammo/Command/General/che_출병.php
@@ -247,7 +247,8 @@ class che_출병 extends Command\GeneralCommand
'mapTheme' => \sammo\getMapTheme(),
'procRes' => [
'cities' => \sammo\JSOptionsForCities(),
- 'distanceList' => new \StdClass(),
+ 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1),
+
],
];
}
diff --git a/hwe/ts/PartialReservedCommand.vue b/hwe/ts/PartialReservedCommand.vue
index 54161ed4..07884e22 100644
--- a/hwe/ts/PartialReservedCommand.vue
+++ b/hwe/ts/PartialReservedCommand.vue
@@ -227,7 +227,6 @@ declare const commandList: {
values: commandItem[];
}[];
declare const serverNow: string;
-declare const serverID: string;
type TurnObj = {
action: string;
brief: string;
diff --git a/hwe/ts/processing/CrewTypeItem.vue b/hwe/ts/processing/CrewTypeItem.vue
index 0fb3f989..53f94bbe 100644
--- a/hwe/ts/processing/CrewTypeItem.vue
+++ b/hwe/ts/processing/CrewTypeItem.vue
@@ -27,9 +27,9 @@
{{ crewType.attack }}
{{ crewType.defence }}
{{ crewType.speed }}
+ {{ crewType.avoid }}
{{ crewType.baseCost.toFixed(1) }}
{{ crewType.baseRice.toFixed(1) }}
- {{ crewType.avoid }}
절반
- {{ Math.ceil(amount * crewType.baseCost).toLocaleString() }}금
+ {{ Math.ceil(amount * crewType.baseCost * goldCoeff).toLocaleString() }}금
@@ -86,6 +86,7 @@ export default defineComponent({
commandName: VueTypes.string.isRequired,
currentCrewType: VueTypes.number.def(-1),
crew: VueTypes.number.def(0),
+ goldCoeff: VueTypes.number.isRequired,
},
emits: ["submitOutput", "update:amount"],
watch: {
diff --git a/hwe/ts/processing/General/che_건국.vue b/hwe/ts/processing/General/che_건국.vue
index 970b2fc7..c9876386 100644
--- a/hwe/ts/processing/General/che_건국.vue
+++ b/hwe/ts/processing/General/che_건국.vue
@@ -16,20 +16,21 @@
-
- 국명 :
+
+ 국명 :
-
+
색상 :
-
+
-
diff --git a/hwe/ts/processing/General/che_군량매매.vue b/hwe/ts/processing/General/che_군량매매.vue
index 34ee9825..5a1a56be 100644
--- a/hwe/ts/processing/General/che_군량매매.vue
+++ b/hwe/ts/processing/General/che_군량매매.vue
@@ -12,7 +12,7 @@
팜
-
+
금액 :
-
diff --git a/hwe/ts/processing/General/che_선양.vue b/hwe/ts/processing/General/che_선양.vue
index eeafe81a..2cdd5d4b 100644
--- a/hwe/ts/processing/General/che_선양.vue
+++ b/hwe/ts/processing/General/che_선양.vue
@@ -11,7 +11,7 @@
장수를 선택하세요.
-
+
장수 :
-
diff --git a/hwe/ts/processing/General/che_장수대상임관.vue b/hwe/ts/processing/General/che_장수대상임관.vue
index 89ee3768..c19096d6 100644
--- a/hwe/ts/processing/General/che_장수대상임관.vue
+++ b/hwe/ts/processing/General/che_장수대상임관.vue
@@ -8,7 +8,7 @@
임관할 국가를 목록에서 선택하세요.
-
+
장수 :
-
{{ destCrewType.baseCost.toFixed(1) }}
+
{{
Math.ceil(
- amount * destCrewType.baseCost
+ amount * destCrewType.baseCost * goldCoeff
).toLocaleString()
}}금
+
{{
commandName
}}
@@ -126,9 +128,9 @@
공격
방어
기동
+
회피
가격
군량
-
회피
병사 수
행동
특징
@@ -140,10 +142,17 @@
:key="armCrewType.armType"
>
-
{{ armCrewType.armName }} 계열
+
+ {{ armCrewType.armName }} 계열
+
쌀
-
+
금액 :
-
diff --git a/hwe/ts/processing/Nation/che_국호변경.vue b/hwe/ts/processing/Nation/che_국호변경.vue
index f7368d2b..bdb8b2e2 100644
--- a/hwe/ts/processing/Nation/che_국호변경.vue
+++ b/hwe/ts/processing/Nation/che_국호변경.vue
@@ -7,7 +7,7 @@
국명 :
-
+
{{ commandName }}
diff --git a/hwe/ts/processing/Nation/che_불가침제의.vue b/hwe/ts/processing/Nation/che_불가침제의.vue
index 065f5343..82cf7c6c 100644
--- a/hwe/ts/processing/Nation/che_불가침제의.vue
+++ b/hwe/ts/processing/Nation/che_불가침제의.vue
@@ -18,15 +18,14 @@
붉은색으로 표시됩니다.
-
+
국가 :
-
+
기간 :
-
- {{ yearP + minYear - 1 }}
- 년
- 년
+ {{
month
}}
- 월
+ 월
-
@@ -130,3 +129,9 @@ export default defineComponent({
},
});
+
+
\ No newline at end of file
diff --git a/hwe/ts/processing/Nation/che_피장파장.vue b/hwe/ts/processing/Nation/che_피장파장.vue
index 1c695645..1deae778 100644
--- a/hwe/ts/processing/Nation/che_피장파장.vue
+++ b/hwe/ts/processing/Nation/che_피장파장.vue
@@ -24,14 +24,14 @@
국가 :
-
+
-
diff --git a/hwe/ts/processing/ProcessGeneralAmount.vue b/hwe/ts/processing/ProcessGeneralAmount.vue
index 000e9c16..8f299150 100644
--- a/hwe/ts/processing/ProcessGeneralAmount.vue
+++ b/hwe/ts/processing/ProcessGeneralAmount.vue
@@ -28,7 +28,7 @@
쌀
-
+
금액 :
-
diff --git a/hwe/ts/processing/SelectAmount.vue b/hwe/ts/processing/SelectAmount.vue
index c16a474c..64c59e78 100644
--- a/hwe/ts/processing/SelectAmount.vue
+++ b/hwe/ts/processing/SelectAmount.vue
@@ -20,7 +20,7 @@
>
18){
+ throw `길이가 반각 18자 분량을 넘었습니다.`;
+ }
}
for (const booleanKey of booleanArgs) {
const testVal = args[booleanKey];
diff --git a/hwe/ts/util/mb_strwidth.ts b/hwe/ts/util/mb_strwidth.ts
index c1013c18..37ef5b8b 100644
--- a/hwe/ts/util/mb_strwidth.ts
+++ b/hwe/ts/util/mb_strwidth.ts
@@ -1,4 +1,3 @@
-//TODO: X-Requested-With 믿지 말자.
//https://gist.github.com/demouth/3217440
/**
* mb_strwidth