diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php index 49db9c54..d2db7c89 100644 --- a/hwe/sammo/Command/General/che_랜덤임관.php +++ b/hwe/sammo/Command/General/che_랜덤임관.php @@ -12,7 +12,9 @@ use \sammo\{ use function \sammo\{ - tryUniqueItemLottery + tryUniqueItemLottery, + getInvitationList, + getNationStaticInfo }; use \sammo\Constraint\Constraint; @@ -24,17 +26,17 @@ use sammo\MustNotBeReachedException; class che_랜덤임관 extends Command\GeneralCommand{ static protected $actionName = '랜덤임관'; - static public $reqArg = true; + static public $reqArg = false; protected function argTest():bool{ if($this->arg === null){ - return false; + return true; } $destNationIDList = $this->arg['destNationIDList']??null; //null은 에러, []는 정상 if($destNationIDList === null || !is_array($destNationIDList)){ - return false; + return true; } if($destNationIDList && Util::isDict($destNationIDList)){ return false; @@ -69,7 +71,7 @@ class che_랜덤임관 extends Command\GeneralCommand{ ConstraintHelper::AllowJoinAction(), ]; - if($this->arg['destNationIDList']){ + if($this->arg['destNationIDList']??false){ $this->runnableConstraints[] = ConstraintHelper::ExistsAllowJoinNation($relYear, $this->arg['destNationIDList']); } } @@ -269,5 +271,4 @@ class che_랜덤임관 extends Command\GeneralCommand{ return true; } - } \ No newline at end of file diff --git a/hwe/sammo/Command/General/che_모반시도.php b/hwe/sammo/Command/General/che_모반시도.php index 51dbf2de..7cb28e4b 100644 --- a/hwe/sammo/Command/General/che_모반시도.php +++ b/hwe/sammo/Command/General/che_모반시도.php @@ -33,6 +33,7 @@ class che_모반시도 extends Command\GeneralCommand{ $general = $this->generalObj; + $this->setCity(); $this->setNation(); $this->runnableConstraints=[