NationUnique is now removable whenever we want ;)

core/src/com/unciv/logic/battle/Battle.kt

@@ -3,7 +3,6 @@ package com.unciv.logic.battle
 import com.badlogic.gdx.graphics.Color
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.UniqueAbility
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.AlertType
 import com.unciv.logic.civilization.CivilizationInfo

core/src/com/unciv/logic/battle/BattleDamage.kt

@@ -1,7 +1,6 @@
 package com.unciv.logic.battle
 
 import com.unciv.Constants
-import com.unciv.UniqueAbility
 import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.TileInfo
 import com.unciv.models.ruleset.unit.UnitType

core/src/com/unciv/logic/city/CityExpansionManager.kt

@@ -1,7 +1,6 @@
 package com.unciv.logic.city
 
 import com.badlogic.gdx.graphics.Color
-import com.unciv.UniqueAbility
 import com.unciv.logic.automation.Automation
 import com.unciv.logic.map.TileInfo
 import com.unciv.ui.utils.withItem

core/src/com/unciv/logic/city/CityInfo.kt

@@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.UniqueAbility
 import com.unciv.logic.battle.Battle
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
@@ -27,7 +26,10 @@ import com.unciv.ui.utils.withoutItem
 import java.util.*
 import kotlin.collections.HashMap
 import kotlin.collections.HashSet
-import kotlin.math.*
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 class CityInfo {
     @Transient lateinit var civInfo: CivilizationInfo

core/src/com/unciv/logic/city/CityStats.kt

@@ -2,7 +2,6 @@ package com.unciv.logic.city
 
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.UniqueAbility
 import com.unciv.logic.civilization.CityStateType
 import com.unciv.logic.civilization.diplomacy.RelationshipLevel
 import com.unciv.logic.map.RoadStatus
@@ -12,8 +11,6 @@ import com.unciv.models.ruleset.unit.BaseUnit
 import com.unciv.models.ruleset.unit.UnitType
 import com.unciv.models.stats.Stat
 import com.unciv.models.stats.Stats
-import com.unciv.models.translations.equalsPlaceholderText
-import com.unciv.models.translations.getPlaceholderParameters
 
 
 class CityStats {

core/src/com/unciv/logic/civilization/CivInfoStats.kt

@@ -1,7 +1,6 @@
 package com.unciv.logic.civilization
 
 import com.unciv.Constants
-import com.unciv.UniqueAbility
 import com.unciv.logic.civilization.diplomacy.RelationshipLevel
 import com.unciv.logic.map.RoadStatus
 import com.unciv.models.metadata.BASE_GAME_DURATION_TURNS

core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt

@@ -1,7 +1,6 @@
 package com.unciv.logic.civilization
 
 import com.badlogic.gdx.graphics.Color
-import com.unciv.UniqueAbility
 import com.unciv.logic.map.TileInfo
 import com.unciv.models.ruleset.tile.ResourceSupplyList
 

core/src/com/unciv/logic/civilization/GoldenAgeManager.kt

@@ -1,7 +1,6 @@
 package com.unciv.logic.civilization
 
 import com.badlogic.gdx.graphics.Color
-import com.unciv.UniqueAbility
 
 class GoldenAgeManager{
     @Transient

core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt

@@ -2,7 +2,6 @@ package com.unciv.logic.civilization.diplomacy
 
 import com.badlogic.gdx.graphics.Color
 import com.unciv.Constants
-import com.unciv.UniqueAbility
 import com.unciv.logic.civilization.*
 import com.unciv.logic.trade.Trade
 import com.unciv.logic.trade.TradeOffer

core/src/com/unciv/logic/map/MapUnit.kt

@@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.UniqueAbility
 import com.unciv.logic.automation.UnitAutomation
 import com.unciv.logic.automation.WorkerAutomation
 import com.unciv.logic.civilization.CivilizationInfo

core/src/com/unciv/logic/map/TileInfo.kt

@@ -3,7 +3,6 @@
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.UniqueAbility
 import com.unciv.logic.HexMath
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.CivilizationInfo

core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt

@@ -2,7 +2,6 @@ package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
-import com.unciv.UniqueAbility
 import com.unciv.logic.civilization.CivilizationInfo
 
 class UnitMovementAlgorithms(val unit:MapUnit) {

core/src/com/unciv/models/ruleset/Nation.kt

@@ -36,15 +36,18 @@ class Nation : INamed {
 
     lateinit var outerColor: List<Int>
     var unique: UniqueAbility? = null
-    val uniques = HashSet<String>()
+    var uniqueName = ""
+    var uniques = HashSet<String>()
     val uniqueObjects: List<Unique> by lazy { uniques.map { Unique(it) } }
     var innerColor: List<Int>? = null
     var startBias = ArrayList<String>()
 
-    @Transient private lateinit var outerColorObject:Color
+    @Transient
+    private lateinit var outerColorObject: Color
     fun getOuterColor(): Color = outerColorObject
 
-    @Transient private lateinit var innerColorObject:Color
+    @Transient
+    private lateinit var innerColorObject: Color
 
     fun getInnerColor(): Color = innerColorObject
 
@@ -54,10 +57,14 @@ class Nation : INamed {
     fun isSpectator() = name == Constants.spectator
 
     // This is its own transient because we'll need to check this for every tile-to-tile movement which is harsh
-    @Transient var forestsAndJunglesAreRoads = false
+    @Transient
+    var forestsAndJunglesAreRoads = false
+
     // Same for Inca unique
-    @Transient var ignoreHillMovementCost = false
+    @Transient
-    @Transient var embarkDisembarkCosts1 = false
+    var ignoreHillMovementCost = false
+    @Transient
+    var embarkDisembarkCosts1 = false
 
     fun setTransients() {
         outerColorObject = colorFromRGB(outerColor[0], outerColor[1], outerColor[2])
@@ -76,8 +83,6 @@ class Nation : INamed {
     lateinit var cities: ArrayList<String>
 
 
-
-
     fun getUniqueString(ruleset: Ruleset, forPickerScreen: Boolean = true): String {
         val textList = ArrayList<String>()
 
@@ -91,6 +96,11 @@ class Nation : INamed {
 
             textList += ""
         }
+//        if (uniqueName!="") {
+//            textList += uniqueName.tr() + ":"
+//            textList += "  " + uniques.joinToString(", ").tr()
+//            textList += ""
+//        }
         if (startBias.isNotEmpty()) {
             textList += "Start bias:".tr() + startBias.joinToString(", ", " ") { it.tr() }
             textList += ""
@@ -154,8 +164,7 @@ class Nation : INamed {
                     textList += "  " + "Lost ability".tr() + "(vs " + originalUnit.name.tr() + "): " + Translations.translateBonusOrPenalty(unique)
                 for (promotion in unit.promotions.filter { it !in originalUnit.promotions })
                     textList += "  " + promotion.tr() + " (" + Translations.translateBonusOrPenalty(ruleset.unitPromotions[promotion]!!.effect) + ")"
-            }
+            } else {
-            else {
                 textList += unit.name.tr()
                 textList += "  " + unit.getDescription(true).split("\n").joinToString("\n  ")
             }

core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt

@@ -3,7 +3,6 @@ package com.unciv.ui.worldscreen.unit
 import com.badlogic.gdx.graphics.Color
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.UniqueAbility
 import com.unciv.logic.automation.UnitAutomation
 import com.unciv.logic.automation.WorkerAutomation
 import com.unciv.logic.civilization.CivilizationInfo