From 56222a0ea7d7594784e892b4ee87a47e9f93cd75 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Tue, 12 Oct 2021 19:49:12 +0300 Subject: [PATCH] Resolved #5453 - strength bonuses apply from civ bonuses as well --- 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 2463260e3c..00e2970444 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -36,11 +36,15 @@ object BattleDamage { val attackedTile = if (combatAction == CombatAction.Attack) enemy.getTile() else combatant.getTile() + + val conditionalState = StateForConditionals( + civInfo, theirCombatant = enemy, ourCombatant = combatant, + combatAction = combatAction, attackedTile = attackedTile + ) + for (unique in combatant.unit.getMatchingUniques( - UniqueType.Strength, - StateForConditionals( - civInfo, theirCombatant = enemy, ourCombatant = combatant, combatAction = combatAction, attackedTile = attackedTile) - ) + UniqueType.Strength, conditionalState) + + civInfo.getMatchingUniques(UniqueType.Strength, conditionalState) ) { modifiers.add(getModifierStringFromUnique(unique), unique.params[0].toInt()) }