diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index f1c93a2ac8..5784943769 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -386,6 +386,8 @@ Italian:"Abbiamo notato la la tua nuova città vicino ai nostri confini. E questo avrà... ripercussioni sui nostri rapporti." } + "Your arrogant demands are in bad taste":{} + ////// City-States Types diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 416877eb40..6852c9047e 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -45,6 +45,7 @@ enum class DiplomaticModifiers{ DenouncedOurAllies, RefusedToNotSettleCitiesNearUs, BetrayedPromiseToNotSettleCitiesNearUs, + UnacceptableDemands, YearsOfPeace, SharedEnemy, @@ -248,6 +249,7 @@ class DiplomacyManager() { revertToZero(DiplomaticModifiers.BetrayedDeclarationOfFriendship,1/8f) // That's a bastardly thing to do revertToZero(DiplomaticModifiers.RefusedToNotSettleCitiesNearUs,1/4f) revertToZero(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs,1/8f) // That's a bastardly thing to do + revertToZero(DiplomaticModifiers.UnacceptableDemands,1/4f) if(!hasFlag(DiplomacyFlags.DeclarationOfFriendship)) revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1/2f) //decreases slowly and will revert to full if it is declared later diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 10809ecc4a..57474c4036 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -258,6 +258,7 @@ class DiplomacyScreen:CameraStageBaseScreen() { BetrayedPromiseToNotSettleCitiesNearUs -> "You betrayed your promise to not settle cities near us" RefusedToNotSettleCitiesNearUs -> "You refused to stop settling cities near us" FulfilledPromiseToNotSettleCitiesNearUs -> "You fulfilled your promise to stop settling cities near us!" + UnacceptableDemands -> "Your arrogant demands are in bad taste" } text = text.tr() + " " if (modifier.value > 0) text += "+" @@ -280,7 +281,10 @@ class DiplomacyScreen:CameraStageBaseScreen() { setRightSideFlavorText(otherCiv,"Very well, we shall look for new lands to settle.","Excellent!") otherCiv.getDiplomacyManager(currentPlayerCiv).setFlag(DiplomacyFlags.WeAgreedNotToSettleNearThem,100) } - else setRightSideFlavorText(otherCiv,"We shall do as we please.","Very well.") + else { + setRightSideFlavorText(otherCiv,"We shall do as we please.","Very well.") + otherCiv.getDiplomacyManager(currentPlayerCiv).addModifier(UnacceptableDemands,-20f) + } } demandsTable.add(dontSettleCitiesButton).row() demandsTable.add(TextButton("Close".tr(),skin).onClick { updateRightSide(otherCiv) })