From 7ada07a99a58460dcb9d677b1ea21d7a8ad2f45e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 8 Mar 2020 22:55:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=9E=9C=EB=8D=A4=EC=9E=84=EA=B4=80,=20=EB=AA=A8=EB=B0=98?=
 =?UTF-8?q?=EC=8B=9C=EB=8F=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Command/General/che_랜덤임관.php | 13 +++++++------
 hwe/sammo/Command/General/che_모반시도.php |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

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=[