diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php
index 42274d9c..2c7ca7ea 100644
--- a/hwe/sammo/Command/General/che_출병.php
+++ b/hwe/sammo/Command/General/che_출병.php
@@ -2,6 +2,7 @@
namespace sammo\Command\General;
+use phpDocumentor\Reflection\Types\Object_;
use \sammo\DB;
use \sammo\Util;
use \sammo\JosaUtil;
@@ -246,6 +247,7 @@ class che_출병 extends Command\GeneralCommand
'mapTheme' => \sammo\getMapTheme(),
'procRes' => [
'cities' => \sammo\JSOptionsForCities(),
+ 'distanceList' => new \StdClass(),
],
];
}
diff --git a/hwe/sammo/Command/Nation/che_몰수.php b/hwe/sammo/Command/Nation/che_몰수.php
index 0e58a481..42cf261a 100644
--- a/hwe/sammo/Command/Nation/che_몰수.php
+++ b/hwe/sammo/Command/Nation/che_몰수.php
@@ -232,54 +232,4 @@ class che_몰수 extends Command\NationCommand
]
];
}
-
- public function getForm(): string
- {
- //TODO: 암행부처럼 보여야...
- $db = DB::db();
-
- $destRawGenerals = $db->query('SELECT no,name,officer_level,npc,gold,rice FROM general WHERE nation = %i ORDER BY npc,binary(name)', $this->generalObj->getNationID());
- $destGeneralList = [];
- foreach ($destRawGenerals as $destGeneral) {
- $nameColor = \sammo\getNameColor($destGeneral['npc']);
- if ($nameColor) {
- $nameColor = " style='color:{$nameColor}'";
- }
-
- $name = $destGeneral['name'];
- if ($destGeneral['officer_level'] >= 5) {
- $name = "*{$name}*";
- }
-
- $destGeneralList[] = [
- 'no' => $destGeneral['no'],
- 'color' => $nameColor,
- 'name' => $name,
- 'gold' => $destGeneral['gold'],
- 'rice' => $destGeneral['rice']
- ];
- }
- ob_start();
-?>
- 장수의 자금이나 군량을 몰수합니다.
- 몰수한것은 국가재산으로 귀속됩니다.
-
-
-
-
-
-query('SELECT no,name,officer_level,npc,gold,rice FROM general WHERE nation = %i ORDER BY npc,binary(name)', $this->generalObj->getNationID());
- $destGeneralList = [];
- foreach ($destRawGenerals as $destGeneral) {
- $nameColor = \sammo\getNameColor($destGeneral['npc']);
- if ($nameColor) {
- $nameColor = " style='color:{$nameColor}'";
- }
-
- $name = $destGeneral['name'];
- if ($destGeneral['officer_level'] >= 5) {
- $name = "*{$name}*";
- }
-
- $destGeneralList[] = [
- 'no' => $destGeneral['no'],
- 'color' => $nameColor,
- 'name' => $name,
- 'gold' => $destGeneral['gold'],
- 'rice' => $destGeneral['rice']
- ];
- }
- ob_start();
-?>
- 국고로 장수에게 자금이나 군량을 지급합니다.
-
-
-
-
-
-getNationID();
+ $troops = Util::convertArrayToDict($db->query('SELECT * FROM troop WHERE nation=%i', $nationID), 'troop_leader');
+ $destRawGenerals = $db->queryAllLists('SELECT no,name,officer_level,npc,gold,rice,leadership,strength,intel,city,crew,train,atmos,troop FROM general WHERE nation = %i ORDER BY npc,binary(name)', $nationID);
+ return [
+ 'procRes' => [
+ 'troops' => $troops,
+ 'generals' => $destRawGenerals,
+ 'generalsKey' => ['no', 'name', 'officerLevel', 'npc', 'gold', 'rice', 'leadership', 'strength', 'intel', 'cityID', 'crew', 'train', 'atmos', 'troopID'],
+ 'cities' => \sammo\JSOptionsForCities(),
+ 'minAmount' => 100,
+ 'maxAmount' => GameConst::$maxResourceActionAmount,
+ 'amountGuide' => GameConst::$resourceActionAmountGuide,
+ ]
+ ];
}
}
diff --git a/hwe/ts/processing/General/che_강행.vue b/hwe/ts/processing/General/che_강행.vue
deleted file mode 100644
index 8b92005e..00000000
--- a/hwe/ts/processing/General/che_강행.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
- 최대 3칸내 도시로만 강행이 가능합니다.
- 목록을 선택하거나 도시를 클릭하세요.
-