AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 05:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert blocking DoF change (#12391)

Browse Source
This commit is contained in:
Yair Morgenstern 2024-10-31 16:13:15 +02:00 committed by GitHub
parent 8cc3c50c24
commit caa2aca3cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
View File

@ -214,12 +214,12 @@ class AlertPopup(
val playerDiploManager = viewingCiv.getDiplomacyManager(otherciv)!! val playerDiploManager = viewingCiv.getDiplomacyManager(otherciv)!!
addLeaderName(otherciv) addLeaderName(otherciv)
addGoodSizedLabel("My friend, shall we declare our friendship to the world?").row() 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) playerDiploManager.otherCivDiplomacy().setFlag(DiplomacyFlags.DeclinedDeclarationOfFriendship, 20)
}.row() }.row()
addButton("Declare Friendship ([30] turns)", KeyboardBinding.Confirm) {
playerDiploManager.signDeclarationOfFriendship()
}
} }
private fun addDefeated() { private fun addDefeated() {
@ -242,7 +242,6 @@ class AlertPopup(
addCloseButton("We shall do as we please.", KeyboardBinding.Cancel) { addCloseButton("We shall do as we please.", KeyboardBinding.Cancel) {
playerDiploManager.refuseDemandNotToSettleNear() playerDiploManager.refuseDemandNotToSettleNear()
} }
} }
private fun addDemandToStopSpreadingReligion() { private fun addDemandToStopSpreadingReligion() {