lbonus를TriggerGeneralLevel, calcLeadershipBonus로통합

hwe/sammo/General.php

@@ -46,7 +46,6 @@ class General implements iAction{
         //TODO:  밖에서 가져오도록 하면 버그 확률이 높아짐. 필요한 raw 값을 직접 구해야함.
 
         $staticNation = getNationStaticInfo($raw['nation']);
-        setLeadershipBonus($raw, $staticNation['level']);
         $this->raw = $raw;
         $this->rawCity = $city;
 
@@ -67,7 +66,7 @@ class General implements iAction{
 
         $nationTypeClass = getNationTypeClass($staticNation['type']);
         $this->nationType = new $nationTypeClass;
-        $this->levelObj = new TriggerGeneralLevel($this->raw, $city);
+        $this->levelObj = new TriggerGeneralLevel($this->raw, $staticNation['level'], $city);
 
         $specialDomesticClass = getGeneralSpecialDomesticClass($raw['special']);
         $this->specialDomesticObj = new $specialDomesticClass;