From 467b0b2570a0624d7530b5bbaba50f6e9c94df2a Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 9 Jun 2022 19:26:12 +0300 Subject: [PATCH] All "attacked city state" functions should only activate when attacking directly, not when declaring war due to alliances --- .../unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index e03f290005..2307d1f08f 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -690,9 +690,8 @@ class DiplomacyManager() { otherCivDiplomacy.setModifier(DiplomaticModifiers.DeclaredWarOnUs, -20f) otherCivDiplomacy.removeModifier(DiplomaticModifiers.ReturnedCapturedUnits) - if (otherCiv.isCityState()) { - if (!indirectCityStateAttack) - otherCivDiplomacy.setInfluence(-60f) + if (otherCiv.isCityState() && !indirectCityStateAttack) { + otherCivDiplomacy.setInfluence(-60f) civInfo.changeMinorCivsAttacked(1) otherCiv.cityStateFunctions.cityStateAttacked(civInfo) }