버그 수정

hwe/sammo/Command/BaseCommand.php

@@ -145,14 +145,14 @@ abstract class BaseCommand{
         
 
         $db = DB::db();
-        $destNation = $db->queryFirstRow('SELECT %l FROM nation WHERE nation=%i', Util::formatListOfBackticks($args), $nationID);
-        if($destNation === null){
-            $destNation = [];
+        $nation = $db->queryFirstRow('SELECT %l FROM nation WHERE nation=%i', Util::formatListOfBackticks($args), $nationID);
+        if($nation === null){
+            $nation = [];
             foreach($args as $arg){
-                $destNation[$arg] = $defaultValues[$arg];
+                $nation[$arg] = $defaultValues[$arg];
             }
         }
-        $this->destNation = $destNation;
+        $this->nation = $nation;
     }
 
     protected function setDestGeneral(General $destGeneralObj){
@@ -246,7 +246,7 @@ abstract class BaseCommand{
             'general'=>$this->generalObj->getRaw(),
             'city'=>$this->city,
             'nation'=>$this->nation,
-            'arg'=>$this->arg,
+            'cmd_arg'=>$this->arg,
 
             'destGeneral'=>$this->destGeneralObj->getRaw(),
             'destCity'=>$this->destCity,
@@ -282,7 +282,7 @@ abstract class BaseCommand{
             'general'=>$this->generalObj->getRaw(),
             'city'=>$this->city,
             'nation'=>$this->nation,
-            'arg'=>$this->arg,
+            'cmd_arg'=>$this->arg,
 
             'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
             'destCity'=>$this->destCity,

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

@@ -191,6 +191,8 @@ class che_인재탐색 extends Command\GeneralCommand{
 
         $isOurNation = $this->nation['scout'] == 0;
 
+        $age = $env['year'] - 20;
+
         $newNPC = new \sammo\Scenario\NPC(
             Util::randRangeInt(1, 150),
             \sammo\getRandGenName(),
@@ -201,7 +203,7 @@ class che_인재탐색 extends Command\GeneralCommand{
             $power,
             $intel,
             $isOurNation?1:0,
-            $env['year'] - 20,
+            $age,
             $env['year'] + Util::randRangeInt(10, 50),
             null,
             null

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

@@ -57,14 +57,15 @@ class che_징병 extends Command\GeneralCommand{
         if(!is_int($crewType)){
             return false;
         }
-        if(!is_int($amount)){
+        if(!is_numeric($amount)){
             return false;
         }
+        $amount = (int)$amount;
 
         if(GameUnitConst::byID($crewType) === null){
             return false;
         }
-        if($amount < 100){
+        if($amount < 0){
             return false;
         }
         $this->arg = [

hwe/sammo/Command/Nation/che_불가침제의.php

@@ -157,14 +157,14 @@ class che_불가침제의 extends Command\NationCommand{
 
         $now = new \DateTime($date);
         $validUntil = new \DateTime($date);
-        $validMinutes = max(30, $turnterm*3);
+        $validMinutes = max(30, $env['turnterm']*3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
         $msg = new DiplomaticMessage(
             Message::MSGTYPE_DIPLOMACY,
             $src,
             $dest,
-            "{$srcNation['name']}의 {$year}년 {$month}까지 불가침 제의 서신",
+            "{$nationName}의 {$year}년 {$month}까지 불가침 제의 서신",
             $now,
             $validUntil,
             [
@@ -177,7 +177,7 @@ class che_불가침제의 extends Command\NationCommand{
 
         $general->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->applyDB($db);
-        $destGeneral->applyDB($db);
+        $destLogger->flush();
 
         return true;
     }

hwe/sammo/Command/Nation/che_선전포고.php

@@ -134,7 +134,7 @@ class che_선전포고 extends Command\NationCommand{
         ], '(me=%i AND you=%i) OR (me=%i AND you=%i)', $nationID, $destNationID, $destNationID, $nationID);
 
         //국메로 저장
-        $text = "【외교】{$env['year']}년 {$env['month']}월:{$nationNation}에서 {$destNationName}에 선전포고";
+        $text = "【외교】{$env['year']}년 {$env['month']}월:{$nationName}에서 {$destNationName}에 선전포고";
 
         $src = new MessageTarget(
             $general->getID(), 
@@ -164,7 +164,7 @@ class che_선전포고 extends Command\NationCommand{
 
         $general->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->applyDB($db);
-        $destGeneral->applyDB($db);
+        $destLogger->flush();
 
         return true;
     }

hwe/sammo/Command/Nation/휴식.php

@@ -16,6 +16,15 @@ class 휴식 extends Command\NationCommand{
     protected function init(){
         //아무것도 하지 않음
     }
+
+    public function getPreReqTurn():int{
+        return 0;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+    
     public function getCost():array{
         return [0, 0];
     }