wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #2735 - Diplomatic "Friends with friend/enemy" modifiers are recalculated every turn

Browse source
This commit is contained in:
Yair Morgenstern 2020-06-16 20:24:11 +03:00
parent ac0c874061
commit 6900e28671
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View file

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.3.71" const val kotlinVersion = "1.3.71"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 438 const val appCodeNumber = 439
const val appVersion = "3.9.3" const val appVersion = "3.9.3-patch1"
const val gdxVersion = "1.9.10" const val gdxVersion = "1.9.10"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

38
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View file

@ -256,19 +256,18 @@ class DiplomacyManager() {
} }
// for performance reasons we don't want to call this every time we want to see if a unit can move through a tile // for performance reasons we don't want to call this every time we want to see if a unit can move through a tile
fun updateHasOpenBorders(){ fun updateHasOpenBorders() {
val newHasOpenBorders = trades.flatMap { it.theirOffers } val newHasOpenBorders = trades.flatMap { it.theirOffers }
.any { it.name == Constants.openBorders && it.duration > 0 } .any { it.name == Constants.openBorders && it.duration > 0 }
val bordersWereClosed = hasOpenBorders && !newHasOpenBorders val bordersWereClosed = hasOpenBorders && !newHasOpenBorders
hasOpenBorders=newHasOpenBorders hasOpenBorders = newHasOpenBorders
if(bordersWereClosed){ // borders were closed, get out! if (bordersWereClosed) { // borders were closed, get out!
for(unit in civInfo.getCivUnits().filter { it.currentTile.getOwner()?.civName == otherCivName }){ for (unit in civInfo.getCivUnits().filter { it.currentTile.getOwner()?.civName == otherCivName }) {
unit.movement.teleportToClosestMoveableTile() unit.movement.teleportToClosestMoveableTile()
} }
} }
} }
fun nextTurn(){ fun nextTurn(){
@ -366,6 +365,8 @@ class DiplomacyManager() {
revertToZero(DiplomaticModifiers.UnacceptableDemands, 1 / 4f) revertToZero(DiplomaticModifiers.UnacceptableDemands, 1 / 4f)
revertToZero(DiplomaticModifiers.LiberatedCity, 1 / 8f) revertToZero(DiplomaticModifiers.LiberatedCity, 1 / 8f)
setFriendshipBasedModifier()
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
@ -417,11 +418,11 @@ class DiplomacyManager() {
else thirdCiv.getDiplomacyManager(civInfo).addModifier(DiplomaticModifiers.WarMongerer,-5f) else thirdCiv.getDiplomacyManager(civInfo).addModifier(DiplomaticModifiers.WarMongerer,-5f)
} }
if(hasFlag(DiplomacyFlags.DeclarationOfFriendship)){ if(hasFlag(DiplomacyFlags.DeclarationOfFriendship)) {
removeFlag(DiplomacyFlags.DeclarationOfFriendship) removeFlag(DiplomacyFlags.DeclarationOfFriendship)
otherCivDiplomacy.removeModifier(DiplomaticModifiers.DeclarationOfFriendship) otherCivDiplomacy.removeModifier(DiplomaticModifiers.DeclarationOfFriendship)
for(knownCiv in civInfo.getKnownCivs()){ for (knownCiv in civInfo.getKnownCivs()) {
val amount = if(knownCiv==otherCiv) -40f else -20f val amount = if (knownCiv == otherCiv) -40f else -20f
val diploManager = knownCiv.getDiplomacyManager(civInfo) val diploManager = knownCiv.getDiplomacyManager(civInfo)
diploManager.addModifier(DiplomaticModifiers.BetrayedDeclarationOfFriendship, amount) diploManager.addModifier(DiplomaticModifiers.BetrayedDeclarationOfFriendship, amount)
diploManager.removeModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies) // obviously this guy's declarations of friendship aren't worth much. diploManager.removeModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies) // obviously this guy's declarations of friendship aren't worth much.
@ -520,12 +521,21 @@ class DiplomacyManager() {
for (thirdCiv in getCommonKnownCivs().filter { it.isMajorCiv() }) { for (thirdCiv in getCommonKnownCivs().filter { it.isMajorCiv() }) {
thirdCiv.addNotification("[${civInfo.civName}] and [${otherCiv().civName}] have signed the Declaration of Friendship!", null, Color.WHITE) thirdCiv.addNotification("[${civInfo.civName}] and [${otherCiv().civName}] have signed the Declaration of Friendship!", null, Color.WHITE)
val thirdCivRelationshipWithOtherCiv = thirdCiv.getDiplomacyManager(otherCiv()).relationshipLevel() thirdCiv.getDiplomacyManager(civInfo).setFriendshipBasedModifier()
when(thirdCivRelationshipWithOtherCiv){ }
RelationshipLevel.Unforgivable -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies,-15f) }
RelationshipLevel.Enemy -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies,-5f)
RelationshipLevel.Friend -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies,5f) fun setFriendshipBasedModifier(){
RelationshipLevel.Ally -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies,15f) removeModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies)
removeModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies)
for(thirdCiv in getCommonKnownCivs()
.filter { it.getDiplomacyManager(civInfo).hasFlag(DiplomacyFlags.DeclarationOfFriendship) }) {
val otherCivRelationshipWithThirdCiv = otherCiv().getDiplomacyManager(thirdCiv).relationshipLevel()
when (otherCivRelationshipWithThirdCiv) {
RelationshipLevel.Unforgivable -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies, -15f)
RelationshipLevel.Enemy -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies, -5f)
RelationshipLevel.Friend -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies, 5f)
RelationshipLevel.Ally -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies, 15f)
} }
} }
} }