Moved city state icons to separate folder

android/assets/game.atlas

@@ -4,6 +4,41 @@ size: 2048, 1024
 format: RGBA8888
 filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
+CityStateIcons/Cultured
+  rotate: false
+  xy: 112, 54
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+CityStateIcons/Maritime
+  rotate: false
+  xy: 838, 596
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+CityStateIcons/Mercantile
+  rotate: false
+  xy: 1054, 596
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+CityStateIcons/Militaristic
+  rotate: false
+  xy: 1162, 596
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+CityStateIcons/Religious
+  rotate: false
+  xy: 436, 56
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 EmojiIcons/Culture
   rotate: false
   xy: 1408, 214
@@ -340,13 +375,6 @@ OtherIcons/CrosshairB
   orig: 100, 100
   offset: 0, 0
   index: -1
-OtherIcons/Cultured
-  rotate: false
-  xy: 112, 54
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 OtherIcons/Diplomacy
   rotate: false
   xy: 691, 812
@@ -431,13 +459,6 @@ OtherIcons/MapEditor
   orig: 100, 100
   offset: 0, 0
   index: -1
-OtherIcons/Maritime
-  rotate: false
-  xy: 838, 596
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 OtherIcons/MenuIcon
   rotate: false
   xy: 946, 596
@@ -445,20 +466,6 @@ OtherIcons/MenuIcon
   orig: 100, 100
   offset: 0, 0
   index: -1
-OtherIcons/Mercantile
-  rotate: false
-  xy: 1054, 596
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-OtherIcons/Militaristic
-  rotate: false
-  xy: 1162, 596
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 OtherIcons/Mods
   rotate: false
   xy: 1486, 596
@@ -564,13 +571,6 @@ OtherIcons/Quickstart
   orig: 100, 100
   offset: 0, 0
   index: -1
-OtherIcons/Religious
-  rotate: false
-  xy: 436, 56
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 OtherIcons/Remove Heresy
   rotate: false
   xy: 652, 272

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

@@ -329,8 +329,6 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
 
         if (civInfo.cityStatePersonality == CityStatePersonality.Hostile)
             modifiers["Hostile"] = -10
-        if (civInfo.cityStateType == CityStateType.Militaristic)
-            modifiers["Militaristic"] = -10
         if (civInfo.getAllyCiv() != null && civInfo.getAllyCiv() != demandingCiv.civName)
             modifiers["Has Ally"] = -10
         if (getProtectorCivs().any { it != demandingCiv })

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

@@ -1,11 +1,11 @@
 package com.unciv.logic.civilization
 
-enum class CityStateType(val color: String = "", val icon: String) {
-    Cultured("#8b60ff", "OtherIcons/Cultured"),
-    Maritime("#38ff70", "OtherIcons/Maritime"),
-    Mercantile("#ffd800", "OtherIcons/Mercantile"),
-    Militaristic("#ff0000", "OtherIcons/Militaristic"),
-    Religious("#FFFFFF", "OtherIcons/Religious")
+enum class CityStateType(val color: String = "") {
+    Cultured("#8b60ff"),
+    Maritime("#38ff70"),
+    Mercantile("#ffd800"),
+    Militaristic("#ff0000"),
+    Religious("#FFFFFF")
 }
 
 enum class CityStatePersonality {
@@ -13,4 +13,4 @@ enum class CityStatePersonality {
     Neutral,
     Hostile,
     Irrational
-}
+}

core/src/com/unciv/ui/tilegroups/CityButton.kt

@@ -251,7 +251,7 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
         }
 
         if (city.civInfo.isCityState()) {
-            val cityStateImage = ImageGetter.getImage(city.civInfo.cityStateType.icon).apply { color = secondaryColor }
+            val cityStateImage = ImageGetter.getImage("CityStateIcons/" +city.civInfo.cityStateType.name).apply { color = secondaryColor }
             iconTable.add(cityStateImage).size(20f).fillY()
         }
 

core/src/com/unciv/ui/trade/DiplomacyScreen.kt

@@ -137,7 +137,7 @@ class DiplomacyScreen(
 
             if (civ.isCityState()) {
                 val innerColor = civ.gameInfo.ruleSet.nations[civ.civName]!!.getInnerColor()
-                val typeIcon = ImageGetter.getImage(civ.cityStateType.icon)
+                val typeIcon = ImageGetter.getImage("CityStateIcons/"+civ.cityStateType.name)
                     .surroundWithCircle(size = 35f, color = innerColor).apply {
                         actor.color = Color.BLACK
                     }