From a33a161fdb52fca941614ea795dbe4c511cd9eab Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 20 Jul 2018 15:57:44 +0300 Subject: [PATCH] Unique units can now be upgraded to (e.g. archer to longbowman) - Thanks Am-per-sand! --- core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 83b61d978a..050481c25f 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -59,11 +59,11 @@ class UnitActions { } if(unit.getBaseUnit().upgradesTo!=null && tile.getOwner()==unit.civInfo) { - var upgradedUnit = GameBasics.Units[unit.getBaseUnit().upgradesTo!!]!! + var upgradedUnit = unit.getBaseUnit().getUpgradeUnit(unit.civInfo) // Go up the upgrade tree until you find the first one which isn't obsolete while (upgradedUnit.obsoleteTech!=null && unit.civInfo.tech.isResearched(upgradedUnit.obsoleteTech!!)) - upgradedUnit = GameBasics.Units[upgradedUnit.upgradesTo!!]!! + upgradedUnit = upgradedUnit.getUpgradeUnit(unit.civInfo) if (upgradedUnit.isBuildable(unit.civInfo)) { val goldCostOfUpgrade = (upgradedUnit.cost - unit.getBaseUnit().cost) * 2 + 10