diff --git a/android/build.gradle b/android/build.gradle index e9dcdab845..690fd7f6e7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 251 - versionName "2.17.1" + versionCode 252 + versionName "2.17.2" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 2dadfea8e6..1850715592 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -200,7 +200,8 @@ class DiplomacyScreen:CameraStageBaseScreen() { if (!currentPlayerCiv.isAtWarWith(otherCiv)) { if(otherCivDiplomacyManager.relationshipLevel() > RelationshipLevel.Neutral - && !diplomacyManager.hasFlag(DiplomacyFlags.DeclarationOfFriendship)){ + && !diplomacyManager.hasFlag(DiplomacyFlags.DeclarationOfFriendship) + && !diplomacyManager.hasFlag(DiplomacyFlags.Denunceation)){ val declareFriendshipButton = TextButton("Declare Friendship ([30] turns)".tr(),skin) declareFriendshipButton.onClick { diplomacyManager.signDeclarationOfFriendship() @@ -209,7 +210,8 @@ class DiplomacyScreen:CameraStageBaseScreen() { diplomacyTable.add(declareFriendshipButton).row() } - if(!diplomacyManager.hasFlag(DiplomacyFlags.Denunceation)){ + if(!diplomacyManager.hasFlag(DiplomacyFlags.Denunceation) + && !diplomacyManager.hasFlag(DiplomacyFlags.DeclarationOfFriendship)){ val denounceButton = TextButton("Denounce ([30] turns)".tr(),skin) denounceButton.onClick { diplomacyManager.denounce()