From c5bde45c5dc6c781f63ca2f32f16a02c38798823 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 20 Nov 2022 18:48:28 +0200 Subject: [PATCH] Moved city state icons to separate folder --- .../Cultured.png | Bin .../Maritime.png | Bin .../Mercantile.png | Bin .../Militaristic.png | Bin .../Religious.png | Bin android/assets/game.atlas | 70 +++++++++--------- .../logic/civilization/CityStateFunctions.kt | 2 - .../unciv/logic/civilization/CityStateType.kt | 14 ++-- .../src/com/unciv/ui/tilegroups/CityButton.kt | 2 +- .../src/com/unciv/ui/trade/DiplomacyScreen.kt | 2 +- 10 files changed, 44 insertions(+), 46 deletions(-) rename android/Images/{OtherIcons => CityStateIcons}/Cultured.png (100%) rename android/Images/{OtherIcons => CityStateIcons}/Maritime.png (100%) rename android/Images/{OtherIcons => CityStateIcons}/Mercantile.png (100%) rename android/Images/{OtherIcons => CityStateIcons}/Militaristic.png (100%) rename android/Images/{OtherIcons => CityStateIcons}/Religious.png (100%) diff --git a/android/Images/OtherIcons/Cultured.png b/android/Images/CityStateIcons/Cultured.png similarity index 100% rename from android/Images/OtherIcons/Cultured.png rename to android/Images/CityStateIcons/Cultured.png diff --git a/android/Images/OtherIcons/Maritime.png b/android/Images/CityStateIcons/Maritime.png similarity index 100% rename from android/Images/OtherIcons/Maritime.png rename to android/Images/CityStateIcons/Maritime.png diff --git a/android/Images/OtherIcons/Mercantile.png b/android/Images/CityStateIcons/Mercantile.png similarity index 100% rename from android/Images/OtherIcons/Mercantile.png rename to android/Images/CityStateIcons/Mercantile.png diff --git a/android/Images/OtherIcons/Militaristic.png b/android/Images/CityStateIcons/Militaristic.png similarity index 100% rename from android/Images/OtherIcons/Militaristic.png rename to android/Images/CityStateIcons/Militaristic.png diff --git a/android/Images/OtherIcons/Religious.png b/android/Images/CityStateIcons/Religious.png similarity index 100% rename from android/Images/OtherIcons/Religious.png rename to android/Images/CityStateIcons/Religious.png diff --git a/android/assets/game.atlas b/android/assets/game.atlas index c89a8e7e6f..7f716be66e 100644 --- a/android/assets/game.atlas +++ b/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 diff --git a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt index 5d6c00d34b..8f53afcdca 100644 --- a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt +++ b/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 }) diff --git a/core/src/com/unciv/logic/civilization/CityStateType.kt b/core/src/com/unciv/logic/civilization/CityStateType.kt index fca8759506..eb5cea7c59 100644 --- a/core/src/com/unciv/logic/civilization/CityStateType.kt +++ b/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 -} \ No newline at end of file +} diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 611c5f06de..ab2b40d410 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/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() } diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 9fcd8342cf..a7b397e491 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/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 }