diff --git a/android/Images/OtherIcons/CityState.png b/android/Images/OtherIcons/CityState.png index fbe3c12399..be8fcd77bb 100644 Binary files a/android/Images/OtherIcons/CityState.png and b/android/Images/OtherIcons/CityState.png differ diff --git a/android/assets/game.png b/android/assets/game.png index e1581dd6ad..2104b7d94a 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/models/gamebasics/Nation.kt b/core/src/com/unciv/models/gamebasics/Nation.kt index c1cc67fc71..54125df3cf 100644 --- a/core/src/com/unciv/models/gamebasics/Nation.kt +++ b/core/src/com/unciv/models/gamebasics/Nation.kt @@ -14,7 +14,7 @@ class Nation : INamed { } var leaderName="" - fun getLeaderDisplayName() = if(isCityState()) "City-state [${getNameTranslation()}]".tr() + fun getLeaderDisplayName() = if(isCityState()) getNameTranslation() else "[$leaderName] of [${getNameTranslation()}]" var cityStateType: CityStateType?=null diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index cd54f64b9d..e80f05427f 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -81,7 +81,8 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski } if (city.isCapital()) { if (city.civInfo.isCityState()) { - val cityStateImage = ImageGetter.getImage("OtherIcons/CityState.png").apply { color = Color.LIGHT_GRAY } + val cityStateImage = ImageGetter.getImage("OtherIcons/CityState.png") + .apply { color = city.civInfo.getNation().getSecondaryColor()} iconTable.add(cityStateImage).size(20f).pad(2f).padLeft(10f) } else { val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY } diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index d5b4e5a00b..33b767f288 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -56,6 +56,7 @@ class DiplomacyScreen:CameraStageBaseScreen() { val cityStateIcon = ImageGetter.getImage("OtherIcons/CityState.png") cityStateIcon.setSize(70f,70f) cityStateIcon.center(civIndicator) + cityStateIcon.color= Color.BLACK civIndicator.addActor(cityStateIcon) }