AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 03:23:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed city-state alliance join war notification (#11541)

Browse Source
This commit is contained in:
Oskar Niesen 2024-05-04 13:03:12 -05:00 committed by GitHub
parent 5291c5b79a
commit 69b5e0c905
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)