From 478ea310b4b75c626fd53071142cfc173cff2cce Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 19 Dec 2020 21:01:35 +0200
Subject: [PATCH] City-states make peace with enemies when their alllies do

---
 .../diplomacy/DiplomacyManager.kt             | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
index 03db306b31..1fd504b34a 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
@@ -522,9 +522,24 @@ class DiplomacyManager() {
         }
     }
 
-    fun makePeace() {
+    /** Should only be called from makePeace */
+    private fun makePeaceOneSide() {
         diplomaticStatus = DiplomaticStatus.Peace
-        otherCivDiplomacy().diplomaticStatus = DiplomaticStatus.Peace
+        val otherCiv = otherCiv()
+        // Get out of others' territory
+        for (unit in civInfo.getCivUnits().filter { it.getTile().getOwner() == otherCiv })
+            unit.movement.teleportToClosestMoveableTile()
+
+        // Our ally city states make peace with us
+        for (thirdCiv in civInfo.getKnownCivs())
+            if (thirdCiv.getAllyCiv() == civInfo.civName && thirdCiv.isAtWarWith(otherCiv))
+                thirdCiv.getDiplomacyManager(otherCiv).makePeace()
+    }
+
+
+    fun makePeace() {
+        makePeaceOneSide()
+        otherCivDiplomacy().makePeaceOneSide()
 
         for (civ in getCommonKnownCivs()) {
             civ.addNotification(
@@ -533,15 +548,6 @@ class DiplomacyManager() {
                     Color.WHITE
             )
         }
-
-        val otherCiv = otherCiv()
-        // We get out of their territory
-        for (unit in civInfo.getCivUnits().filter { it.getTile().getOwner() == otherCiv })
-            unit.movement.teleportToClosestMoveableTile()
-
-        // And we get out of theirs
-        for (unit in otherCiv.getCivUnits().filter { it.getTile().getOwner() == civInfo })
-            unit.movement.teleportToClosestMoveableTile()
     }
 
     fun hasFlag(flag:DiplomacyFlags) = flagsCountdown.containsKey(flag.name)