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

Fixed PolicyScreen branches requirements text (#8280)

Browse Source 
* Fixed PolicyScreen branches requirements text

* Generify conditionals text pattern

* Remove GlobalAlert uniques from displaying in Policy descriptions

* Fix translations

* Fix freeze on "Tiny" displays

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95 2023-01-02 17:48:11 +01:00 committed by GitHub
parent ec50729767
commit 72eb9504b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/template.properties
View File

@ -1439,6 +1439,7 @@ Completed =
On adoption = On adoption =
On completion = On completion =
Cannot be adopted together with = Cannot be adopted together with =
Cannot be adopted before =
Adopt policy = Adopt policy =
Adopt free policy = Adopt free policy =
Unlocked at = Unlocked at =

7
core/src/com/unciv/models/ruleset/Policy.kt
View File

@ -4,8 +4,10 @@ import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueFlag
import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueTarget
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.getPlaceholderText
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.FormattedLine import com.unciv.ui.civilopedia.FormattedLine
import com.unciv.utils.Log
open class Policy : RulesetObject() { open class Policy : RulesetObject() {
lateinit var branch: PolicyBranch // not in json - added in gameBasics lateinit var branch: PolicyBranch // not in json - added in gameBasics
@ -34,7 +36,10 @@ open class Policy : RulesetObject() {
/** Used in PolicyPickerScreen to display Policy properties */ /** Used in PolicyPickerScreen to display Policy properties */
fun getDescription(): String { fun getDescription(): String {
var text = uniques var text = uniques
.filter { !it.contains(UniqueType.OnlyAvailableWhen.text) } .filter {
!it.getPlaceholderText().contains(UniqueType.OnlyAvailableWhen.placeholderText) &&
!it.getPlaceholderText().contains(UniqueType.OneTimeGlobalAlert.placeholderText)
}
.joinToString("\n", transform = { "• ${it.tr()}" }) .joinToString("\n", transform = { "• ${it.tr()}" })
if (policyBranchType != PolicyBranchType.BranchStart if (policyBranchType != PolicyBranchType.BranchStart
&& policyBranchType != PolicyBranchType.BranchComplete) && policyBranchType != PolicyBranchType.BranchComplete)

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

@ -15,6 +15,7 @@ import com.unciv.models.ruleset.Policy
import com.unciv.models.ruleset.Policy.PolicyBranchType import com.unciv.models.ruleset.Policy.PolicyBranchType
import com.unciv.models.ruleset.PolicyBranch import com.unciv.models.ruleset.PolicyBranch
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.fillPlaceholders
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popup.ConfirmPopup import com.unciv.ui.popup.ConfirmPopup
@ -219,6 +220,8 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: CivilizationInfo
if (numBranchesY > 1.5f) { if (numBranchesY > 1.5f) {
val numRows = if (numBranchesY < 2.9f) 2 else (numBranchesY + 0.1f).toInt() val numRows = if (numBranchesY < 2.9f) 2 else (numBranchesY + 0.1f).toInt()
rowChangeCount = (branches.size + numRows - 1) / numRows rowChangeCount = (branches.size + numRows - 1) / numRows
} else {
rowChangeCount = branches.size
} }
@ -323,17 +326,28 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: CivilizationInfo
label.wrap = true label.wrap = true
labelTable.add(label).pad(7f,20f, 10f, 20f).grow().row() labelTable.add(label).pad(7f,20f, 10f, 20f).grow().row()
val exclusive = ArrayList<String>() val conditionals = LinkedHashMap<UniqueType, ArrayList<String>>()
branch.uniqueMap[UniqueType.OnlyAvailableWhen.text]?.forEach { branch.uniqueMap[UniqueType.OnlyAvailableWhen.text]?.forEach {
it.conditionals.forEach { exclusive += it.params.toString().tr() } it.conditionals.forEach {
if (it.type != null) {
if (conditionals[it.type] == null)
conditionals[it.type] = ArrayList()
conditionals[it.type]!!.add(it.params.toString().tr())
}
}
} }
if (exclusive.isNotEmpty()) { if (conditionals.isNotEmpty()) {
val forbidden = ("{Cannot be adopted together with} " + exclusive.joinToString()).toLabel(Color.RED, 13) var warning = UniqueType.OnlyAvailableWhen.text.tr() + ":\n"
forbidden.setFillParent(false) for ((k, v) in conditionals) {
forbidden.setAlignment(Align.topLeft) warning += "• " + k.text.fillPlaceholders(v.joinToString()).tr() + "\n"
forbidden.wrap = true }
labelTable.add(forbidden).pad(0f, 20f, 17f, 20f).grow() val warningLabel = warning.toLabel(Color.RED, 13)
warningLabel.setFillParent(false)
warningLabel.setAlignment(Align.topLeft)
warningLabel.wrap = true
labelTable.add(warningLabel).pad(0f, 20f, 17f, 20f).grow()
} }
// Top button // Top button