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

City state icon.

Browse Source
This commit is contained in:
Duan Tao
2019-05-05 12:04:50 +08:00
committed by Yair Morgenstern
parent 3292e41977
commit fc4f62f555
4 changed files with 337 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Credits.md
View File

@ -423,6 +423,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Resistance](https://thenounproject.com/term/revolution/1315305/) By HeadsOfBirds * [Resistance](https://thenounproject.com/term/revolution/1315305/) By HeadsOfBirds
* [Viking Hat](https://thenounproject.com/search/?q=pillage&i=185405) By my name is mud for pillaging improvements * [Viking Hat](https://thenounproject.com/search/?q=pillage&i=185405) By my name is mud for pillaging improvements
* [Aim](https://thenounproject.com/search/?q=aim&i=2034920) By Kaviashri for ranged strength * [Aim](https://thenounproject.com/search/?q=aim&i=2034920) By Kaviashri for ranged strength
* [Capitol](https://thenounproject.com/search/?q=capitol&i=160031) By Loren Klein, US for city states
# Sound credits # Sound credits

651
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: 966 KiB

After

Width:  |  Height:  |  Size: 980 KiB

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

@ -54,8 +54,13 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
add(fireImage).size(20f).pad(2f).padLeft(5f) add(fireImage).size(20f).pad(2f).padLeft(5f)
} }
if (city.isCapital()) { if (city.isCapital()) {
if (city.civInfo.isCityState()) {
val cityStateImage = ImageGetter.getImage("OtherIcons/CityState.png").apply { color = Color.LIGHT_GRAY }
add(cityStateImage).size(20f).pad(2f).padLeft(5f)
} else {
val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY } val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY }
add(starImage).size(20f).pad(2f).padLeft(5f) add(starImage).size(20f).pad(2f).padLeft(5f)
}
} else if (city.civInfo.isCurrentPlayer() && city.cityStats.isConnectedToCapital(RoadStatus.Road)) { } else if (city.civInfo.isCurrentPlayer() && city.cityStats.isConnectedToCapital(RoadStatus.Road)) {
val connectionImage = ImageGetter.getStatIcon("CityConnection") val connectionImage = ImageGetter.getStatIcon("CityConnection")
add(connectionImage).size(20f).pad(2f).padLeft(5f) add(connectionImage).size(20f).pad(2f).padLeft(5f)