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

City-states allied to Civs no longer attempt to declare war when it does on Civs they haven't met yet

Browse Source
This commit is contained in:
Yair Morgenstern
2019-11-09 20:25:30 +02:00
parent 065b7586b2
commit 637b487a2c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Atoll.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 677 B

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

@ -346,14 +346,18 @@ class DiplomacyManager() {
if (!civInfo.isCityState()) { if (!civInfo.isCityState()) {
for (thirdCiv in civInfo.getKnownCivs()) { for (thirdCiv in civInfo.getKnownCivs()) {
if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == civInfo.civName && thirdCiv.getDiplomacyManager(otherCiv).canDeclareWar()) { if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == civInfo.civName
&& thirdCiv.knows(otherCiv)
&& thirdCiv.getDiplomacyManager(otherCiv).canDeclareWar()) {
thirdCiv.getDiplomacyManager(otherCiv).declareWar() thirdCiv.getDiplomacyManager(otherCiv).declareWar()
} }
} }
} }
if (!otherCiv.isCityState()) { if (!otherCiv.isCityState()) {
for (thirdCiv in otherCiv.getKnownCivs()) { for (thirdCiv in otherCiv.getKnownCivs()) {
if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == otherCiv.civName && thirdCiv.getDiplomacyManager(civInfo).canDeclareWar()) { if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == otherCiv.civName
&& thirdCiv.knows(otherCiv)
&& thirdCiv.getDiplomacyManager(civInfo).canDeclareWar()) {
thirdCiv.getDiplomacyManager(civInfo).declareWar() thirdCiv.getDiplomacyManager(civInfo).declareWar()
} }
} }