From b23ba40cd081388f4854981463102f19e7233458 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Sun, 21 Nov 2021 21:08:15 +0200
Subject: [PATCH] More Unique types, with some deprecations

---
 .../unciv/logic/civilization/CivConstructions.kt   | 14 ++------------
 core/src/com/unciv/logic/map/MapUnit.kt            |  3 ++-
 core/src/com/unciv/logic/map/TileInfo.kt           |  2 +-
 .../com/unciv/models/ruleset/unique/UniqueType.kt  |  4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivConstructions.kt b/core/src/com/unciv/logic/civilization/CivConstructions.kt
index a5b257e8ea..f856210f96 100644
--- a/core/src/com/unciv/logic/civilization/CivConstructions.kt
+++ b/core/src/com/unciv/logic/civilization/CivConstructions.kt
@@ -77,13 +77,6 @@ class CivConstructions {
             .mapValues { unique -> unique.value.sumOf { it.params[1].toInt() } }
             .toMutableMap()
 
-        // Deprecated since 3.16.15
-            statUniquesData[Stat.Culture] = (statUniquesData[Stat.Culture] ?: 0) +
-                civInfo.getMatchingUniques(UniqueType.FreeStatBuildingsDeprecated)
-                    .sumOf { it.params[0].toInt() }
-        //
-
-
         for ((stat, amount) in statUniquesData) {
             addFreeStatBuildings(stat, amount)
         }
@@ -102,11 +95,8 @@ class CivConstructions {
     }
 
     private fun addFreeSpecificBuildings() {
-        val buildingsUniquesData = (civInfo.getMatchingUniques(UniqueType.FreeSpecificBuildings)
-            // Deprecated since 3.16.15
-                + civInfo.getMatchingUniques(UniqueType.FreeSpecificBuildingsDeprecated)
-            //
-            ).groupBy { it.params[0] }
+        val buildingsUniquesData = civInfo.getMatchingUniques(UniqueType.FreeSpecificBuildings)
+            .groupBy { it.params[0] }
             .mapValues { unique -> unique.value.sumOf { it.params[1].toInt() } }
 
         for ((building, amount) in buildingsUniquesData) {
diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index 6bcf1d2b57..4aab83b398 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -346,7 +346,8 @@ class MapUnit {
             return 1
         }
         
-        visibilityRange += getMatchingUniques(UniqueType.Sight, checkCivInfoUniques = true).sumOf { it.params[0].toInt() }
+        visibilityRange += getMatchingUniques(UniqueType.Sight, checkCivInfoUniques = true)
+            .sumOf { it.params[0].toInt() }
 
         // Deprecated since 3.17.5
             for (unique in getMatchingUniques(UniqueType.SightUnits))
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 0063427fbb..a71f64cd1d 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -364,7 +364,7 @@ open class TileInfo {
                 return terrain.getMatchingUniques(UniqueType.OverrideFertility).first().params[0].toInt()
             else
                 fertility += terrain.getMatchingUniques(UniqueType.AddFertility)
-                        .sumBy { it.params[0].toInt() }
+                    .sumOf { it.params[0].toInt() }
         }
         if (isAdjacentToRiver()) fertility += 1
         if (isAdjacentToFreshwater) fertility += 1 // meaning total +2 for river
diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt
index d596a75311..d10fc7e650 100644
--- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt
+++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt
@@ -466,9 +466,9 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget, val flags:
     FreeStatBuildings("Provides the cheapest [stat] building in your first [amount] cities for free", UniqueTarget.Global),  // used in Policy
     FreeSpecificBuildings("Provides a [buildingName] in your first [amount] cities for free", UniqueTarget.Global),  // used in Policy
     
-    @Deprecated("As of 3.16.15", ReplaceWith("Provides the cheapest [stat] building in your first [amount] cities for free"))
+    @Deprecated("As of 3.16.15 - removed 3.18.4", ReplaceWith("Provides the cheapest [stat] building in your first [amount] cities for free"), DeprecationLevel.ERROR)
     FreeStatBuildingsDeprecated("Immediately creates the cheapest available cultural building in each of your first [amount] cities for free", UniqueTarget.Global),
-    @Deprecated("As of 3.16.15", ReplaceWith("Provides a [buildingName] in your first [amount] cities for free"))
+    @Deprecated("As of 3.16.15 - removed 3.18.4", ReplaceWith("Provides a [buildingName] in your first [amount] cities for free"), DeprecationLevel.ERROR)
     FreeSpecificBuildingsDeprecated("Immediately creates a [buildingName] in each of your first [amount] cities for free", UniqueTarget.Global),
     
     ///////////////////////////////////////////// META /////////////////////////////////////////////