버그 수정

hwe/sammo/Command/Nation/che_포상.php

@@ -151,7 +151,7 @@ class che_포상 extends Command\NationCommand{
         ], 'nation=%i', $nationID);
 
         $destGeneral->getLogger()->pushGeneralActionLog("{$resName} <C>{$amountText}</>을 포상으로 받았습니다.", ActionLogger::PLAIN);
-        $logger->pushGeneralActionLog("{$destGeneral->getName()}에게 {$resName} <C>$amountText</>을 수여했습니다. <1>$date</>");
+        $logger->pushGeneralActionLog("<Y>{$destGeneral->getName()}</>에게 {$resName} <C>$amountText</>을 수여했습니다. <1>$date</>");
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->applyDB($db);

hwe/sammo/GeneralAI.php

@@ -1575,10 +1575,20 @@ class GeneralAI
             $avgRice += $general->getVar('rice');
             $genCnt += 1;
         }
-        foreach($this->userWarGenerals as $general){
+        foreach($this->npcCivilGenerals as $general){
             $avgGold += $general->getVar('gold');
             $avgRice += $general->getVar('rice');
-            $genCnt += 2;
+            $genCnt += 1;
+        }
+        foreach($this->userWarGenerals as $general){
+            $avgGold += $general->getVar('gold') / 2;
+            $avgRice += $general->getVar('rice') / 2;
+            $genCnt += 1;
+        }
+        foreach($this->userCivilGenerals as $general){
+            $avgGold += $general->getVar('gold') / 2;
+            $avgRice += $general->getVar('rice') / 2;
+            $genCnt += 1;
         }
         $avgGold += $nation['gold'];
         $avgRice += $nation['rice'];