fix: 비쟁장에 쟁장 공식이 섞여서, 최소 포상 금쌀이 꼬이는 문제 수정
This commit is contained in:
@@ -1321,17 +1321,15 @@ class GeneralAI
|
||||
}
|
||||
|
||||
if ($isWarGeneral) {
|
||||
$reqHumanMinRes = $reqHumanMinWarRes;
|
||||
} else {
|
||||
$reqHumanMinRes = $reqHumanMinDevelRes;
|
||||
}
|
||||
|
||||
$crewtype = $targetUserGeneral->getCrewTypeObj();
|
||||
$reqMoney = $crewtype->costWithTech($this->nation['tech'], Util::toInt($targetUserGeneral->getLeadership(false))) * 100 * 6 * 1.1;
|
||||
if ($this->env['year'] > $this->env['startyear'] + 3) {
|
||||
$reqMoney = max($reqMoney, $reqHumanMinRes);
|
||||
$reqMoney = max($reqMoney, $reqHumanMinWarRes);
|
||||
}
|
||||
$enoughMoney = $reqMoney * 1.2;
|
||||
} else {
|
||||
$enoughMoney = $reqHumanMinDevelRes * 1.2;
|
||||
}
|
||||
|
||||
if ($targetUserGeneral->getVar($resName) >= $reqMoney) {
|
||||
continue;
|
||||
@@ -3090,8 +3088,7 @@ class GeneralAI
|
||||
|
||||
if ($movingTargetCityID === $currCityID) {
|
||||
$movingTargetCityID = null;
|
||||
}
|
||||
else if(key_exists($movingTargetCityID, $occupiedCities)){
|
||||
} else if (key_exists($movingTargetCityID, $occupiedCities)) {
|
||||
$movingTargetCityID = null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user