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

Resolved #11803 - units teleport out of open borders on war declaration

Browse Source
This commit is contained in:
Yair Morgenstern 2024-06-21 12:25:10 +03:00
parent 3558917dfc
commit f10bc07260
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt
View File

@ -135,6 +135,9 @@ object DeclareWar {
diplomacyManager.trades.clear()
diplomacyManager.civInfo.tradeRequests.removeAll { it.requestingCiv == diplomacyManager.otherCivName }
// Must come *before* state is "at war" so units know they're not allowed in tiles without open borders anymore
diplomacyManager.updateHasOpenBorders()
val civAtWarWith = diplomacyManager.otherCiv()
// If we attacked, then we need to end all of our defensive pacts acording to Civ 5
@ -154,8 +157,6 @@ object DeclareWar {
diplomacyManager.civInfo.cityStateFunctions.removeProtectorCiv(civAtWarWith, forced = true)
}
diplomacyManager.updateHasOpenBorders()
diplomacyManager.removeModifier(DiplomaticModifiers.YearsOfPeace)
diplomacyManager.setFlag(DiplomacyFlags.DeclinedPeace, diplomacyManager.civInfo.gameInfo.ruleset.modOptions.constants.minimumWarDuration) // AI won't propose peace for 10 turns
diplomacyManager.setFlag(DiplomacyFlags.DeclaredWar, diplomacyManager.civInfo.gameInfo.ruleset.modOptions.constants.minimumWarDuration) // AI won't agree to trade for 10 turns
@ -327,7 +328,7 @@ enum class WarType {
DefensivePactWar,
/** A civilization has joined a war through a trade.*/
JoinWar,
/** Two civilizations are starting a war through a trade. */
/** Two civilizations are starting a war through a trade. */
TeamWar,
}