From 2f7fa6ba5cb7f6fbadf72459975e494b0cde03c7 Mon Sep 17 00:00:00 2001
From: WhoIsJohannes <126110113+WhoIsJohannes@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:58:01 +0200
Subject: [PATCH] Civs should not go all-out war if they're weaker than barbs
 (#9267)

---
 .../logic/automation/civilization/NextTurnAutomation.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
index b2cfdcadd9..680e6b2466 100644
--- a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
+++ b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
@@ -985,8 +985,10 @@ object NextTurnAutomation {
 
     private fun automateCities(civInfo: Civilization) {
         val ownMilitaryStrength = civInfo.getStatForRanking(RankingType.Force)
-        val sumOfEnemiesMilitaryStrength = civInfo.gameInfo.civilizations.filter { it != civInfo }
-            .filter { civInfo.isAtWarWith(it) }.sumOf { it.getStatForRanking(RankingType.Force) }
+        val sumOfEnemiesMilitaryStrength =
+                civInfo.gameInfo.civilizations
+                    .filter { it != civInfo && !it.isBarbarian() && civInfo.isAtWarWith(it) }
+                    .sumOf { it.getStatForRanking(RankingType.Force) }
         val civHasSignificantlyWeakerMilitaryThanEnemies =
                 ownMilitaryStrength < sumOfEnemiesMilitaryStrength * 0.66f
         for (city in civInfo.cities) {