From 889d6a1587dfe374edf848157fdeff5554fd8568 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 10 Aug 2020 23:24:02 +0300 Subject: [PATCH] Denounce now has a confirmation popup --- android/assets/jsons/translations/template.properties | 1 + core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 33ed04a0a8..414eb89d5c 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -72,6 +72,7 @@ We have encountered the City-State of [name]! = Declare Friendship ([numberOfTurns] turns) = May our nations forever remain united! = Indeed! = +Denounce [civName]? = Denounce ([numberOfTurns] turns) = We will remember this. = diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 372b7501c1..9e4d54f0a8 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -251,8 +251,10 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { && !diplomacyManager.hasFlag(DiplomacyFlags.DeclarationOfFriendship)) { val denounceButton = "Denounce ([30] turns)".toTextButton() denounceButton.onClick { - diplomacyManager.denounce() - setRightSideFlavorText(otherCiv, "We will remember this.", "Very well.") + YesNoPopup("Denounce [${otherCiv.civName}]?", { + diplomacyManager.denounce() + setRightSideFlavorText(otherCiv, "We will remember this.", "Very well.") + }, this).open() } diplomacyTable.add(denounceButton).row() if (isNotPlayersTurn()) denounceButton.disable()