mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 02:09:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "Unique great person is available from Great Person picker screen" bug

Browse Source
This commit is contained in:
Yair Morgenstern
2021-01-13 22:08:12 +02:00
parent a666cfa320
commit 13e79ac37c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -288,11 +288,13 @@ class CivilizationInfo {
} }
fun getEquivalentUnit(baseUnitName: String): BaseUnit { fun getEquivalentUnit(baseUnitName: String): BaseUnit {
val baseUnit = gameInfo.ruleSet.units[baseUnitName]
if (baseUnit == null) throw UncivShowableException("Unit $baseUnitName doesn't seem to exist!")
if (baseUnit.replaces != null) return getEquivalentUnit(baseUnit.replaces!!) // Equivalent of unique unit is the equivalent of the replaced unit
for (unit in gameInfo.ruleSet.units.values) for (unit in gameInfo.ruleSet.units.values)
if (unit.replaces == baseUnitName && unit.uniqueTo == civName) if (unit.replaces == baseUnitName && unit.uniqueTo == civName)
return unit return unit
val baseUnit = gameInfo.ruleSet.units[baseUnitName]
if (baseUnit == null) throw UncivShowableException("Unit $baseUnitName doesn't seem to exist!")
return baseUnit return baseUnit
} }