From 00153ab45608390757e10117f136b2d800e0fc02 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 13 Jun 2019 14:38:31 +0300
Subject: [PATCH] Culture-oriented AI much more predisposed to peace agreements

---
 android/build.gradle                          |  4 +-
 .../logic/automation/NextTurnAutomation.kt    | 66 +++++++++----------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 72d30993b6..d8ac87c205 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 256
-        versionName "2.17.5"
+        versionCode 257
+        versionName "2.17.6"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
index bd03597f5b..c8935db31c 100644
--- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
+++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
@@ -233,46 +233,44 @@ class NextTurnAutomation{
     }
 
     private fun offerPeaceTreaty(civInfo: CivilizationInfo) {
-        if (civInfo.cities.isNotEmpty() && civInfo.diplomacy.isNotEmpty()) {
+        if (!civInfo.isAtWar() || civInfo.cities.isEmpty() || civInfo.diplomacy.isEmpty()) return
 
-            val ourCombatStrength = Automation().evaluteCombatStrength(civInfo)
-            if (civInfo.isAtWar()) { //evaluate peace
-                val enemiesCiv = civInfo.diplomacy.filter{ it.value.diplomaticStatus == DiplomaticStatus.War }
-                        .map{ it.value.otherCiv() }
-                        .filterNot{ it == civInfo || it.isBarbarianCivilization() || it.cities.isEmpty() }
-                        .filter { !civInfo.getDiplomacyManager(it).hasFlag(DiplomacyFlags.DeclinedPeace) }
+        val ourCombatStrength = Automation().evaluteCombatStrength(civInfo)
+        val enemiesCiv = civInfo.diplomacy.filter { it.value.diplomaticStatus == DiplomaticStatus.War }
+                .map { it.value.otherCiv() }
+                .filterNot { it == civInfo || it.isBarbarianCivilization() || it.cities.isEmpty() }
+                .filter { !civInfo.getDiplomacyManager(it).hasFlag(DiplomacyFlags.DeclinedPeace) }
 
-                for (enemy in enemiesCiv) {
-                    val enemiesStrength = Automation().evaluteCombatStrength(enemy)
-                    if (enemiesStrength < ourCombatStrength * 2) {
-                        continue //We're losing, but can still fight. Refuse peace.
-                    }
+        for (enemy in enemiesCiv) {
+            val enemiesStrength = Automation().evaluteCombatStrength(enemy)
+            if (civInfo.getNation().preferredVictoryType!=VictoryType.Cultural
+                    && enemiesStrength < ourCombatStrength*2 ) {
+                continue //We're losing, but can still fight. Refuse peace.
+            }
 
-                    // pay for peace
-                    val tradeLogic = TradeLogic(civInfo, enemy)
+            // pay for peace
+            val tradeLogic = TradeLogic(civInfo, enemy)
 
-                    tradeLogic.currentTrade.ourOffers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty, 30))
-                    tradeLogic.currentTrade.theirOffers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty, 30))
+            tradeLogic.currentTrade.ourOffers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty, 30))
+            tradeLogic.currentTrade.theirOffers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty, 30))
 
-                    var moneyWeNeedToPay = -TradeEvaluation().evaluatePeaceCostForThem(civInfo,enemy)
-                    if(moneyWeNeedToPay>0) {
-                        if (moneyWeNeedToPay > civInfo.gold && civInfo.gold > 0) { // we need to make up for this somehow...
-                            moneyWeNeedToPay = civInfo.gold
-                        }
-                        if (civInfo.gold > 0) tradeLogic.currentTrade.ourOffers.add(TradeOffer("Gold".tr(), TradeType.Gold, 0, moneyWeNeedToPay))
-                    }
-
-                    if(enemy.isPlayerCivilization())
-                        enemy.tradeRequests.add(TradeRequest(civInfo.civName,tradeLogic.currentTrade.reverse()))
-
-                    else {
-                        if (enemy.getCivUnits().filter { !it.type.isCivilian() }.size > enemy.cities.size
-                                && enemy.happiness > 0) {
-                            continue //enemy AI has too large army and happiness. It continues to fight for profit.
-                        }
-                        tradeLogic.acceptTrade()
-                    }
+            var moneyWeNeedToPay = -TradeEvaluation().evaluatePeaceCostForThem(civInfo, enemy)
+            if (moneyWeNeedToPay > 0) {
+                if (moneyWeNeedToPay > civInfo.gold && civInfo.gold > 0) { // we need to make up for this somehow...
+                    moneyWeNeedToPay = civInfo.gold
                 }
+                if (civInfo.gold > 0) tradeLogic.currentTrade.ourOffers.add(TradeOffer("Gold".tr(), TradeType.Gold, 0, moneyWeNeedToPay))
+            }
+
+            if (enemy.isPlayerCivilization())
+                enemy.tradeRequests.add(TradeRequest(civInfo.civName, tradeLogic.currentTrade.reverse()))
+            else {
+                if (enemy.getNation().preferredVictoryType!=VictoryType.Cultural
+                        && enemy.getCivUnits().filter { !it.type.isCivilian() }.size > enemy.cities.size
+                        && enemy.happiness > 0) {
+                    continue //enemy AI has too large army and happiness. It continues to fight for profit.
+                }
+                tradeLogic.acceptTrade()
             }
         }
     }