AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #586 - units now upgrade to the most recent upgrade, not to the next possible one

Browse Source
This commit is contained in:
Yair Morgenstern 2019-03-17 23:10:11 +02:00
parent f1f3753231
commit c33b0a67fe
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -214,12 +214,12 @@ class MapUnit {
} }
fun getUnitToUpgradeTo(): BaseUnit { fun getUnitToUpgradeTo(): BaseUnit {
var upgradedUnit = baseUnit().getUpgradeUnit(civInfo) var unit = baseUnit()
// Go up the upgrade tree until you find the first one which isn't obsolete // Go up the upgrade tree until you find the last one which is buildable
while (upgradedUnit.obsoleteTech!=null && civInfo.tech.isResearched(upgradedUnit.obsoleteTech!!)) while (unit.upgradesTo!=null && civInfo.tech.isResearched(unit.getDirectUpgradeUnit(civInfo).requiredTech!!))
upgradedUnit = upgradedUnit.getUpgradeUnit(civInfo) unit = unit.getDirectUpgradeUnit(civInfo)
return upgradedUnit return unit
} }
fun canUpgrade(): Boolean { fun canUpgrade(): Boolean {

2
core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
View File

@ -138,7 +138,7 @@ class BaseUnit : INamed, IConstruction, ICivilopedia {
unit.promotions.addPromotion("Drill I", isFree = true) unit.promotions.addPromotion("Drill I", isFree = true)
} }
fun getUpgradeUnit(civInfo: CivilizationInfo):BaseUnit{ fun getDirectUpgradeUnit(civInfo: CivilizationInfo):BaseUnit{
val uniqueUnitReplacesUpgrade: BaseUnit? = GameBasics.Units.values val uniqueUnitReplacesUpgrade: BaseUnit? = GameBasics.Units.values
.firstOrNull{it.uniqueTo==civInfo.civName && it.replaces == upgradesTo} .firstOrNull{it.uniqueTo==civInfo.civName && it.replaces == upgradesTo}
if(uniqueUnitReplacesUpgrade!=null) return uniqueUnitReplacesUpgrade if(uniqueUnitReplacesUpgrade!=null) return uniqueUnitReplacesUpgrade