From 06dd395efb73aba909dcf53fc327b72dbcd6e5ac Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Tue, 30 Nov 2021 13:42:19 +0100
Subject: [PATCH] Fixed a bug where statue off Zeus would not work (#5732)

---
 .../jsons/Civ V - Gods & Kings/Buildings.json   |  2 +-
 .../assets/jsons/Civ V - Vanilla/Buildings.json |  2 +-
 core/src/com/unciv/logic/battle/BattleDamage.kt | 17 -----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/android/assets/jsons/Civ V - Gods & Kings/Buildings.json b/android/assets/jsons/Civ V - Gods & Kings/Buildings.json
index 97bf9bdbaf..535203b2bb 100644
--- a/android/assets/jsons/Civ V - Gods & Kings/Buildings.json	
+++ b/android/assets/jsons/Civ V - Gods & Kings/Buildings.json	
@@ -205,7 +205,7 @@
 		"name": "Statue of Zeus",
 		"culture": 1,
 		"isWonder": true,
-		"uniques": ["[+15]% Strength <for [All] units> <vs Cities> <when attacking>"],
+		"uniques": ["[+15]% Strength <for [All] units> <vs cities> <when attacking>"],
 		"requiredTech": "Bronze Working",
 		"quote": "'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad"
 		// "Requires [Honor]" in BNW
diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json
index 1821a54dbc..079d0a01c7 100644
--- a/android/assets/jsons/Civ V - Vanilla/Buildings.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json	
@@ -186,7 +186,7 @@
 		"name": "Statue of Zeus",
 		"culture": 1,
 		"isWonder": true,
-		"uniques": ["[+15]% Strength <for [All] units> <vs Cities> <when attacking>"],
+		"uniques": ["[+15]% Strength <for [All] units> <vs cities> <when attacking>"],
 		"requiredTech": "Bronze Working",
 		"quote": "'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad"
 		// "Requires [Honor]" in BNW
diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt
index 2b37aabcd1..2e17662bf5 100644
--- a/core/src/com/unciv/logic/battle/BattleDamage.kt
+++ b/core/src/com/unciv/logic/battle/BattleDamage.kt
@@ -60,23 +60,6 @@ object BattleDamage {
                 modifiers.add("${unique.sourceObjectName} (${unique.sourceObjectType})", effect)
             }
 
-            // Deprecated since 3.17.3
-            for (unique in
-            combatant.unit.getMatchingUniques("+[]% Strength vs []")
-            ) {
-                if (enemy.matchesCategory(unique.params[1]))
-                    modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt())
-            }
-            for (unique in combatant.unit.getMatchingUniques("-[]% Strength vs []")
-            ) {
-                if (enemy.matchesCategory(unique.params[1]))
-                    modifiers.add("vs [${unique.params[1]}]", -unique.params[0].toInt())
-            }
-
-            for (unique in combatant.unit.getMatchingUniques("+[]% Combat Strength"))
-                modifiers.add("Combat Strength", unique.params[0].toInt())
-            //
-
             //https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php
             val civHappiness = if (civInfo.isCityState() && civInfo.getAllyCiv() != null)
             // If we are a city state with an ally we are vulnerable to their unhappiness.