mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 02:09:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil

Browse Source 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
This commit is contained in:
Yair Morgenstern
2019-06-10 16:18:59 +03:00
parent 5ed9a5912b
commit d5a0894f75
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
View File

@ -386,6 +386,8 @@
Italian:"Abbiamo notato la la tua nuova città vicino ai nostri confini. E questo avrà... ripercussioni sui nostri rapporti." 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 ////// City-States Types

2
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -45,6 +45,7 @@ enum class DiplomaticModifiers{
DenouncedOurAllies, DenouncedOurAllies,
RefusedToNotSettleCitiesNearUs, RefusedToNotSettleCitiesNearUs,
BetrayedPromiseToNotSettleCitiesNearUs, BetrayedPromiseToNotSettleCitiesNearUs,
UnacceptableDemands,
YearsOfPeace, YearsOfPeace,
SharedEnemy, SharedEnemy,
@ -248,6 +249,7 @@ class DiplomacyManager() {
revertToZero(DiplomaticModifiers.BetrayedDeclarationOfFriendship,1/8f) // That's a bastardly thing to do revertToZero(DiplomaticModifiers.BetrayedDeclarationOfFriendship,1/8f) // That's a bastardly thing to do
revertToZero(DiplomaticModifiers.RefusedToNotSettleCitiesNearUs,1/4f) revertToZero(DiplomaticModifiers.RefusedToNotSettleCitiesNearUs,1/4f)
revertToZero(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs,1/8f) // That's a bastardly thing to do revertToZero(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs,1/8f) // That's a bastardly thing to do
revertToZero(DiplomaticModifiers.UnacceptableDemands,1/4f)
if(!hasFlag(DiplomacyFlags.DeclarationOfFriendship)) if(!hasFlag(DiplomacyFlags.DeclarationOfFriendship))
revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1/2f) //decreases slowly and will revert to full if it is declared later revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1/2f) //decreases slowly and will revert to full if it is declared later

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

@ -258,6 +258,7 @@ class DiplomacyScreen:CameraStageBaseScreen() {
BetrayedPromiseToNotSettleCitiesNearUs -> "You betrayed your promise to not settle cities near us" BetrayedPromiseToNotSettleCitiesNearUs -> "You betrayed your promise to not settle cities near us"
RefusedToNotSettleCitiesNearUs -> "You refused to stop settling cities near us" RefusedToNotSettleCitiesNearUs -> "You refused to stop settling cities near us"
FulfilledPromiseToNotSettleCitiesNearUs -> "You fulfilled your promise 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() + " " text = text.tr() + " "
if (modifier.value > 0) text += "+" 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!") setRightSideFlavorText(otherCiv,"Very well, we shall look for new lands to settle.","Excellent!")
otherCiv.getDiplomacyManager(currentPlayerCiv).setFlag(DiplomacyFlags.WeAgreedNotToSettleNearThem,100) 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(dontSettleCitiesButton).row()
demandsTable.add(TextButton("Close".tr(),skin).onClick { updateRightSide(otherCiv) }) demandsTable.add(TextButton("Close".tr(),skin).onClick { updateRightSide(otherCiv) })