From 1b497c6941ce7f6f8f3202669cf14dd7e7c37d95 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 18 Jan 2023 16:07:04 +0200
Subject: [PATCH] chore: More civinfo cleanup

---
 .../com/unciv/logic/civilization/CivilizationInfo.kt   |  7 -------
 .../logic/civilization/managers/GreatPersonManager.kt  | 10 ++++++++--
 .../unciv/logic/civilization/managers/TurnManager.kt   |  4 ++--
 .../com/unciv/ui/overviewscreen/StatsOverviewTable.kt  |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index a97055e500..5da62c83f4 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -30,7 +30,6 @@ import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.UnitMovementAlgorithms
 import com.unciv.logic.trade.TradeRequest
-import com.unciv.models.Counter
 import com.unciv.models.ruleset.Building
 import com.unciv.models.ruleset.Policy
 import com.unciv.models.ruleset.Victory
@@ -954,12 +953,6 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
         }
     }
 
-    fun getGreatPersonPointsForNextTurn(): Counter<String> {
-        val greatPersonPoints = Counter<String>()
-        for (city in cities) greatPersonPoints.add(city.getGreatPersonPoints())
-        return greatPersonPoints
-    }
-
     /**
      * @returns whether units of this civilization can pass through the tiles owned by [otherCiv],
      * considering only civ-wide filters.
diff --git a/core/src/com/unciv/logic/civilization/managers/GreatPersonManager.kt b/core/src/com/unciv/logic/civilization/managers/GreatPersonManager.kt
index 20a30a4558..1f3c2e489c 100644
--- a/core/src/com/unciv/logic/civilization/managers/GreatPersonManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/GreatPersonManager.kt
@@ -59,8 +59,8 @@ class GreatPersonManager : IsPartOfGameInfoSerialization {
         return null
     }
 
-    fun addGreatPersonPoints(greatPersonPointsForTurn: Counter<String>) {
-        greatPersonPointsCounter.add(greatPersonPointsForTurn)
+    fun addGreatPersonPoints() {
+        greatPersonPointsCounter.add(getGreatPersonPointsForNextTurn())
     }
 
 
@@ -73,4 +73,10 @@ class GreatPersonManager : IsPartOfGameInfoSerialization {
         else greatPeople.toHashSet()
     }
 
+    fun getGreatPersonPointsForNextTurn(): Counter<String> {
+        val greatPersonPoints = Counter<String>()
+        for (city in civInfo.cities) greatPersonPoints.add(city.getGreatPersonPoints())
+        return greatPersonPoints
+    }
+
 }
diff --git a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
index 48dc573d10..49a95438e6 100644
--- a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
@@ -249,8 +249,8 @@ class TurnManager(val civInfo: CivilizationInfo) {
 
         civInfo.espionageManager.endTurn()
 
-        if (civInfo.isMajorCiv())
-            civInfo.greatPeople.addGreatPersonPoints(civInfo.getGreatPersonPointsForNextTurn()) // City-states don't get great people!
+        if (civInfo.isMajorCiv()) // City-states don't get great people!
+            civInfo.greatPeople.addGreatPersonPoints()
 
         // To handle tile's owner issue (#8246), we need to run being razed city first.
         for (city in sequence {
diff --git a/core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt b/core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt
index 48c5c4afd1..54a2ac0a76 100644
--- a/core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt
+++ b/core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt
@@ -158,7 +158,7 @@ class StatsOverviewTab(
         add("Points per turn".toLabel()).row()
 
         val greatPersonPoints = viewingPlayer.greatPeople.greatPersonPointsCounter
-        val greatPersonPointsPerTurn = viewingPlayer.getGreatPersonPointsForNextTurn()
+        val greatPersonPointsPerTurn = viewingPlayer.greatPeople.getGreatPersonPointsForNextTurn()
         val pointsToGreatPerson = viewingPlayer.greatPeople.getPointsRequiredForGreatPerson()
         for ((greatPerson, points) in greatPersonPoints) {
             add(greatPerson.toLabel()).left()