From 82ab66ad050e8a3bf3f2b750552f7bdf30adbb77 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 5 Mar 2020 22:28:51 +0200
Subject: [PATCH] Ranking by culture is by number of adopted policies

---
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 +-
 core/src/com/unciv/ui/utils/Popup.kt                      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 253a230d1e..601e89cd1f 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -339,7 +339,7 @@ class CivilizationInfo {
             RankingType.Force -> units.sumBy { it.baseUnit.strength }
             RankingType.Happiness -> getHappiness()
             RankingType.Technologies -> tech.researchedTechnologies.size
-            RankingType.Culture -> policies.storedCulture
+            RankingType.Culture -> policies.numberOfAdoptedPolicies
         }
     }
 
diff --git a/core/src/com/unciv/ui/utils/Popup.kt b/core/src/com/unciv/ui/utils/Popup.kt
index 1dbee4b6f9..a8424a47e3 100644
--- a/core/src/com/unciv/ui/utils/Popup.kt
+++ b/core/src/com/unciv/ui/utils/Popup.kt
@@ -39,9 +39,7 @@ open class Popup(val screen: CameraStageBaseScreen): Table(CameraStageBaseScreen
 
     open fun close() {
         remove()
-        if (screen.popups.isNotEmpty()) {
-            screen.popups[0].isVisible = true;
-        }
+        if (screen.popups.isNotEmpty()) screen.popups[0].isVisible = true
     }
 
     fun addGoodSizedLabel(text: String, size:Int=18): Cell<Label> {
@@ -71,5 +69,5 @@ open class Popup(val screen: CameraStageBaseScreen): Table(CameraStageBaseScreen
 fun CameraStageBaseScreen.hasOpenPopups(): Boolean = stage.actors.any { it is Popup && it.isVisible }
 
 val CameraStageBaseScreen.popups: List<Popup>
-    get() = stage.actors.filter{ it is Popup }.map{ it as Popup }
+    get() = stage.actors.filterIsInstance<Popup>()