Compare commits

..

No commits in common. "master" and "4.15.12" have entirely different histories.

2 changed files with 6 additions and 5 deletions

View File

@ -96,7 +96,9 @@ class ResourceSupplyList(
*/
fun removeAll(origin: String): ResourceSupplyList {
// The filter creates a separate list so the iteration does not modify concurrently
filter { it.origin == origin }.forEach { remove(it) }
filter { it.origin == origin }.forEach {
remove(it)
}
return this
}

View File

@ -12,7 +12,6 @@ import com.unciv.logic.trade.TradeOfferType
import com.unciv.models.ruleset.tile.ResourceSupplyList
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.tile.TileResource
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr
import com.unciv.ui.components.UncivTooltip.Companion.addTooltip
import com.unciv.ui.components.extensions.addSeparator
@ -57,13 +56,13 @@ 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 drilldownSequence = resourceDrilldown.asSequence() + extraDrilldown.asSequence()
// 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
private val resources: List<TileResource> = allResources.asSequence()
private val resources: List<TileResource> = drilldownSequence
.map { it.resource }
.filter { it.resourceType != ResourceType.Bonus && !it.hasUnique(UniqueType.NotShownOnWorldScreen) }
.filter { it.resourceType != ResourceType.Bonus }
.distinct()
.sortedWith(
compareBy<TileResource> { it.resourceType }