'지난 턴'을 관리하는 기능 추가

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

@@ -5,7 +5,7 @@ use \sammo\Command;
 use \sammo\Util;
 use \sammo\JosaUtil;
 
-class 휴식 extends GeneralCommand{
+class 휴식 extends Command\GeneralCommand{
     protected function init(){
         //아무것도 하지 않음
     }
@@ -32,7 +32,8 @@ class 휴식 extends GeneralCommand{
         $date = substr($general->getVar('turntime'),11,5);
         $logger->pushGeneralActionLog("아무것도 실행하지 않았습니다. <1>$date</>");
 
-        $general->increaseVar('killturn', -1);
+        $general->setResultTurn(new LastTurn());
+
         $general->applyDB(DB::db());
         return true;
     }

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

@@ -4,8 +4,9 @@ namespace sammo\Command\Nation;
 use \sammo\Command;
 use \sammo\Util;
 use \sammo\JosaUtil;
+use sammo\LastTurn;
 
-class 휴식 extends NationCommand{
+class 휴식 extends Command\NationCommand{
     protected function init(){
         //아무것도 하지 않음
     }

hwe/sammo/Command/NationCommand.php

@@ -3,12 +3,26 @@ namespace sammo\Command;
 
 abstract class NationCommand extends BaseCommand{
     protected $lastTurn;
+    protected $resultTurn;
 
-    public function setLast($lastTurn){
+    public function __construct(General $generalObj, array $env, LastTurn $lastTurn, $arg = null){
         $this->lastTurn = $lastTurn;
+        $this->resultTurn = new LastTurn();
+        parent::__construct($generalObj, $env, $arg);
     }
 
-    public function getLast():array{
+    public function getLastTurn():LastTurn{
         return $this->lastTurn;
     }
+
+    public function setResultTurn(LastTurn $lastTurn){
+        $this->resultTurn = $lastTurn;
+    }
+
+    public function getResultTurn():LastTurn{
+        return $this->resultTurn;
+    }
+    
+
+    
 };