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

All "attacked city state" functions should only activate when attacking directly, not when declaring war due to alliances

Browse Source
This commit is contained in:
Yair Morgenstern
2022-06-09 19:26:12 +03:00
parent 6c463797d8
commit 467b0b2570
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,9 +690,8 @@ class DiplomacyManager() {
otherCivDiplomacy.setModifier(DiplomaticModifiers.DeclaredWarOnUs, -20f) otherCivDiplomacy.setModifier(DiplomaticModifiers.DeclaredWarOnUs, -20f)
otherCivDiplomacy.removeModifier(DiplomaticModifiers.ReturnedCapturedUnits) otherCivDiplomacy.removeModifier(DiplomaticModifiers.ReturnedCapturedUnits)
if (otherCiv.isCityState()) { if (otherCiv.isCityState() && !indirectCityStateAttack) {
if (!indirectCityStateAttack) otherCivDiplomacy.setInfluence(-60f)
otherCivDiplomacy.setInfluence(-60f)
civInfo.changeMinorCivsAttacked(1) civInfo.changeMinorCivsAttacked(1)
otherCiv.cityStateFunctions.cityStateAttacked(civInfo) otherCiv.cityStateFunctions.cityStateAttacked(civInfo)
} }