From 15335f3f7c733d6fa39fe94bc5ad94a599d17d45 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Thu, 2 Sep 2021 17:37:52 +0300
Subject: [PATCH] Made city-state bonuses immutable to avoid future problems a
 la #5050

---
 core/src/com/unciv/logic/civilization/CivInfoStats.kt | 11 +++++++++--
 core/src/com/unciv/models/ruleset/Era.kt              |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt
index a8ee9d1da2..718e7e66ec 100644
--- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt
+++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt
@@ -109,8 +109,15 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
                 } else {
                     // Deprecated, assume Civ V values for compatibility
                     if (otherCiv.cityStateType == CityStateType.Cultured) {
-                        cityStateBonus.culture = if(civInfo.getEraNumber() in 0..1) 3f else if (civInfo.getEraNumber() in 2..3) 6f else 13f
-                        if (otherCiv.getDiplomacyManager(civInfo.civName).relationshipLevel() == RelationshipLevel.Ally)
+                        cityStateBonus.culture =
+                            when {
+                                civInfo.getEraNumber() in 0..1 -> 3f
+                                civInfo.getEraNumber() in 2..3 -> 6f
+                                else -> 13f
+                            }
+                        if (otherCiv.getDiplomacyManager(civInfo.civName)
+                                .relationshipLevel() == RelationshipLevel.Ally
+                        )
                             cityStateBonus.culture *= 2f
                     }
                 }
diff --git a/core/src/com/unciv/models/ruleset/Era.kt b/core/src/com/unciv/models/ruleset/Era.kt
index a73fe2200a..45149239c9 100644
--- a/core/src/com/unciv/models/ruleset/Era.kt
+++ b/core/src/com/unciv/models/ruleset/Era.kt
@@ -20,8 +20,8 @@ class Era : INamed {
     var settlerBuildings = ArrayList<String>()
     var startingObsoleteWonders = ArrayList<String>()
     var baseUnitBuyCost = 200
-    var friendBonus = HashMap<String, ArrayList<String>>()
-    var allyBonus = HashMap<String, ArrayList<String>>()
+    var friendBonus = HashMap<String, List<String>>()
+    var allyBonus = HashMap<String, List<String>>()
     var iconRGB: List<Int>? = null
 
     fun getStartingUnits(): List<String> {