AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

City state icon in city button now visible and colored according to city-state color

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-20 22:22:16 +03:00
parent f46baec89f
commit fd4123e15f
5 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/CityState.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 988 KiB

After

Width:  |  Height:  |  Size: 988 KiB

2
core/src/com/unciv/models/gamebasics/Nation.kt
View File

@ -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

3
core/src/com/unciv/ui/tilegroups/CityButton.kt
View File

@ -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 }

1
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -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)
}