diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt index 792a532858..607462080e 100644 --- a/core/src/com/unciv/logic/GameStarter.kt +++ b/core/src/com/unciv/logic/GameStarter.kt @@ -209,7 +209,11 @@ object GameStarter { .sortedByDescending { it in civNamesWithStartingLocations } ) - val allMercantileResources = ruleset.tileResources.values.filter { it.unique == "Can only be created by Mercantile City-States" }.map { it.name } + val allMercantileResources = ruleset.tileResources.values.filter { + it.unique == "Can only be created by Mercantile City-States" // Deprecated as of 3.16.16 + || it.uniques.contains("Can only be created by Mercantile City-States") }.map { it.name } + + val unusedMercantileResources = Stack() unusedMercantileResources.addAll(allMercantileResources.shuffled()) diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt index 61c084e744..088bbfa772 100644 --- a/core/src/com/unciv/models/ruleset/Nation.kt +++ b/core/src/com/unciv/models/ruleset/Nation.kt @@ -273,7 +273,9 @@ class Nation : INamed, ICivilopediaText, IHasUniques { if (showResources) { val allMercantileResources = ruleset.tileResources.values - .filter { it.unique == "Can only be created by Mercantile City-States" } + .filter { it.unique == "Can only be created by Mercantile City-States" // Deprecated 3.16.16 + || it.uniques.contains("Can only be created by Mercantile City-States") } + if (allMercantileResources.isNotEmpty()) { textList += FormattedLine() textList += FormattedLine("The unique luxury is one of:") diff --git a/core/src/com/unciv/models/ruleset/tile/TileResource.kt b/core/src/com/unciv/models/ruleset/tile/TileResource.kt index 34acc23d4d..84dd409625 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileResource.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileResource.kt @@ -84,12 +84,6 @@ class TileResource : NamedStats(), ICivilopediaText, IHasUniques { } } - if (unique != null) { - textList += FormattedLine() - // Marble's unique is not parameterized, so the detour through the object is only useful for mods - textList += FormattedLine(Unique(unique!!)) - } - textList += Belief.getCivilopediaTextMatching(name, ruleset) return textList