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

Resolved #10004 - Defensive pact allies *meet* the aggressor civ so they can declare war on them, if they haven't already met

Browse Source
This commit is contained in:
Yair Morgenstern
2023-08-30 23:14:51 +03:00
parent 5585dfa470
commit 96e96cf449
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,6 @@ import com.unciv.Constants
import com.unciv.logic.IsPartOfGameInfoSerialization import com.unciv.logic.IsPartOfGameInfoSerialization
import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.AlertType
import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Civilization
import com.unciv.logic.civilization.DiplomacyAction
import com.unciv.logic.civilization.LocationAction
import com.unciv.logic.civilization.NotificationCategory import com.unciv.logic.civilization.NotificationCategory
import com.unciv.logic.civilization.NotificationIcon import com.unciv.logic.civilization.NotificationIcon
import com.unciv.logic.civilization.PopupAlert import com.unciv.logic.civilization.PopupAlert
@ -803,6 +801,7 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
&& !ourDipManager.otherCiv().isAtWarWith(civAtWarWith) && !ourDipManager.otherCiv().isAtWarWith(civAtWarWith)
}) { }) {
val ally = ourDefensivePact.otherCiv() val ally = ourDefensivePact.otherCiv()
if (!civAtWarWith.knows(ally)) civAtWarWith.diplomacyFunctions.makeCivilizationsMeet(ally, true)
// Have the aggressor declare war on the ally. // Have the aggressor declare war on the ally.
civAtWarWith.getDiplomacyManager(ally).declareWar(true) civAtWarWith.getDiplomacyManager(ally).declareWar(true)
// Notify the aggressor // Notify the aggressor