From caa2aca3cb8e8e5052f502043a93d30e5db8e325 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 31 Oct 2024 16:13:15 +0200 Subject: [PATCH] Revert blocking DoF change (#12391) --- core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt index 4f3cd4488f924..ac60c032b259f 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt @@ -214,12 +214,12 @@ class AlertPopup( val playerDiploManager = viewingCiv.getDiplomacyManager(otherciv)!! addLeaderName(otherciv) addGoodSizedLabel("My friend, shall we declare our friendship to the world?").row() - addButton("We are not interested.", KeyboardBinding.Cancel) { + addCloseButton("Declare Friendship ([30] turns)", KeyboardBinding.Confirm) { + playerDiploManager.signDeclarationOfFriendship() + }.row() + addCloseButton("We are not interested.", KeyboardBinding.Cancel) { playerDiploManager.otherCivDiplomacy().setFlag(DiplomacyFlags.DeclinedDeclarationOfFriendship, 20) }.row() - addButton("Declare Friendship ([30] turns)", KeyboardBinding.Confirm) { - playerDiploManager.signDeclarationOfFriendship() - } } private fun addDefeated() { @@ -242,7 +242,6 @@ class AlertPopup( addCloseButton("We shall do as we please.", KeyboardBinding.Cancel) { playerDiploManager.refuseDemandNotToSettleNear() } - } private fun addDemandToStopSpreadingReligion() {