From 94414203ef325467d7530eeb79eb981cc08d2104 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 25 Dec 2019 23:42:32 +0200 Subject: [PATCH] Resolved #1533 - Defeated city states no longer "declare war" if you attack their ally --- .../com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index b2f4deab18..1d5e01e6d4 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -9,9 +9,9 @@ import com.unciv.logic.civilization.PopupAlert import com.unciv.logic.trade.Trade import com.unciv.logic.trade.TradeType import com.unciv.models.ruleset.tile.ResourceSupplyList +import kotlin.math.ceil import kotlin.math.max import kotlin.math.min -import kotlin.math.ceil enum class RelationshipLevel{ Unforgivable, @@ -395,6 +395,7 @@ class DiplomacyManager() { if (!otherCiv.isCityState()) { for (thirdCiv in otherCiv.getKnownCivs()) { if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == otherCiv.civName + && !thirdCiv.isDefeated() && thirdCiv.knows(civInfo) && thirdCiv.getDiplomacyManager(civInfo).canDeclareWar()) { thirdCiv.getDiplomacyManager(civInfo).declareWar()