물자조달 턴 추가 기타 커맨드 버그 수정

hwe/sammo/Command/General/che_상업투자.php

@@ -5,18 +5,20 @@ use \sammo\{
     DB, Util, JosaUtil,
     General, 
     ActionLogger,
-    getGeneralLeadership,getGeneralPower,getGeneralIntel,
+    GameConst,
+    LastTurn,
+    GameUnitConst,
+    Command
+};
+
+use function \sammo\{
     getDomesticExpLevelBonus,
-    CriticalRatioDomestic, CriticalScore,
-    uniqueItemEx,
-    LastTurn
+    CriticalRatioDomestic, 
+    CriticalScoreEx,
+    uniqueItemEx
 };
 
-use \sammo\Command;
 use \sammo\Constraint\Constraint;
-use function sammo\CriticalScore;
-use function sammo\uniqueItemEx;
-use function sammo\getGeneralLeadership;
 
 
 class che_상업투자 extends Command\GeneralCommand{
@@ -74,20 +76,20 @@ class che_상업투자 extends Command\GeneralCommand{
         $general = $this->generalObj;
 
         if(static::$statKey == 'intel'){
-            $score = getGeneralIntel($general->getRaw(), true, true, true, false);
+            $score = $general->getIntel(true, true, true, false);
         }
         else if(static::$statKey == 'power'){
-            $score = getGeneralPower($general->getRaw(), true, true, true, false);
+            $score = $general->getPower(true, true, true, false);
         }
         else if(static::$statKey == 'leader'){
-            $score = getGeneralLeadership($general->getRaw(), true, true, true, false);
+            $score = $general->getLeadership(true, true, true, false);
         }
         else{
             throw new \sammo\MustNotBeReachedException();
         }
         
         $score *= $trust / 100;
-        $score *= getDomesticExpLevelBonus($general['explevel']);
+        $score *= getDomesticExpLevelBonus($general->getVar('explevel'));
         $score *= Util::randRange(0.8, 1.2);
         $score = $general->onCalcDomestic(static::$actionKey, 'score', $score);