merge: refresh ng_compare for logical game clock

hwe/sammo/Command/Nation/che_몰수.php

@@ -193,7 +193,7 @@ class che_몰수 extends Command\NationCommand
                 $src,
                 $src,
                 $text,
-                new \DateTime(),
+                Message::gameNow(),
                 new \DateTime('9999-12-31'),
                 []
             );

hwe/sammo/Command/Nation/che_발령.php

@@ -159,7 +159,7 @@ class che_발령 extends Command\NationCommand
         $destGeneral->getLogger()->pushGeneralActionLog("<Y>{$generalName}</>에 의해 <G><b>{$destCityName}</b></>{$josaRo} 발령됐습니다. <1>$date</>");
 
         $yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']);
-        if (cutTurn($general->getTurnTime(), $this->env['turnterm']) != cutTurn($destGeneral->getTurnTime(), $this->env['turnterm'])) {
+        if (cutTurn($general->getTurnTick(), $this->env['turnterm']) != cutTurn($destGeneral->getTurnTick(), $this->env['turnterm'])) {
             $yearMonth += 1;
         }
         $destGeneral->setAuxVar('last발령', $yearMonth);

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

@@ -198,8 +198,9 @@ class che_불가침제의 extends Command\NationCommand
             $destNation['color']
         );
 
-        $now = new \DateTime($date);
-        $validUntil = new \DateTime($date);
+        $clock = \sammo\GameClock::fromStorage(\sammo\KVStorage::getStorage($db, 'game_env'));
+        $now = \DateTime::createFromImmutable($clock->tickToDateTime($general->getTurnTick()));
+        $validUntil = clone $now;
         $validMinutes = max(30, $env['turnterm'] * 3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 

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

@@ -147,8 +147,9 @@ class che_불가침파기제의 extends Command\NationCommand{
             $destNation['color']
         );
 
-        $now = new \DateTime($date);
-        $validUntil = new \DateTime($date);
+        $clock = \sammo\GameClock::fromStorage(\sammo\KVStorage::getStorage($db, 'game_env'));
+        $now = \DateTime::createFromImmutable($clock->tickToDateTime($general->getTurnTick()));
+        $validUntil = clone $now;
         $validMinutes = max(30, $env['turnterm']*3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
@@ -217,4 +218,4 @@ class che_불가침파기제의 extends Command\NationCommand{
             ],
         ];
     }
-}
+}

hwe/sammo/Command/Nation/che_종전제의.php

@@ -145,8 +145,9 @@ class che_종전제의 extends Command\NationCommand{
             $destNation['color']
         );
 
-        $now = new \DateTime($date);
-        $validUntil = new \DateTime($date);
+        $clock = \sammo\GameClock::fromStorage(\sammo\KVStorage::getStorage($db, 'game_env'));
+        $now = \DateTime::createFromImmutable($clock->tickToDateTime($general->getTurnTick()));
+        $validUntil = clone $now;
         $validMinutes = max(30, $env['turnterm']*3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
@@ -203,4 +204,4 @@ class che_종전제의 extends Command\NationCommand{
             ],
         ];
     }
-}
+}

hwe/sammo/Command/Nation/che_천도.php

@@ -137,7 +137,7 @@ class che_천도 extends Command\NationCommand
         $nationID = $general->getNationID();
         $nationStor = \sammo\KVStorage::getStorage(DB::db(), $nationID, 'nation_env');
 
-        $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];
+        $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTick()];
 
         if ($lastTurn->getCommand() != $commandName || $lastTurn->getArg() !== $this->arg) {
             $this->setResultTurn(new LastTurn(