From 5941beba26898d023a37670540e650153a8a9b7f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 5 Jan 2023 13:13:52 +0200 Subject: [PATCH] Non-replacing buildings display uniques nicely in nation picker --- core/src/com/unciv/models/ruleset/Building.kt | 5 +++-- core/src/com/unciv/models/ruleset/Nation.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 8a25d613db..e9598851a7 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -62,7 +62,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction { private var replacementTextForUniques = "" /** Used for AlertType.WonderBuilt, and as sub-text in Nation and Tech descriptions */ - fun getShortDescription(): String { // should fit in one line + fun getShortDescription(multiline:Boolean = false): String { val infoList = mutableListOf() this.clone().toString().also { if (it.isNotEmpty()) infoList += it } for ((key, value) in getStatPercentageBonuses(null)) @@ -76,7 +76,8 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction { } if (cityStrength != 0) infoList += "{City strength} +$cityStrength" if (cityHealth != 0) infoList += "{City health} +$cityHealth" - return infoList.joinToString("; ") { it.tr() } + val separator = if (multiline) "\n" else "; " + return infoList.joinToString(separator) { it.tr() } } /** diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt index ca07d09790..9a106643e9 100644 --- a/core/src/com/unciv/models/ruleset/Nation.kt +++ b/core/src/com/unciv/models/ruleset/Nation.kt @@ -210,7 +210,7 @@ class Nation : RulesetObject() { } else if (building.replaces != null) { yield(FormattedLine("Replaces [${building.replaces}], which is not found in the ruleset!", indent=1)) } else { - yield(FormattedLine(building.getShortDescription(), indent=1)) + yield(FormattedLine(building.getShortDescription(true), indent=1)) } } }