From 36baea925042cadc7cf9ee208af7386579cf3ef2 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 25 Jan 2024 19:07:14 +0200 Subject: [PATCH] 'not shown on world screen' unique accepts civ conditionals --- .../screens/worldscreen/topbar/WorldScreenTopBarResources.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/screens/worldscreen/topbar/WorldScreenTopBarResources.kt b/core/src/com/unciv/ui/screens/worldscreen/topbar/WorldScreenTopBarResources.kt index 9f30a63a52..e69bd6da78 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/topbar/WorldScreenTopBarResources.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/topbar/WorldScreenTopBarResources.kt @@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileResource +import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.ui.components.MayaCalendar import com.unciv.ui.components.YearTextUtil @@ -91,7 +92,7 @@ internal class WorldScreenTopBarResources(topbar: WorldScreenTopBar) : ScalingTa for ((index, resourceActors) in resourceActors.withIndex()) { val (resource, label, icon) = resourceActors - if (resource.hasUnique(UniqueType.NotShownOnWorldScreen)) continue + if (resource.hasUnique(UniqueType.NotShownOnWorldScreen, StateForConditionals(civInfo))) continue val amount = civResources[resource.name] ?: 0