From 5fdbb7f1887405d1893af9b51affe628f7e5d904 Mon Sep 17 00:00:00 2001
From: Gualdimar <Gualdimar@users.noreply.github.com>
Date: Sat, 4 Feb 2023 22:50:38 +0200
Subject: [PATCH] Policies screen top button reworked (#8564)

* Policies screen top button reworked

* Removed completed branch from count

* refine
---
 .../com/unciv/ui/pickerscreens/PolicyPickerScreen.kt  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
index 6eac5c24da..3ffbbcf4d8 100644
--- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
@@ -581,7 +581,13 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: Civilization = w
         lockIcon.isVisible = false
         if (viewingCiv.policies.isAdopted(branch.name)) {
             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()) {
             policy = branch
             text = branch.era
@@ -600,7 +606,8 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: Civilization = w
                 PolicyColors.branchCompleted
             }
             else -> {
-                lockIcon.isVisible = true
+                if(!viewingCiv.policies.isAdopted(branch.name))
+                    lockIcon.isVisible = true
                 label.color.a = 0.5f
                 PolicyColors.policyNotPickable}
         }