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

Improved Spectator selected Civ coloring (#10992)

Browse Source 
* Spectators now use the colors of the selected civ instead of the viewing civ

* Spectator now sees all city construction, growth bars and nation icons
This commit is contained in:
Oskar Niesen
2024-01-24 15:42:02 -06:00
committed by GitHub
parent 4a72213cde
commit 9522355752
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,13 +111,12 @@ private class DefenceTable(city: City) : BorderedTable(
init { init {
val viewingCiv = GUI.getViewingPlayer() val selectedCiv = GUI.getSelectedPlayer()
borderSize = 4f borderSize = 4f
bgColor = Color.BLACK bgColor = Color.BLACK
bgBorderColor = when { bgBorderColor = when {
city.civ == viewingCiv -> colorFromRGB(255, 237, 200) city.civ == selectedCiv -> colorFromRGB(255, 237, 200)
city.civ.isAtWarWith(viewingCiv) -> Color.RED city.civ.isAtWarWith(selectedCiv) -> Color.RED
else -> Color.BLACK else -> Color.BLACK
} }
@ -164,9 +163,9 @@ private class StatusTable(city: City, iconSize: Float = 18f) : Table() {
init { init {
val padBetween = 2f val padBetween = 2f
val viewingCiv = GUI.getViewingPlayer() val selectedCiv = GUI.getSelectedPlayer()
if (city.civ == viewingCiv) { if (city.civ == selectedCiv) {
if (city.isBlockaded()) { if (city.isBlockaded()) {
val connectionImage = ImageGetter.getImage("OtherIcons/Blockade") val connectionImage = ImageGetter.getImage("OtherIcons/Blockade")
add(connectionImage).size(iconSize) add(connectionImage).size(iconSize)
@ -192,7 +191,7 @@ private class StatusTable(city: City, iconSize: Float = 18f) : Table() {
add(fireImage).size(iconSize).padLeft(padBetween) add(fireImage).size(iconSize).padLeft(padBetween)
} }
if (city.civ == viewingCiv && city.isWeLoveTheKingDayActive()) { if (city.civ == selectedCiv && city.isWeLoveTheKingDayActive()) {
val wltkdImage = ImageGetter.getImage("OtherIcons/WLTKD") val wltkdImage = ImageGetter.getImage("OtherIcons/WLTKD")
add(wltkdImage).size(iconSize).padLeft(padBetween) add(wltkdImage).size(iconSize).padLeft(padBetween)
} }
@ -209,26 +208,27 @@ private class CityTable(city: City, forPopup: Boolean = false) : BorderedTable(
isTransform = false isTransform = false
touchable = Touchable.enabled touchable = Touchable.enabled
val selectedCiv = GUI.getSelectedPlayer()
val viewingCiv = GUI.getViewingPlayer() val viewingCiv = GUI.getViewingPlayer()
bgBorderColor = when { bgBorderColor = when {
city.civ == viewingCiv -> colorFromRGB(233, 233, 172) city.civ == selectedCiv -> colorFromRGB(233, 233, 172)
city.civ.isAtWarWith(viewingCiv) -> colorFromRGB(230, 51, 0) city.civ.isAtWarWith(selectedCiv) -> colorFromRGB(230, 51, 0)
else -> Color.BLACK else -> Color.BLACK
} }
borderSize = when { borderSize = when {
city.civ == viewingCiv -> 4f city.civ == selectedCiv -> 4f
city.civ.isAtWarWith(viewingCiv) -> 4f city.civ.isAtWarWith(selectedCiv) -> 4f
else -> 2f else -> 2f
} }
bgColor = city.civ.nation.getOuterColor().cpy().apply { a = 0.9f } bgColor = city.civ.nation.getOuterColor().cpy().apply { a = 0.9f }
borderOnTop = city.civ == viewingCiv borderOnTop = city.civ == selectedCiv
pad(0f) pad(0f)
defaults().pad(0f) defaults().pad(0f)
val isShowDetailedInfo = DebugUtils.VISIBLE_MAP val isShowDetailedInfo = DebugUtils.VISIBLE_MAP
|| city.civ == viewingCiv || city.civ == selectedCiv
|| viewingCiv.isSpectator() || viewingCiv.isSpectator()
addCityPopNumber(city) addCityPopNumber(city)