mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-08 14:57:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

tileResource unique fully replaceable by uniques

Browse Source
This commit is contained in:
yairm210
2021-09-19 20:58:17 +03:00
parent dbac2bfccb
commit aee087ec01
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/GameStarter.kt
View File

@ -209,7 +209,11 @@ object GameStarter {
.sortedByDescending { it in civNamesWithStartingLocations } ) .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<String>() val unusedMercantileResources = Stack<String>()
unusedMercantileResources.addAll(allMercantileResources.shuffled()) unusedMercantileResources.addAll(allMercantileResources.shuffled())

4
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -273,7 +273,9 @@ class Nation : INamed, ICivilopediaText, IHasUniques {
if (showResources) { if (showResources) {
val allMercantileResources = ruleset.tileResources.values 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()) { if (allMercantileResources.isNotEmpty()) {
textList += FormattedLine() textList += FormattedLine()
textList += FormattedLine("The unique luxury is one of:") textList += FormattedLine("The unique luxury is one of:")

6
core/src/com/unciv/models/ruleset/tile/TileResource.kt
View File

@ -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) textList += Belief.getCivilopediaTextMatching(name, ruleset)
return textList return textList