diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt index 36bd16efb3..24ea8efb3b 100644 --- a/core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt +++ b/core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt @@ -23,6 +23,7 @@ import com.unciv.ui.utils.extensions.darken import com.unciv.ui.utils.extensions.disable import com.unciv.ui.utils.extensions.onClick import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.utils.Log class ConstructionInfoTable(val cityScreen: CityScreen): Table() { private val selectedConstructionTable = Table() @@ -62,8 +63,8 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() { pad(10f) add(ImageGetter.getPortraitImage(construction.name, 50f).apply { - val link = (construction as? IRulesetObject)?.makeLink() ?: return - if (link.isEmpty()) return + val link = (construction as? IRulesetObject)?.makeLink() ?: return@apply + if (link.isEmpty()) return@apply touchable = Touchable.enabled this.onClick { UncivGame.Current.pushScreen(CivilopediaScreen(city.getRuleset(), link = link)) @@ -82,6 +83,7 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() { is BaseUnit -> construction.getDescription(city) is Building -> construction.getDescription(city, true) is PerpetualStatConversion -> construction.description.replace("[rate]", "[${construction.getConversionRate(city)}]").tr() + is PerpetualConstruction -> construction.description else -> "" // Should never happen } diff --git a/core/src/com/unciv/ui/images/ImageGetter.kt b/core/src/com/unciv/ui/images/ImageGetter.kt index 4a62a9e67c..917dc7003b 100644 --- a/core/src/com/unciv/ui/images/ImageGetter.kt +++ b/core/src/com/unciv/ui/images/ImageGetter.kt @@ -273,7 +273,7 @@ object ImageGetter { } else getUnitIcon(construction).surroundWithCircle(size).surroundWithThinCircle() } - if (construction in PerpetualConstruction.perpetualConstructionsMap) + if (PerpetualConstruction.perpetualConstructionsMap.containsKey(construction)) return getImage("OtherIcons/Convert$construction").toGroup(size) return getStatIcon(construction).surroundWithCircle(size).surroundWithThinCircle() }