From 6b99b1117991a854be23b12d9da2c86975240e2c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 17 Apr 2022 13:22:47 +0300 Subject: [PATCH] Resolved #6527 - replacementTextForUniques activates for units when picking nations --- core/src/com/unciv/models/ruleset/Nation.kt | 6 ++++-- core/src/com/unciv/models/ruleset/unit/BaseUnit.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt index 79e5392b7b..86cc518eee 100644 --- a/core/src/com/unciv/models/ruleset/Nation.kt +++ b/core/src/com/unciv/models/ruleset/Nation.kt @@ -248,8 +248,10 @@ class Nation : RulesetObject() { // This does not use the auto-linking FormattedLine(Unique) for two reasons: // would look a little chaotic as unit uniques unlike most uniques are a HashSet and thus do not preserve order // No .copy() factory on FormattedLine and no FormattedLine(Unique, all other val's) constructor either - for (unique in unit.uniqueObjects.filterNot { it.text in originalUnit.uniques || it.hasFlag(UniqueFlag.HiddenToUsers) }) { - + if (unit.replacementTextForUniques.isNotEmpty()){ + yield(FormattedLine(unit.replacementTextForUniques)) + } + else for (unique in unit.uniqueObjects.filterNot { it.text in originalUnit.uniques || it.hasFlag(UniqueFlag.HiddenToUsers) }) { yield(FormattedLine(unique.text.tr(), indent = 1)) } for (unique in originalUnit.uniqueObjects.filterNot { it.text in unit.uniques || it.hasFlag(UniqueFlag.HiddenToUsers) }) { diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index 7401323acc..a34261bc19 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -40,7 +40,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction { override fun getUniqueTarget() = UniqueTarget.Unit - private var replacementTextForUniques = "" + var replacementTextForUniques = "" var promotions = HashSet() var obsoleteTech: String? = null var upgradesTo: String? = null