mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 00:08:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Better visibility for city status icons (#8329)

Browse Source 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95
2023-01-07 18:27:55 +01:00
committed by GitHub
parent 6263b196cd
commit a5f68612ad
7 changed files with 237 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
android/Images/StatIcons/CityConnection.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 949 B

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
android/Images/StatIcons/Resistance.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

464
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 580 KiB

After

Width:  |  Height:  |  Size: 579 KiB

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

@ -248,27 +248,27 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
if (belongsToViewingCiv() && city.isConnectedToCapital() && !city.isCapital()) { if (belongsToViewingCiv() && city.isConnectedToCapital() && !city.isCapital()) {
val connectionImage = ImageGetter.getStatIcon("CityConnection") val connectionImage = ImageGetter.getStatIcon("CityConnection")
table.add(connectionImage).size(16f) table.add(connectionImage).size(18f)
} }
if (city.isInResistance()) { if (city.isInResistance()) {
val resistanceImage = ImageGetter.getImage("StatIcons/Resistance") val resistanceImage = ImageGetter.getImage("StatIcons/Resistance")
table.add(resistanceImage).size(16f).padLeft(2f) table.add(resistanceImage).size(18f).padLeft(2f)
} }
if (city.isPuppet) { if (city.isPuppet) {
val puppetImage = ImageGetter.getImage("OtherIcons/Puppet") val puppetImage = ImageGetter.getImage("OtherIcons/Puppet")
table.add(puppetImage).size(16f).padLeft(2f) table.add(puppetImage).size(18f).padLeft(2f)
} }
if (city.isBeingRazed) { if (city.isBeingRazed) {
val fireImage = ImageGetter.getImage("OtherIcons/Fire") val fireImage = ImageGetter.getImage("OtherIcons/Fire")
table.add(fireImage).size(16f).padLeft(2f) table.add(fireImage).size(18f).padLeft(2f)
} }
if (belongsToViewingCiv() && city.isWeLoveTheKingDayActive()) { if (belongsToViewingCiv() && city.isWeLoveTheKingDayActive()) {
val wtlkdImage = ImageGetter.getImage("OtherIcons/WLTKD") val wtlkdImage = ImageGetter.getImage("OtherIcons/WLTKD")
table.add(wtlkdImage).size(16f).padLeft(2f) table.add(wtlkdImage).size(18f).padLeft(2f)
} }
return table return table