diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 47b827398c..97e428f8e3 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -432,6 +432,8 @@ class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : Bas techPolicyAndVictoryHolder.setPosition(10f, topBar.y - techPolicyAndVictoryHolder.height - 5f) updateDiplomacyButton(viewingCiv) + topBar.unitSupplyImage.isVisible = selectedCiv.stats().getUnitSupplyDeficit() > 0 + if (!hasOpenPopups() && isPlayersTurn) { when { viewingCiv.shouldShowDiplomaticVotingResults() -> diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt index bbb83f3a64..9c96117507 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt @@ -46,6 +46,9 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() { private val malcontentGroup = ImageGetter.getStatIcon("Malcontent") private val happinessGroup = ImageGetter.getStatIcon("Happiness") + val unitSupplyImage = ImageGetter.getImage("OtherIcons/ExclamationMark") + .apply { color = Color.FIREBRICK } + init { background = ImageGetter.getBackground(ImageGetter.getBlue().darken(0.5f)) @@ -58,7 +61,7 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() { addActor(getSelectedCivilizationTable()) - addActor(getOverviewButton()) + addActor(getOverviewAndSupplyButton()) } private fun getResourceTable(): Table { @@ -167,19 +170,19 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() { return menuButton } - private fun getOverviewButton(): Table { + private fun getOverviewAndSupplyButton(): Table { val rightTable = Table(BaseScreen.skin).apply{ defaults().pad(10f) } - val unitSupplyImage = ImageGetter.getImage("OtherIcons/ExclamationMark") - .apply { color = Color.FIREBRICK } - .onClick { worldScreen.game.setScreen(EmpireOverviewScreen(worldScreen.selectedCiv, "Units")) } + unitSupplyImage.onClick { + worldScreen.game.setScreen(EmpireOverviewScreen(worldScreen.selectedCiv, "Units")) + } + unitSupplyImage.isVisible = worldScreen.selectedCiv.stats().getUnitSupplyDeficit() > 0 val overviewButton = "Overview".toTextButton() overviewButton.addTooltip('e') overviewButton.onClick { worldScreen.game.setScreen(EmpireOverviewScreen(worldScreen.selectedCiv)) } - if (worldScreen.selectedCiv.stats().getUnitSupplyDeficit() > 0) - rightTable.add(unitSupplyImage).size(50f) + rightTable.add(unitSupplyImage).size(50f) rightTable.add(overviewButton) rightTable.pack()