Merge branch 'devel' into stat_cache_fix

Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/247

hwe/sammo/API/General/BuildNationCandidate.php

@@ -90,6 +90,9 @@ class BuildNationCandidate extends \sammo\BaseAPI
       return '거병을 실패했습니다.';
     }
 
+    $general->setVar('killturn', $env['killturn']);
+    $general->applyDB($db);
+
     return null;
   }
 }

hwe/sammo/General.php

@@ -365,14 +365,14 @@ class General extends GeneralBase implements iAction
             }
         }
 
-        $this->calcCache[$cKey] = $statValue;
-
         $statValue = Util::clamp($statValue, 0, GameConst::$maxLevel);
 
         if ($useFloor) {
             return Util::toInt($statValue);
         }
 
+        $this->calcCache[$cKey] = $statValue;
+        
         return $statValue;
     }
 

hwe/sammo/GeneralAI.php

@@ -3439,8 +3439,12 @@ class GeneralAI
 
         $cmd = buildGeneralCommandClass($this->rng->choice($candidate), $this->general, $this->env);
         if (!$cmd->hasFullConditionMet()) {
-            return buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
+            $cmd = buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
+            if (!$cmd->hasFullConditionMet()) {
+                $cmd = buildGeneralCommandClass('che_견문', $this->general, $this->env);
             }
+        }
+
         return $cmd;
     }