AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cannot declare friendship after denounce and vice versa

Browse Source
This commit is contained in:
Yair Morgenstern 2019-06-02 19:47:49 +03:00
parent 7803d3ebdf
commit 0916720f86
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 251 versionCode 252
versionName "2.17.1" versionName "2.17.2"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

6
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -200,7 +200,8 @@ class DiplomacyScreen:CameraStageBaseScreen() {
if (!currentPlayerCiv.isAtWarWith(otherCiv)) { if (!currentPlayerCiv.isAtWarWith(otherCiv)) {
if(otherCivDiplomacyManager.relationshipLevel() > RelationshipLevel.Neutral 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) val declareFriendshipButton = TextButton("Declare Friendship ([30] turns)".tr(),skin)
declareFriendshipButton.onClick { declareFriendshipButton.onClick {
diplomacyManager.signDeclarationOfFriendship() diplomacyManager.signDeclarationOfFriendship()
@ -209,7 +210,8 @@ class DiplomacyScreen:CameraStageBaseScreen() {
diplomacyTable.add(declareFriendshipButton).row() 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) val denounceButton = TextButton("Denounce ([30] turns)".tr(),skin)
denounceButton.onClick { denounceButton.onClick {
diplomacyManager.denounce() diplomacyManager.denounce()