From 6c0237fcc3b25c201f36a185dd2dd78d8a822082 Mon Sep 17 00:00:00 2001 From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com> Date: Tue, 13 Jul 2021 16:41:31 +0200 Subject: [PATCH] Disabled city state diplomacy buttons when it is not your turn (#4503) --- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 47166bfa26..df79968d2d 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -156,12 +156,13 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { diplomacyTable.addSeparator() - val giveGoldButton = "Give a Gift".toTextButton() - giveGoldButton.onClick { + val giveGiftButton = "Give a Gift".toTextButton() + giveGiftButton.onClick { rightSideTable.clear() rightSideTable.add(ScrollPane(getGoldGiftTable(otherCiv))) } - diplomacyTable.add(giveGoldButton).row() + diplomacyTable.add(giveGiftButton).row() + if (isNotPlayersTurn()) giveGiftButton.disable() if (otherCivDiplomacyManager.diplomaticStatus == DiplomaticStatus.Protector){ val revokeProtectionButton = "Revoke Protection".toTextButton() @@ -173,6 +174,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { }, this).open() } diplomacyTable.add(revokeProtectionButton).row() + if (isNotPlayersTurn()) revokeProtectionButton.disable() } else { val protectionButton = "Pledge to protect".toTextButton() protectionButton.onClick { @@ -186,6 +188,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { protectionButton.disable() } diplomacyTable.add(protectionButton).row() + if (isNotPlayersTurn()) protectionButton.disable() } val diplomacyManager = viewingCiv.getDiplomacyManager(otherCiv)