From f1cfe3e9075f9a030b98f80dcf5807e1836b4869 Mon Sep 17 00:00:00 2001
From: itanasi <44038014+itanasi@users.noreply.github.com>
Date: Tue, 19 Apr 2022 23:29:14 -0700
Subject: [PATCH] Add checks against 0 Strength combat (#6564)

* Add checks against 0 Strength combat

* Minimize to 1f to prevent divby0 issues

Co-authored-by: itanasi <spellman23@gmail.com>
---
 .../com/unciv/logic/battle/BattleDamage.kt    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt
index b7f38d0b11..bc52594769 100644
--- a/core/src/com/unciv/logic/battle/BattleDamage.kt
+++ b/core/src/com/unciv/logic/battle/BattleDamage.kt
@@ -11,6 +11,7 @@ import com.unciv.models.translations.tr
 import com.unciv.ui.utils.toPercent
 import java.util.*
 import kotlin.collections.set
+import kotlin.math.max
 import kotlin.math.pow
 import kotlin.math.roundToInt
 
@@ -246,7 +247,7 @@ object BattleDamage {
         defender: ICombatant
     ): Float {
         val attackModifier = modifiersToMultiplicationBonus(getAttackModifiers(attacker, defender))
-        return attacker.getAttackingStrength() * attackModifier
+        return max(1f, attacker.getAttackingStrength() * attackModifier)
     }
 
 
@@ -255,7 +256,7 @@ object BattleDamage {
      */
     private fun getDefendingStrength(attacker: ICombatant, defender: ICombatant): Float {
         val defenceModifier = modifiersToMultiplicationBonus(getDefenceModifiers(attacker, defender))
-        return defender.getDefendingStrength() * defenceModifier
+        return max(1f, defender.getDefendingStrength() * defenceModifier)
     }
 
     fun calculateDamageToAttacker(
@@ -266,11 +267,8 @@ object BattleDamage {
     ): Int {
         if (attacker.isRanged() && !attacker.isAirUnit()) return 0
         if (defender.isCivilian()) return 0
-        val ratio =
-            getAttackingStrength(attacker, defender) / getDefendingStrength(
-                attacker,
-                defender
-            )
+        val ratio = getAttackingStrength(attacker, defender) / getDefendingStrength(
+                attacker, defender)
         return (damageModifier(ratio, true, attacker, ignoreRandomness) * getHealthDependantDamageRatio(defender)).roundToInt()
     }
 
@@ -280,12 +278,9 @@ object BattleDamage {
         defender: ICombatant,
         ignoreRandomness: Boolean = false,
     ): Int {
-        val ratio =
-            getAttackingStrength(attacker, defender) / getDefendingStrength(
-                attacker,
-                defender
-            )
         if (defender.isCivilian()) return 40
+        val ratio = getAttackingStrength(attacker, defender) / getDefendingStrength(
+                attacker, defender)
         return (damageModifier(ratio, false, attacker, ignoreRandomness) * getHealthDependantDamageRatio(attacker)).roundToInt()
     }