버그 수정

hwe/func_gamerule.php

@@ -1163,7 +1163,7 @@ function checkStatistic() {
 
     $crewtypeHistsStr = join(', ', array_map(function($histPair){
         [$histKey, $cnt] = $histPair;
-        return GameUnitConst::byID($hisKey)->getShortName().'('.$cnt.')';
+        return GameUnitConst::byID($histKey)->getShortName().'('.$cnt.')';
     }, Util::convertDictToArray($crewtypeHists)));
     
     $db->insert('statistic', [

hwe/func_template.php

@@ -88,9 +88,8 @@ function displaySpecialDomesticInfo(?string $type):string{
     ]);
 }
 
-function displayItemInfo(?int $type):string{
+function displayItemInfo(?string $type):string{
-    $info = getItemInfo($type);
+    [$text, $info] = getItemInfo($type);
-    $text = getItemName($type);
 
     $templates = new \League\Plates\Engine(__dir__.'/templates');
 

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

@@ -36,7 +36,7 @@ class che_기술연구 extends che_상업투자{
         $general = $this->generalObj;
 
         $this->setCity();
-        $this->setNation();
+        $this->setNation(['tech']);
         
         [$reqGold, $reqRice] = $this->getCost();
 

hwe/sammo/General.php

@@ -252,7 +252,7 @@ class General implements iAction{
     }
 
     function getLeadership($withInjury = true, $withItem = true, $withStatAdjust = true, $useFloor = true):float{
-        return $this->getStatValue('leadership', $withInjury, $withItem, $withStatAdjust, $useFloor);
+        return $this->getStatValue('leader', $withInjury, $withItem, $withStatAdjust, $useFloor);
     }
 
     function getPower($withInjury = true, $withItem = true, $withStatAdjust = true, $useFloor = true):float{

hwe/sammo/GeneralAI.php

@@ -147,7 +147,11 @@ class GeneralAI{
             $this->dipState = self::d직전;
         }
 
-        if(in_array($this->dipState, [self::d평화, self::d선포]) && $env['startyear'] + 2 == $env['year'] && $env['month'] > 5){
+        if(
+            in_array($this->dipState, [self::d평화, self::d선포]) ||
+            $env['year'] >= $env['startyear'] + 3 ||
+            ($env['year'] && $env['startyear'] + 2 && $env['month'] > 5)
+        ){
             $this->dipState = self::d징병;
         }
 
@@ -881,7 +885,7 @@ class GeneralAI{
                 if($nationGeneral->rice < 700 * $tech){
                     continue;
                 }
-                if($generalCity->front){
+                if($generalCity['front']){
                     continue;
                 }
                 if($nationGeneral->train * $nationGeneral->atmos < 75 * 75){