From b8d8e11a86adcc7a0812270d8eadea024fbf38be Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 18 Feb 2022 00:16:02 +0200 Subject: [PATCH] #6131 fixes Fixed icon and text for resource stats improvements in Improvement Civilopedia pages Fixed 'null' for improvement picker for some resource-only improvements --- .../unciv/models/ruleset/tile/TileImprovement.kt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt index 0a14c49ecf..680386ff8a 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt @@ -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>() - 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}] " } - 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")