From 2bd8132b8d67aa508683fa1717448739bae6e64f Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Sun, 10 Oct 2021 16:11:14 +0200
Subject: [PATCH] Made it impossible to cut short peace treaties (#5450)

---
 .../diplomacy/DiplomacyManager.kt             | 25 ++++++++++++++++---
 1 file changed, 22 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 09d1e98b6c..d8671697f2 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
@@ -357,20 +357,27 @@ class DiplomacyManager() {
 
     //region state-changing functions
     fun removeUntenableTrades() {
-
         for (trade in trades.toList()) {
 
             // Every cancelled trade can change this - if 1 resource is missing,
             // don't cancel all trades of that resource, only cancel one (the first one, as it happens, since they're added chronologically)
             val negativeCivResources = civInfo.getCivResources()
-                    .filter { it.amount < 0 }.map { it.resource.name }
+                .filter { it.amount < 0 }.map { it.resource.name }
 
             for (offer in trade.ourOffers) {
                 if (offer.type in listOf(TradeType.Luxury_Resource, TradeType.Strategic_Resource)
-                        && (offer.name in negativeCivResources || !civInfo.gameInfo.ruleSet.tileResources.containsKey(offer.name))) {
+                    && (offer.name in negativeCivResources || !civInfo.gameInfo.ruleSet.tileResources.containsKey(offer.name))
+                ) {
+                    
                     trades.remove(trade)
                     val otherCivTrades = otherCiv().getDiplomacyManager(civInfo).trades
                     otherCivTrades.removeAll { it.equals(trade.reverse()) }
+
+                    // Can't cut short peace treaties!
+                    if (trade.theirOffers.any { it.name == Constants.peaceTreaty }) {
+                        remakePeaceTreaty(trade.theirOffers.first { it.name == Constants.peaceTreaty }.duration)
+                    }
+                    
                     civInfo.addNotification("One of our trades with [$otherCivName] has been cut short", NotificationIcon.Trade, otherCivName)
                     otherCiv().addNotification("One of our trades with [${civInfo.civName}] has been cut short", NotificationIcon.Trade, civInfo.civName)
                     civInfo.updateDetailedCivResources()
@@ -378,6 +385,18 @@ class DiplomacyManager() {
             }
         }
     }
+    
+    private fun remakePeaceTreaty(durationLeft: Int) {
+        val treaty = Trade()
+        treaty.ourOffers.add(
+            TradeOffer(Constants.peaceTreaty, TradeType.Treaty, duration = durationLeft)
+        )
+        treaty.theirOffers.add(
+            TradeOffer(Constants.peaceTreaty, TradeType.Treaty, duration = durationLeft)
+        )
+        trades.add(treaty)
+        otherCiv().getDiplomacyManager(civInfo).trades.add(treaty)
+    }
 
     // for performance reasons we don't want to call this every time we want to see if a unit can move through a tile
     fun updateHasOpenBorders() {