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

Policies screen top button reworked (#8564)

Browse Source 
* Policies screen top button reworked

* Removed completed branch from count

* refine
This commit is contained in:
Gualdimar
2023-02-04 22:50:38 +02:00
committed by GitHub
parent 1018460730
commit 5fdbb7f188
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,7 +581,13 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: Civilization = w
lockIcon.isVisible = false lockIcon.isVisible = false
if (viewingCiv.policies.isAdopted(branch.name)) { if (viewingCiv.policies.isAdopted(branch.name)) {
policy = branch.policies.last() policy = branch.policies.last()
text = "Completed" val amountToDo = branch.policies.count()-1
val amountDone =
if(viewingCiv.policies.isAdopted(policy.name))
amountToDo
else
branch.policies.count { viewingCiv.policies.isAdopted(it.name) }
text = "{Completed} ($amountDone/$amountToDo)"
} else if (viewingCiv.gameInfo.ruleset.eras[branch.era]!!.eraNumber > viewingCiv.getEraNumber()) { } else if (viewingCiv.gameInfo.ruleset.eras[branch.era]!!.eraNumber > viewingCiv.getEraNumber()) {
policy = branch policy = branch
text = branch.era text = branch.era
@ -600,6 +606,7 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: Civilization = w
PolicyColors.branchCompleted PolicyColors.branchCompleted
} }
else -> { else -> {
if(!viewingCiv.policies.isAdopted(branch.name))
lockIcon.isVisible = true lockIcon.isVisible = true
label.color.a = 0.5f label.color.a = 0.5f
PolicyColors.policyNotPickable} PolicyColors.policyNotPickable}