첫 화면 띄우기 성공

hwe/sammo/Command/General/che_NPC능동.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -18,6 +18,9 @@ class che_NPC능동 extends Command\GeneralCommand{
     static protected $actionName = 'NPC능동';
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('optionText', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_강행.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -26,6 +26,9 @@ class che_강행 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('destCityID', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_거병.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -38,10 +38,6 @@ class che_거병 extends Command\GeneralCommand{
         $this->setCity();
         $this->setNation();
 
-        if(!key_exists($colorType, GetNationColors())){
-            return false;
-        }
-
         $relYear = $env['year'] - $env['startyear'];
         
         $this->runnableConstraints=[

hwe/sammo/Command/General/che_건국.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -29,6 +29,9 @@ class che_건국 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         $nationName = $this->arg['nationName']??null;
         $nationType = $this->arg['nationType']??null;
         $colorType = $this->arg['colorType']??null;

hwe/sammo/Command/General/che_견문.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_군량매매.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 //TODO: 아이템 클래스 재확정 후 재 구현!
 
@@ -36,6 +36,9 @@ class che_군량매매 extends Command\GeneralCommand{
     ];
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         $buyRice = $this->arg['buyRice']??null;
         if(!is_bool($buyRice)){
             return false;

hwe/sammo/Command/General/che_귀환.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_기술연구.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_농지개간.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 class che_농지개간 extends che_상업투자{
     static protected $cityKey = 'agri';

hwe/sammo/Command/General/che_단련.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_등용.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -28,6 +28,9 @@ class che_등용 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         //NOTE: 사망 직전에 '등용' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
         if(!key_exists('destGeneralID', $this->arg)){
             return false;
@@ -74,7 +77,7 @@ class che_등용 extends Command\GeneralCommand{
         ];
 
         if($this->destGeneralObj->getVar('level') == 12){
-            $this->runnableConstraints[] = ['AlwaysFail', '군주에게는 등용장을 보낼 수 없습니다.'];
+            $this->runnableConstraints[] = ConstraintHelper::AlwaysFail('군주에게는 등용장을 보낼 수 없습니다.');
         }
     }
 

hwe/sammo/Command/General/che_랜덤임관.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil, TimeUtil,
@@ -27,7 +27,9 @@ class che_랜덤임관 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
-        
+        if($this->arg === null){
+            return false;
+        }
         $destNationIDList = $this->arg['destNationIDList']??null;
         //null은 에러, []는 정상
 

hwe/sammo/Command/General/che_모반시도.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -21,8 +21,8 @@ use function \sammo\{
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
-class che_모반 extends Command\GeneralCommand{
-    static protected $actionName = '모반';
+class che_모반시도 extends Command\GeneralCommand{
+    static protected $actionName = '모반시도';
 
     protected function argTest():bool{
         $this->arg = null;
@@ -34,9 +34,6 @@ class che_모반 extends Command\GeneralCommand{
         $general = $this->generalObj;
 
         $this->setNation();
-
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'nation'], 1);
-        $this->setDestGeneral($destGeneral);
         
         $this->runnableConstraints=[
             ConstraintHelper::NotBeNeutral(),

hwe/sammo/Command/General/che_모병.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_물자조달.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_방랑.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_사기진작.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -49,7 +49,8 @@ class che_사기진작 extends Command\GeneralCommand{
     }
 
     public function getCost():array{
-        return [Util::round($this->getVar('crew')/100), 0];
+        $general = $this->generalObj;
+        return [Util::round($general->getVar('crew')/100), 0];
     }
     
     public function getPreReqTurn():int{

hwe/sammo/Command/General/che_상업투자.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -36,7 +36,7 @@ class che_상업투자 extends Command\GeneralCommand{
             'power'=>'무력경험',
             'intel'=>'지력경험',
         ];
-        $statType = $statType[static::$statKey];
+        $statType = $statTypeBase[static::$statKey];
         [$reqGold, $reqRice] = $this->getCost();
 
         $title = "{$name}({$statType}";
@@ -79,7 +79,7 @@ class che_상업투자 extends Command\GeneralCommand{
 
     public function getCost():array{
         $develCost = $this->env['develcost'];
-        $reqGold = $general->onCalcDomestic(static::$actionKey, 'cost', $develCost);
+        $reqGold = $this->generalObj->onCalcDomestic(static::$actionKey, 'cost', $develCost);
         $reqRice = 0;
         
         return [$reqGold, $reqRice];

hwe/sammo/Command/General/che_선동.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_선양.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -27,6 +27,9 @@ class che_선양 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         //NOTE: 사망 직전에 '선양' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
         if(!key_exists('destGeneralID', $this->arg)){
             return false;

hwe/sammo/Command/General/che_성벽보수.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 class che_성벽보수 extends che_상업투자{
     static protected $cityKey = 'wall';

hwe/sammo/Command/General/che_소집해제.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_수비강화.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 class che_수비강화 extends che_상업투자{
     static protected $cityKey = 'def';

hwe/sammo/Command/General/che_요양.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_이동.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -26,6 +26,9 @@ class che_이동 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('destCityID', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_인재탐색.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -47,7 +47,7 @@ class che_인재탐색 extends Command\GeneralCommand{
         ];
 
         $relYear = $env['year'] - $env['startyear'];
-        if($relYear < 3 && $this->nation['gennum'] >= GameConst::$initialNationGenLimit){
+        if($this->nation['nation'] != 0 && $relYear < 3 && $this->nation['gennum'] >= GameConst::$initialNationGenLimit){
             $nationName = $this->nation['name'];
             $josaUn = JosaUtil::pick($nationName, '은');
             $this->runnableConstraints[] = ConstraintHelper::AlwaysFail("현재 <D>{$nationName}</>{$josaUn} 탐색이 제한되고 있습니다.");

hwe/sammo/Command/General/che_임관.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -26,6 +26,9 @@ class che_임관 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         $destNationID = $this->arg['destNationID']??null;
         $destGeneralID = $this->arg['destGeneralID']??null;
 

hwe/sammo/Command/General/che_장비매매.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 //TODO: 아이템 클래스 재확정 후 재 구현!
 
@@ -35,6 +35,9 @@ class che_장비매매 extends Command\GeneralCommand{
     ];
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         $itemType = $this->arg['itemType']??null;
         if(!in_array($itemType, array_keys(static::$itemMap))){
             return false;

hwe/sammo/Command/General/che_전투태세.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_정착장려.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -58,7 +58,7 @@ class che_정착장려 extends Command\GeneralCommand{
     public function getCost():array{
         $develCost = $this->env['develcost'] * 2;
         $reqGold = 0;
-        $reqRice = $general->onCalcDomestic(static::$actionKey, 'cost', $develCost);
+        $reqRice = $this->generalObj->onCalcDomestic(static::$actionKey, 'cost', $develCost);
         
         return [$reqGold, $reqRice];
     }

hwe/sammo/Command/General/che_주민선정.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -58,7 +58,7 @@ class che_주민선정 extends Command\GeneralCommand{
     public function getCost():array{
         $develCost = $this->env['develcost'] * 2;
         $reqGold = 0;
-        $reqRice = $general->onCalcDomestic(static::$actionKey, 'cost', $develCost);
+        $reqRice = $this->generalObj->onCalcDomestic(static::$actionKey, 'cost', $develCost);
         
         return [$reqGold, $reqRice];
     }

hwe/sammo/Command/General/che_증여.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -27,6 +27,9 @@ class che_증여 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         //NOTE: 사망 직전에 '증여' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음
         if(!key_exists('isGold', $this->arg)){
             return false;

hwe/sammo/Command/General/che_집합.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -35,7 +35,6 @@ class che_집합 extends Command\GeneralCommand{
 
         $this->setCity();
         $this->setNation();
-        $this->setDestCity($this->arg['destCityID'], []);
 
         [$reqGold, $reqRice] = $this->getCost();
         

hwe/sammo/Command/General/che_징병.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -42,6 +42,9 @@ class che_징병 extends Command\GeneralCommand{
     }
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('crewType', $this->arg)){
             return false;
         }
@@ -111,7 +114,7 @@ class che_징병 extends Command\GeneralCommand{
             return [0, 0];
         }
         $reqGold = $this->reqCrewType->costWithTech($this->nation['tech'], $this->reqCrew);
-        $reqGold = $general->onCalcDomestic('징병', 'cost', $reqGold, ['armType'=>$this->reqCrewType->armType]);
+        $reqGold = $this->generalObj->onCalcDomestic('징병', 'cost', $reqGold, ['armType'=>$this->reqCrewType->armType]);
         $reqGold *= static::$costOffset;
         $reqRice = $this->reqCrew / 100;
         return [$reqGold, $reqRice];

hwe/sammo/Command/General/che_첩보.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -27,6 +27,9 @@ class che_첩보 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('destCityID', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_출병.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -27,6 +27,9 @@ class che_출병 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('destCityID', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_치안강화.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 class che_치안강화 extends che_상업투자{
     static protected $cityKey = 'secu';

hwe/sammo/Command/General/che_탈취.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_파괴.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_하야.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,

hwe/sammo/Command/General/che_해산.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -40,12 +40,6 @@ class che_해산 extends Command\GeneralCommand{
         $this->setCity();
         $this->setNation(['gennum']);
 
-        if(!key_exists($colorType, GetNationColors())){
-            return false;
-        }
-
-        $relYear = $env['year'] - $env['startyear'];
-        
         $this->runnableConstraints=[
             ConstraintHelper::BeLord(),
             ConstraintHelper::WanderingNation(),

hwe/sammo/Command/General/che_헌납.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -27,6 +27,9 @@ class che_헌납 extends Command\GeneralCommand{
     static public $reqArg = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('isGold', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_화계.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,
@@ -29,6 +29,9 @@ class che_화계 extends Command\GeneralCommand{
     static protected $injuryGeneral = true;
 
     protected function argTest():bool{
+        if($this->arg === null){
+            return false;
+        }
         if(!key_exists('destCityID', $this->arg)){
             return false;
         }

hwe/sammo/Command/General/che_훈련.php

@@ -1,5 +1,5 @@
 <?php
-namespace sammo\GeneralCommand;
+namespace sammo\Command\General;
 
 use \sammo\{
     DB, Util, JosaUtil,