From 7a35388e7abe2387c406aaefd6319a8560ecc022 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 20 Feb 2025 21:28:25 +0200 Subject: [PATCH] . --- core/src/com/unciv/models/ruleset/tile/ResourceSupplyList.kt | 2 +- .../com/unciv/ui/screens/overviewscreen/ResourcesOverviewTab.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/tile/ResourceSupplyList.kt b/core/src/com/unciv/models/ruleset/tile/ResourceSupplyList.kt index 025cc2053a..0d300c11bc 100644 --- a/core/src/com/unciv/models/ruleset/tile/ResourceSupplyList.kt +++ b/core/src/com/unciv/models/ruleset/tile/ResourceSupplyList.kt @@ -25,7 +25,7 @@ class ResourceSupplyList( /** Fetch a [ResourceSupply] entry or `null` if no match found */ fun get(resource: TileResource, origin: String) = - firstOrNull { it.resource == resource && it.origin == origin } + firstOrNull { it.resource.name == resource.name && it.origin == origin } /** Get the total amount for a resource by [resourceName] */ fun sumBy(resourceName: String) = diff --git a/core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTab.kt b/core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTab.kt index 0f27c49456..d1b6d47d08 100644 --- a/core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTab.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTab.kt @@ -57,7 +57,7 @@ class ResourcesOverviewTab( private val resourceDrilldown: ResourceSupplyList = viewingPlayer.detailedCivResources private val extraDrilldown: ResourceSupplyList = getExtraDrilldown() - private val allResources = ResourceSupplyList().apply { addAll(resourceDrilldown.asSequence() + extraDrilldown.asSequence()) } + private val allResources = ResourceSupplyList().apply { add(resourceDrilldown); add(extraDrilldown) } // Order of source ResourceSupplyList: by tiles, enumerating the map in that spiral pattern // UI should not surprise player, thus we need a deterministic and guessable order