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

Avoid crash if "Only available" unique in policy branch has 2 or more params (#10815)

Browse Source 
* Unnecessary linting: for instead of foreach

* Avoid crash if "Only available" unique in policy branch has 2 params

* rename
This commit is contained in:
SeventhM
2023-12-28 12:41:24 -08:00
committed by GitHub
parent e823d82471
commit 4ba4eb6e20
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/com/unciv/ui/screens/pickerscreens/PolicyPickerScreen.kt
View File

@ -15,7 +15,6 @@ import com.unciv.models.ruleset.Policy
import com.unciv.models.ruleset.Policy.PolicyBranchType
import com.unciv.models.ruleset.PolicyBranch
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.fillPlaceholders
import com.unciv.models.translations.tr
import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.center
@ -301,23 +300,12 @@ class PolicyPickerScreen(
label.wrap = true
labelTable.add(label).pad(7f, 20f, 10f, 20f).grow().row()
val conditionals = LinkedHashMap<UniqueType, ArrayList<String>>()
branch.uniqueMap[UniqueType.OnlyAvailableWhen.text]?.forEach { unique ->
unique.conditionals.forEach {
if (it.type != null) {
if (conditionals[it.type] == null)
conditionals[it.type] = ArrayList()
conditionals[it.type]!!.add(it.params.toString().tr())
}
}
}
if (conditionals.isNotEmpty()) {
if (branch.uniqueMap.getUniques(UniqueType.OnlyAvailableWhen).any()) {
var warning = UniqueType.OnlyAvailableWhen.text.tr() + ":\n"
for ((k, v) in conditionals) {
warning += "• " + k.text.fillPlaceholders(v.joinToString()).tr() + "\n"
}
for (unique in branch.uniqueMap.getUniques(UniqueType.OnlyAvailableWhen))
for (conditional in unique.conditionals) {
warning += "• " + conditional.text.tr() + "\n"
}
val warningLabel = ColorMarkupLabel(warning, Color.RED, fontSize = 13)
warningLabel.setAlignment(Align.topLeft)
warningLabel.wrap = true