From 591fd9c13892de6f9e1290fdc1a4df4b7b8e9e46 Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Wed, 16 Jun 2021 17:49:27 +0200
Subject: [PATCH] Fixed honor policy not adding bonus vs barbarians (#4160)

* Fixed honor policy not adding bonus vs barbarians

* Implemented requested changes
---
 core/src/com/unciv/logic/battle/BattleDamage.kt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt
index 9cd1dc00f4..e0a1a0cdb7 100644
--- a/core/src/com/unciv/logic/battle/BattleDamage.kt
+++ b/core/src/com/unciv/logic/battle/BattleDamage.kt
@@ -20,7 +20,10 @@ object BattleDamage {
 
         val civInfo = combatant.getCivInfo()
         if (combatant is MapUnitCombatant) {
-            for (unique in combatant.unit.getMatchingUniques("+[]% Strength vs []")) {
+            for (unique in 
+                    combatant.unit.getMatchingUniques("+[]% Strength vs []") +
+                    civInfo.getMatchingUniques("+[]% Strength vs []")
+            ) {
                 if (enemy.matchesCategory(unique.params[1]))
                     modifiers.add("vs [${unique.params[1]}]", unique.params[0].toInt())
             }
@@ -94,9 +97,10 @@ object BattleDamage {
             modifiers["Difficulty"] =
                 (civInfo.gameInfo.getDifficulty().barbarianBonus * 100).toInt()
             // Deprecated since 3.14.17
-            if (civInfo.hasUnique("+25% bonus vs Barbarians")) {
-                modifiers["vs Barbarians (deprecated)"] = 25
-            }
+                if (civInfo.hasUnique("+25% bonus vs Barbarians")) {
+                    modifiers["vs Barbarians (deprecated)"] = 25
+                }
+            //
         }
 
         return modifiers