사령턴 커맨드 버그 수정

hwe/sammo/Command/Nation/che_백성동원.php

@@ -31,8 +31,21 @@ class che_백성동원 extends Command\NationCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
-        $this->arg = [];
+        if($this->arg === null){
+            return false;
+        }
 
+        if(!key_exists('destCityID', $this->arg)){
+            return false;
+        }
+        if(CityConst::byID($this->arg['destCityID']) === null){
+            return false;
+        }
+        $destCityID = $this->arg['destCityID'];
+
+        $this->arg = [
+            'destCityID'=>$destCityID,
+        ];
         return true;
     }
 
@@ -145,6 +158,14 @@ class che_백성동원 extends Command\NationCommand{
         return true;
     }
 
+    public function getJSFiles(): array
+    {
+        return [
+            'js/defaultSelectCityByMap.js'
+        ];
+    }
+
+
     public function getForm(): string
     {
         ob_start();

hwe/sammo/Command/Nation/che_수몰.php

@@ -174,6 +174,14 @@ class che_수몰 extends Command\NationCommand{
         return true;
     }
 
+    public function getJSFiles(): array
+    {
+        return [
+            'js/defaultSelectCityByMap.js'
+        ];
+    }
+
+
     public function getForm(): string
     {
         ob_start();

hwe/sammo/Command/Nation/che_피장파장.php

@@ -65,9 +65,7 @@ class che_피장파장 extends Command\NationCommand{
         $this->runnableConstraints=[
             ConstraintHelper::OccupiedCity(),
             ConstraintHelper::BeChief(),
-            ConstraintHelper::NotNeutralDestCity(),
+            ConstraintHelper::AllowDiplomacyBetweenStatus(
-            ConstraintHelper::NotOccupiedDestCity(),
-            ConstraintHelper::DisallowDiplomacyBetweenStatus(
                 [0, 1],
                 '선포, 전쟁중인 상대국에게만 가능합니다.'
             ),

hwe/sammo/Command/Nation/che_허보.php

@@ -61,7 +61,7 @@ class che_허보 extends Command\NationCommand{
             ConstraintHelper::BeChief(),
             ConstraintHelper::NotNeutralDestCity(),
             ConstraintHelper::NotOccupiedDestCity(),
-            ConstraintHelper::DisallowDiplomacyBetweenStatus(
+            ConstraintHelper::AllowDiplomacyBetweenStatus(
                 [0, 1],
                 '선포, 전쟁중인 상대국에게만 가능합니다.'
             ),
@@ -88,8 +88,7 @@ class che_허보 extends Command\NationCommand{
     public function getBrief():string{
         $commandName = $this->getName();
         $destCityName = CityConst::byID($this->arg['destCityID'])->name;
-        $josaUl = JosaUtil::pick($destCityName, '을');
+        return "【{$destCityName}】에 {$commandName}";
-        return "【{$destCityName}】{$josaUl} {$commandName}";
     }
 
     public function run():bool{
@@ -186,6 +185,14 @@ class che_허보 extends Command\NationCommand{
         return true;
     }
 
+    public function getJSFiles(): array
+    {
+        return [
+            'js/defaultSelectCityByMap.js'
+        ];
+    }
+
+
     public function getForm(): string
     {
         ob_start();

hwe/sammo/Constraint/ConstraintHelper.php

@@ -13,7 +13,7 @@ class ConstraintHelper{
     }
 
     static function AllowDiplomacyBetweenStatus(array $allowDipCodeList, string $errMsg):array{
-        return [__FUNCTION__, $allowDipCodeList, $errMsg];
+        return [__FUNCTION__, [$allowDipCodeList, $errMsg]];
     }
     
     static function AllowJoinAction():array{

hwe/sammo/GameConstBase.php

@@ -239,7 +239,10 @@ class GameConstBase
             'che_선동',
         ],
         '개인'=>[
+            //'che_내정특기초기화',
+            //'che_전투특기초기화',
             'che_단련',
+            //'che_숙련전환',
             'che_견문',
             'che_장비매매',
             'che_군량매매',
@@ -281,10 +284,10 @@ class GameConstBase
         ],
         '전략'=>[
             'che_필사즉생',
-            //'che_백성동원',
+            'che_백성동원',
-            //'che_수몰',
+            'che_수몰',
-            //'che_허보',
+            'che_허보',
-            //'che_피장파장',
+            'che_피장파장',
             //'che_의병모집',
             //'che_이호경식',
             //'che_급습',