diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt index 5faa480a8f..1980bafeb3 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -8,7 +8,7 @@ import com.unciv.models.ruleset.GlobalUniques import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.validation.UniqueValidator import com.unciv.models.stats.Stats -import com.unciv.models.translations.getConditionals +import com.unciv.models.translations.getModifiers import com.unciv.models.translations.getPlaceholderParameters import com.unciv.models.translations.getPlaceholderText import com.unciv.models.translations.removeConditionals @@ -27,7 +27,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s if (firstStatParam == null) Stats() // So badly-defined stats don't crash the entire game else Stats.parse(firstStatParam) } - val modifiers: List = text.getConditionals() + val modifiers: List = text.getModifiers() val isTimedTriggerable = hasModifier(UniqueType.ConditionalTimedUnique) diff --git a/core/src/com/unciv/models/translations/Translations.kt b/core/src/com/unciv/models/translations/Translations.kt index 7c4b7dc7c5..d170c3613c 100644 --- a/core/src/com/unciv/models/translations/Translations.kt +++ b/core/src/com/unciv/models/translations/Translations.kt @@ -380,10 +380,10 @@ private fun String.translateConditionals(hideIcons: Boolean, language: String): var translatedBaseUnique = this.removeConditionals().tr(hideIcons) - val conditionals = this.getConditionals().map { it.placeholderText } + val conditionals = this.getModifiers().map { it.placeholderText } val conditionsWithTranslation: LinkedHashMap = linkedMapOf() - for (conditional in this.getConditionals()) + for (conditional in this.getModifiers()) conditionsWithTranslation[conditional.placeholderText] = conditional.text.tr(hideIcons) val translatedConditionals: MutableList = mutableListOf() @@ -546,7 +546,7 @@ fun String.fillPlaceholders(vararg strings: String): String { return filledString } -fun String.getConditionals(): List { +fun String.getModifiers(): List { if (!this.contains('<')) return emptyList() return pointyBraceRegex.findAll(this).map { Unique(it.groups[1]!!.value) }.toList() }