From 69b5e0c905f7c956b221411652efee72aa1a9fa7 Mon Sep 17 00:00:00 2001 From: Oskar Niesen Date: Sat, 4 May 2024 13:03:12 -0500 Subject: [PATCH] Fixed city-state alliance join war notification (#11541) --- core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt b/core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt index c6a6353358..5976c4082c 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DeclareWar.kt @@ -82,8 +82,8 @@ object DeclareWar { WarType.DefensivePactWar, WarType.CityStateAllianceWar, WarType.JoinWar -> { val allyCiv = declareWarReason.allyCiv!! otherCiv.popupAlerts.add(PopupAlert(AlertType.WarDeclaration, civInfo.civName)) - val agressor = if (declareWarReason.warType == WarType.JoinWar) civInfo else otherCiv - val defender = if (declareWarReason.warType == WarType.JoinWar) otherCiv else civInfo + val agressor = if (declareWarReason.warType == WarType.DefensivePactWar) otherCiv else civInfo + val defender = if (declareWarReason.warType == WarType.DefensivePactWar) civInfo else otherCiv defender.addNotification("[${agressor.civName}] has joined [${allyCiv.civName}] in the war against us!", NotificationCategory.Diplomacy, NotificationIcon.War, agressor.civName)