From 13d50f250cb7d38516d909da7d927c3498800f1f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 22 Feb 2020 23:10:04 +0200 Subject: [PATCH] Resolved #1982 - Can now pic civ-equivalent Great People in great person picker screen --- .../unciv/ui/pickerscreens/GreatPersonPickerScreen.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt index bd369e20a5..fad22e1934 100644 --- a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt @@ -5,8 +5,8 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.GreatPersonManager import com.unciv.models.UncivSound -import com.unciv.models.translations.tr import com.unciv.models.ruleset.unit.BaseUnit +import com.unciv.models.translations.tr import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.onClick import com.unciv.ui.utils.toLabel @@ -17,8 +17,11 @@ class GreatPersonPickerScreen(val civInfo:CivilizationInfo) : PickerScreen() { init { closeButton.isVisible=false rightSideButton.setText("Choose a free great person".tr()) - for (unit in civInfo.gameInfo.ruleSet.units.values - .filter { it.name in GreatPersonManager().statToGreatPersonMapping.values || it.name == "Great General"}) + + val greatPersonNames = GreatPersonManager().statToGreatPersonMapping.values + .union(listOf("Great General")) + val greatPersonUnits = greatPersonNames.map { civInfo.getEquivalentUnit(it) } + for (unit in greatPersonUnits) { val button = Button(skin)