From 5ab802b776784db3e966a4ebc0925fbdb9b0a78f Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 31 Oct 2021 23:00:02 +0200 Subject: [PATCH] Last untyped unique that could affect getTileStats performance --- core/src/com/unciv/logic/map/TileInfo.kt | 2 +- core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index caaacb4460..f615785e13 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -279,7 +279,7 @@ open class TileInfo { } } - for (unique in city.getMatchingUniques("[] from [] tiles without [] []")) + for (unique in city.getMatchingUniques(UniqueType.StatsFromTilesWithout)) if ( matchesTerrainFilter(unique.params[1]) && !matchesTerrainFilter(unique.params[2]) && diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index a3a0ca9dec..c3fff72caa 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -75,6 +75,7 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) { StatsSpendingGreatPeople("[stats] whenever a Great Person is expended", UniqueTarget.Global), StatsFromTiles("[stats] from [tileFilter] tiles [cityFilter]", UniqueTarget.Global), + StatsFromTilesWithout("[stats] from [tileFilter] tiles without [tileFilter] [cityFilter]", UniqueTarget.Global), // This is a doozy StatsFromObject("[stats] from every [tileFilter/specialist/buildingName]", UniqueTarget.Global, UniqueTarget.FollowerBelief),