mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-18 19:59:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add checks against 0 Strength combat (#6564)

Browse Source 
* Add checks against 0 Strength combat

* Minimize to 1f to prevent divby0 issues

Co-authored-by: itanasi <spellman23@gmail.com>
This commit is contained in:
itanasi
2022-04-19 23:29:14 -07:00
committed by GitHub
parent e1363d92f9
commit f1cfe3e907
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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()
}