mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 11:28:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

#6131 fixes

Browse Source 
Fixed icon and text for resource stats improvements in Improvement Civilopedia pages
Fixed 'null' for improvement picker for some resource-only improvements
This commit is contained in:
Yair Morgenstern 2022-02-18 00:16:02 +02:00
parent 1e6b0e248c
commit b8d8e11a86
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/models/ruleset/tile/TileImprovement.kt
View File

@ -46,20 +46,14 @@ class TileImprovement : RulesetStatsObject() {
}
lines += "Can be built on".tr() + terrainsCanBeBuiltOnString.joinToString(", ", " ") //language can be changed when setting changes.
}
val statsToResourceNames = HashMap<String, ArrayList<String>>()
for (tr: TileResource in ruleset.tileResources.values.filter { it.improvement == name }) {
val statsString = tr.improvementStats.toString()
if (!statsToResourceNames.containsKey(statsString))
statsToResourceNames[statsString] = ArrayList()
statsToResourceNames[statsString]!!.add(tr.name.tr())
for (resource: TileResource in ruleset.tileResources.values.filter { it.improvement == name }) {
if (resource.improvementStats == null) continue
val statsString = resource.improvementStats.toString()
lines += "[${statsString}] <in [${resource.name}] tiles>"
}
statsToResourceNames.forEach {
lines += "{${it.key}} {for} ".tr() + it.value.joinToString(", ")
}
if (techRequired != null) lines += "Required tech: [$techRequired]".tr()
for(unique in uniques)
for (unique in uniques)
lines += unique.tr()
return lines.joinToString("\n")