AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 21:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mods with no policy branches don't crash when clicking on culture icon

Browse Source
This commit is contained in:
Yair Morgenstern 2024-02-27 23:37:54 +02:00
parent 9054d84626
commit ce8a7e9e3e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/ui/screens/worldscreen/topbar/WorldScreenTopBarStats.kt
View File

@ -51,10 +51,11 @@ internal class WorldScreenTopBarStats(topbar: WorldScreenTopBar) : ScalingTableW
isTransform = false isTransform = false
fun addStat(label: Label, icon: String, isLast: Boolean = false, screenFactory: ()-> BaseScreen) { fun addStat(label: Label, icon: String, isLast: Boolean = false, screenFactory: ()-> BaseScreen?) {
val image = ImageGetter.getStatIcon(icon) val image = ImageGetter.getStatIcon(icon)
val action = { val action = {
worldScreen.game.pushScreen(screenFactory()) val screen = screenFactory()
if (screen != null) worldScreen.game.pushScreen(screen)
} }
label.onClick(action) label.onClick(action)
image.onClick(action) image.onClick(action)
@ -79,7 +80,10 @@ internal class WorldScreenTopBarStats(topbar: WorldScreenTopBar) : ScalingTableW
happinessContainer.onClick(invokeResourcesPage) happinessContainer.onClick(invokeResourcesPage)
happinessLabel.onClick(invokeResourcesPage) happinessLabel.onClick(invokeResourcesPage)
addStat(cultureLabel, "Culture") { PolicyPickerScreen(worldScreen.selectedCiv, worldScreen.canChangeState) } addStat(cultureLabel, "Culture") {
if (worldScreen.gameInfo.ruleset.policyBranches.isEmpty()) null
else PolicyPickerScreen(worldScreen.selectedCiv, worldScreen.canChangeState)
}
if (worldScreen.gameInfo.isReligionEnabled()) { if (worldScreen.gameInfo.isReligionEnabled()) {
addStat(faithLabel, "Faith", EmpireOverviewCategories.Religion, isLast = true) addStat(faithLabel, "Faith", EmpireOverviewCategories.Religion, isLast = true)
} else { } else {