diff --git a/hwe/index.php b/hwe/index.php
index 5fb96f8e..92f2b7c7 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -213,7 +213,6 @@ if ($session->userGrade >= 5) {
-
";
@@ -221,7 +220,6 @@ if ($session->userGrade >= 5) {
else if($session->userGrade == 4){
echo "
|
-
|
";
diff --git a/hwe/sammo/Command/BaseCommand.php b/hwe/sammo/Command/BaseCommand.php
index f83e65a6..1669547f 100644
--- a/hwe/sammo/Command/BaseCommand.php
+++ b/hwe/sammo/Command/BaseCommand.php
@@ -16,6 +16,7 @@ abstract class BaseCommand{
* @var General|null $destGeneralObj
*/
static protected $actionName = 'CommandName';
+ static public $reqArg = false;
protected $generalObj = null;
protected $city = null;
diff --git a/hwe/sammo/Command/General/che_강행.php b/hwe/sammo/Command/General/che_강행.php
index 6c292d8f..11155644 100644
--- a/hwe/sammo/Command/General/che_강행.php
+++ b/hwe/sammo/Command/General/che_강행.php
@@ -23,6 +23,7 @@ use sammo\CityConst;
class che_강행 extends Command\GeneralCommand{
static protected $actionName = '강행';
+ static public $reqArg = true;
protected function argTest():bool{
if(!key_exists('destCityID', $this->arg)){
diff --git a/hwe/sammo/Command/General/che_건국.php b/hwe/sammo/Command/General/che_건국.php
index 83bed9f9..aa8944eb 100644
--- a/hwe/sammo/Command/General/che_건국.php
+++ b/hwe/sammo/Command/General/che_건국.php
@@ -26,6 +26,7 @@ use function sammo\GetNationColors;
class che_건국 extends Command\GeneralCommand{
static protected $actionName = '건국';
+ static public $reqArg = true;
protected function argTest():bool{
$nationName = $this->arg['nationName']??null;
diff --git a/hwe/sammo/Command/General/che_군량매매.php b/hwe/sammo/Command/General/che_군량매매.php
index 6d47029f..790ebfd9 100644
--- a/hwe/sammo/Command/General/che_군량매매.php
+++ b/hwe/sammo/Command/General/che_군량매매.php
@@ -26,6 +26,7 @@ use sammo\MustNotBeReachedException;
class che_군량매매 extends Command\GeneralCommand{
static protected $actionName = '군량매매';
+ static public $reqArg = true;
static $itemMap = [
'horse'=>'명마',
diff --git a/hwe/sammo/Command/General/che_등용.php b/hwe/sammo/Command/General/che_등용.php
index d265dde4..4c57effe 100644
--- a/hwe/sammo/Command/General/che_등용.php
+++ b/hwe/sammo/Command/General/che_등용.php
@@ -25,6 +25,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_등용 extends Command\GeneralCommand{
static protected $actionName = '등용';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 사망 직전에 '등용' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php
index f275b5ec..95e39679 100644
--- a/hwe/sammo/Command/General/che_랜덤임관.php
+++ b/hwe/sammo/Command/General/che_랜덤임관.php
@@ -24,6 +24,7 @@ use sammo\MustNotBeReachedException;
class che_랜덤임관 extends Command\GeneralCommand{
static protected $actionName = '랜덤임관';
+ static public $reqArg = true;
protected function argTest():bool{
diff --git a/hwe/sammo/Command/General/che_모병.php b/hwe/sammo/Command/General/che_모병.php
index f90c1c0e..dc9a9241 100644
--- a/hwe/sammo/Command/General/che_모병.php
+++ b/hwe/sammo/Command/General/che_모병.php
@@ -11,7 +11,7 @@ use \sammo\{
};
-class che_모병 extends Command\GeneralCommand{
+class che_모병 extends che_징병{
static protected $actionName = '모병';
static protected $costOffset = 2;
diff --git a/hwe/sammo/Command/General/che_선양.php b/hwe/sammo/Command/General/che_선양.php
index ea29d9ef..aca9d5bf 100644
--- a/hwe/sammo/Command/General/che_선양.php
+++ b/hwe/sammo/Command/General/che_선양.php
@@ -24,6 +24,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_선양 extends Command\GeneralCommand{
static protected $actionName = '선양';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 사망 직전에 '선양' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php
index 18d35a59..6dc1d5b6 100644
--- a/hwe/sammo/Command/General/che_이동.php
+++ b/hwe/sammo/Command/General/che_이동.php
@@ -23,6 +23,7 @@ use sammo\CityConst;
class che_이동 extends Command\GeneralCommand{
static protected $actionName = '이동';
+ static public $reqArg = true;
protected function argTest():bool{
if(!key_exists('destCityID', $this->arg)){
diff --git a/hwe/sammo/Command/General/che_임관.php b/hwe/sammo/Command/General/che_임관.php
index e0534c89..1d27d72e 100644
--- a/hwe/sammo/Command/General/che_임관.php
+++ b/hwe/sammo/Command/General/che_임관.php
@@ -23,6 +23,7 @@ use sammo\CityConst;
class che_임관 extends Command\GeneralCommand{
static protected $actionName = '임관';
+ static public $reqArg = true;
protected function argTest():bool{
$destNationID = $this->arg['destNationID']??null;
diff --git a/hwe/sammo/Command/General/che_장비매매.php b/hwe/sammo/Command/General/che_장비매매.php
index bd4865f1..8898364f 100644
--- a/hwe/sammo/Command/General/che_장비매매.php
+++ b/hwe/sammo/Command/General/che_장비매매.php
@@ -25,6 +25,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_장비매매 extends Command\GeneralCommand{
static protected $actionName = '장비매매';
+ static public $reqArg = true;
static $itemMap = [
'horse'=>'명마',
diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php
index d1264b58..badb2345 100644
--- a/hwe/sammo/Command/General/che_증여.php
+++ b/hwe/sammo/Command/General/che_증여.php
@@ -24,6 +24,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_증여 extends Command\GeneralCommand{
static protected $actionName = '증여';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 사망 직전에 '증여' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/General/che_징병.php b/hwe/sammo/Command/General/che_징병.php
index 824721a3..ac296c35 100644
--- a/hwe/sammo/Command/General/che_징병.php
+++ b/hwe/sammo/Command/General/che_징병.php
@@ -26,6 +26,7 @@ class che_징병 extends Command\GeneralCommand{
*/
static protected $actionName = '징병';
static protected $costOffset = 1;
+ static public $reqArg = true;
static protected $defaultTrain;
static protected $defaultAtmos;
diff --git a/hwe/sammo/Command/General/che_첩보.php b/hwe/sammo/Command/General/che_첩보.php
index 52f8ea6e..217b1489 100644
--- a/hwe/sammo/Command/General/che_첩보.php
+++ b/hwe/sammo/Command/General/che_첩보.php
@@ -24,6 +24,7 @@ use sammo\CityConst;
class che_첩보 extends Command\GeneralCommand{
static protected $actionName = '첩보';
+ static public $reqArg = true;
protected function argTest():bool{
if(!key_exists('destCityID', $this->arg)){
diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php
index 6c1c9b9d..90c0a05d 100644
--- a/hwe/sammo/Command/General/che_출병.php
+++ b/hwe/sammo/Command/General/che_출병.php
@@ -24,6 +24,7 @@ use sammo\CityConst;
class che_출병 extends Command\GeneralCommand{
static protected $actionName = '출병';
+ static public $reqArg = true;
protected function argTest():bool{
if(!key_exists('destCityID', $this->arg)){
diff --git a/hwe/sammo/Command/General/che_헌납.php b/hwe/sammo/Command/General/che_헌납.php
index 960135a2..923a94b0 100644
--- a/hwe/sammo/Command/General/che_헌납.php
+++ b/hwe/sammo/Command/General/che_헌납.php
@@ -24,6 +24,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_헌납 extends Command\GeneralCommand{
static protected $actionName = '헌납';
+ static public $reqArg = true;
protected function argTest():bool{
if(!key_exists('isGold', $this->arg)){
diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php
index 4bfe7543..566e1954 100644
--- a/hwe/sammo/Command/General/che_화계.php
+++ b/hwe/sammo/Command/General/che_화계.php
@@ -23,6 +23,7 @@ use sammo\CityConst;
class che_화계 extends Command\GeneralCommand{
static protected $actionName = '화계';
+ static public $reqArg = true;
static protected $statType = 'intel';
static protected $injuryGeneral = true;
diff --git a/hwe/sammo/Command/Nation/che_몰수.php b/hwe/sammo/Command/Nation/che_몰수.php
index 06984c44..633079af 100644
--- a/hwe/sammo/Command/Nation/che_몰수.php
+++ b/hwe/sammo/Command/Nation/che_몰수.php
@@ -22,6 +22,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_몰수 extends Command\NationCommand{
static protected $actionName = '몰수';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 사망 직전에 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/Nation/che_발령.php b/hwe/sammo/Command/Nation/che_발령.php
index 0ca4eded..448cb4c9 100644
--- a/hwe/sammo/Command/Nation/che_발령.php
+++ b/hwe/sammo/Command/Nation/che_발령.php
@@ -22,6 +22,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_발령 extends Command\NationCommand{
static protected $actionName = '발령';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 사망 직전에 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/Nation/che_불가침제의.php b/hwe/sammo/Command/Nation/che_불가침제의.php
index 412d115e..6e35ee08 100644
--- a/hwe/sammo/Command/Nation/che_불가침제의.php
+++ b/hwe/sammo/Command/Nation/che_불가침제의.php
@@ -22,6 +22,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_불가침제의 extends Command\NationCommand{
static protected $actionName = '불가침제의';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 멸망 직전에 턴을 넣을 수 있으므로, 존재하지 않는 국가여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/Nation/che_선전포고.php b/hwe/sammo/Command/Nation/che_선전포고.php
index 1c3dbeda..492ac3b7 100644
--- a/hwe/sammo/Command/Nation/che_선전포고.php
+++ b/hwe/sammo/Command/Nation/che_선전포고.php
@@ -22,6 +22,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_선전포고 extends Command\NationCommand{
static protected $actionName = '선전포고';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 멸망 직전에 턴을 넣을 수 있으므로, 존재하지 않는 국가여도 argTest에서 바로 탈락시키지 않음
diff --git a/hwe/sammo/Command/Nation/che_포상.php b/hwe/sammo/Command/Nation/che_포상.php
index 005c0ae7..39c9675f 100644
--- a/hwe/sammo/Command/Nation/che_포상.php
+++ b/hwe/sammo/Command/Nation/che_포상.php
@@ -22,6 +22,7 @@ use \sammo\Constraint\ConstraintHelper;
class che_포상 extends Command\NationCommand{
static protected $actionName = '포상';
+ static public $reqArg = true;
protected function argTest():bool{
//NOTE: 사망 직전에 '포상' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음