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

Defensive pact functionality is now canceled with otherCiv before calling in defensive pact allies (#10238)

Browse Source
This commit is contained in:
Oskar Niesen
2023-10-05 02:24:09 -05:00
committed by GitHub
parent b97339381a
commit 8e355568e0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -770,7 +770,12 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
for (diploManager in civInfo.diplomacy.values) {
if (diploManager.diplomaticStatus != DiplomaticStatus.DefensivePact) continue
// We already removed the trades and we don't want to remove the flags yet.
// Cancel the defensive pact functionality
diploManager.diplomaticStatus = DiplomaticStatus.Peace
diploManager.otherCivDiplomacy().diplomaticStatus = DiplomaticStatus.Peace
// We already removed the trades and functionality
// But we don't want to remove the flags yet so we can process BetrayedDefensivePact later
if (diploManager.otherCiv() != civAtWarWith) {
// Trades with defensive pact are now invalid
val defensivePactOffer = diploManager.trades
@ -779,10 +784,9 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
val theirDefensivePactOffer = diploManager.otherCivDiplomacy().trades
.firstOrNull { trade -> trade.ourOffers.any { offer -> offer.name == Constants.defensivePact } }
diploManager.otherCivDiplomacy().trades.remove(theirDefensivePactOffer)
diploManager.removeFlag(DiplomacyFlags.DefensivePact)
diploManager.otherCivDiplomacy().removeFlag(DiplomacyFlags.DefensivePact)
diploManager.diplomaticStatus = DiplomaticStatus.Peace
diploManager.otherCivDiplomacy().diplomaticStatus = DiplomaticStatus.Peace
}
for (civ in getCommonKnownCivs().filter { civ -> civ.isMajorCiv() || civ.isSpectator() }) {
civ.addNotification("[${civInfo.civName}] canceled their Defensive Pact with [${diploManager.otherCivName}]!",