AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #5453 - strength bonuses apply from civ bonuses as well

Browse Source
This commit is contained in:
yairm210 2021-10-12 19:49:12 +03:00
parent 038c501ac8
commit 56222a0ea7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -36,11 +36,15 @@ object BattleDamage {
val attackedTile = val attackedTile =
if (combatAction == CombatAction.Attack) enemy.getTile() if (combatAction == CombatAction.Attack) enemy.getTile()
else combatant.getTile() else combatant.getTile()
for (unique in combatant.unit.getMatchingUniques(
UniqueType.Strength, val conditionalState = StateForConditionals(
StateForConditionals( civInfo, theirCombatant = enemy, ourCombatant = combatant,
civInfo, theirCombatant = enemy, ourCombatant = combatant, combatAction = combatAction, attackedTile = attackedTile) combatAction = combatAction, attackedTile = attackedTile
) )
for (unique in combatant.unit.getMatchingUniques(
UniqueType.Strength, conditionalState)
+ civInfo.getMatchingUniques(UniqueType.Strength, conditionalState)
) { ) {
modifiers.add(getModifierStringFromUnique(unique), unique.params[0].toInt()) modifiers.add(getModifierStringFromUnique(unique), unique.params[0].toInt())
} }