버그 수정

hwe/sammo/General.php

@@ -159,7 +159,7 @@ class General implements iAction{
     }
 
     function setRawCity(?array $city){
-        $this->city = $city;
+        $this->rawCity = $city;
     }
 
     function getCityID():int{
@@ -401,7 +401,7 @@ class General implements iAction{
                 continue;
             }
             /** @var iAction $iObj */
-            $value = $iObj->onCalcDomestic($turnType, $varType, $value);
+            $value = $iObj->onCalcDomestic($turnType, $varType, $value, $aux);
         }
         return $value;
     }
@@ -550,7 +550,7 @@ class General implements iAction{
             'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'belong',
             'personal', 'special', 'special2', 'mode', 'npc', 'npc_org', 'deadyear', 'npcmsg',
             'dex0', 'dex10', 'dex20', 'dex30', 'dex40', 
-            'warnum', 'killnum', 'deathnum', 'killcrew', 'deathcrew', 'recwar', 'last_turn'
+            'warnum', 'killnum', 'deathnum', 'killcrew', 'deathcrew', 'recwar', 'last_turn', 'myset'
         ];
 
         if($column === null){

hwe/sammo/GeneralAI.php

@@ -44,7 +44,7 @@ class GeneralAI{
     public function __construct(General $general){
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
-        $this->env = $gameStor->getValues(['startyear','year','month','turnterm','killturn','scenario','gold_rate','rice_rate']);
+        $this->env = $gameStor->getValues(['startyear','year','month','turnterm','killturn','scenario','gold_rate','rice_rate', 'develcost']);
         $this->baseDevelCost = $this->env['develcost'] * 12;
         $this->general = $general;
         if($general->getRawCity() === null){
@@ -1051,7 +1051,7 @@ class GeneralAI{
                 break;
             case '이동': //이동
                 
-                $paths = array_keys(CityConst::byID($city['city'])::$path);
+                $paths = array_keys(CityConst::byID($city['city'])->path);
                 $command = 'che_이동';
                 $arg = ['destCityID'=>Util::choiceRandom($paths)];
                 break;

hwe/sammo/TurnExecutionHelper.php

@@ -233,7 +233,7 @@ WHERE turntime < %s ORDER BY turntime ASC, `no` ASC',
             if($general->getVar('nation') != 0 && $general->getVar('level') >= 5){
                 $nationStor = KVStorage::getStorage($db, 'nation_env');
                 $lastNationTurnKey = "turn_last_{$general->getVar('nation')}_{$general->getVar('level')}";
-                $lastNationTurn = $nationStor->getDBValue($lastNationTurnKey)??[];
+                $lastNationTurn = $nationStor->getValue($lastNationTurnKey)??[];
                 //수뇌 몇 없는데 매번 left join 하는건 낭비인것 같다.
                 $rawNationTurn = Json::decode($db->queryFirstRow(
                     'SELECT action, arg FROM nation_turn WHERE nation_id = %i AND level = %i AND turn_idx =0',