fix: 지급률 계산식에서 부대장이 포함되는 버그 수정
This commit is contained in:
@@ -4100,7 +4100,10 @@ class GeneralAI
|
|||||||
|
|
||||||
$dedicationList = array_map(function (General $general) {
|
$dedicationList = array_map(function (General $general) {
|
||||||
return $general->getRaw();
|
return $general->getRaw();
|
||||||
}, $nationGenerals);
|
}, array_filter($this->nationGenerals, function (General $rawGeneral) {
|
||||||
|
return $rawGeneral->getVar('npc') != 5;
|
||||||
|
}));
|
||||||
|
|
||||||
|
|
||||||
$goldIncome = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
|
$goldIncome = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
|
||||||
$warIncome = getWarGoldIncome($nation['type'], $cityList);
|
$warIncome = getWarGoldIncome($nation['type'], $cityList);
|
||||||
@@ -4144,7 +4147,9 @@ class GeneralAI
|
|||||||
|
|
||||||
$dedicationList = array_map(function (General $general) {
|
$dedicationList = array_map(function (General $general) {
|
||||||
return $general->getRaw();
|
return $general->getRaw();
|
||||||
}, $nationGenerals);
|
}, array_filter($this->nationGenerals, function (General $rawGeneral) {
|
||||||
|
return $rawGeneral->getVar('npc') != 5;
|
||||||
|
}));
|
||||||
|
|
||||||
$riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
|
$riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
|
||||||
$wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
|
$wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
|
||||||
|
|||||||
Reference in New Issue
Block a user