mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-16 10:49:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed AI unit upgrading - can now 'skip' over intermediate units, the way the "promote unit" action works. #3115

Browse Source
This commit is contained in:
Yair Morgenstern
2020-09-10 19:51:14 +03:00
parent 10b0d498c6
commit 9ba9dd6fcf
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -73,11 +73,9 @@ object UnitAutomation {
} }
internal fun tryUpgradeUnit(unit: MapUnit): Boolean { internal fun tryUpgradeUnit(unit: MapUnit): Boolean {
val upgradesTo = unit.baseUnit().upgradesTo if (unit.baseUnit.upgradesTo == null) return false
if (upgradesTo == null) return false val upgradedUnit = unit.getUnitToUpgradeTo()
if (!upgradedUnit.isBuildable(unit.civInfo)) return false // for resource reasons, usually
val upgradedUnit = unit.civInfo.gameInfo.ruleSet.units.getValue(upgradesTo)
if (!upgradedUnit.isBuildable(unit.civInfo)) return false
val upgradeAction = UnitActions.getUpgradeAction(unit) val upgradeAction = UnitActions.getUpgradeAction(unit)
if (upgradeAction == null) return false if (upgradeAction == null) return false