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 #6175 - attack randomness is turn and tile based to avoid save-scumming

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-16 12:29:28 +02:00
parent 9d0db40bbf
commit c41410812a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ object BattleDamage {
attacker, attacker,
defender defender
) )
return (damageModifier(ratio, true) * getHealthDependantDamageRatio(defender)).roundToInt() return (damageModifier(ratio, true, attacker) * getHealthDependantDamageRatio(defender)).roundToInt()
} }
fun calculateDamageToDefender( fun calculateDamageToDefender(
@ -309,17 +309,22 @@ object BattleDamage {
defender defender
) )
if (defender.isCivilian()) return 40 if (defender.isCivilian()) return 40
return (damageModifier(ratio, false) * getHealthDependantDamageRatio(attacker)).roundToInt() return (damageModifier(ratio, false, attacker) * getHealthDependantDamageRatio(attacker)).roundToInt()
} }
private fun damageModifier(attackerToDefenderRatio: Float, damageToAttacker: Boolean): Float { private fun damageModifier(
attackerToDefenderRatio: Float,
damageToAttacker: Boolean,
attacker: ICombatant // for the randomness
): Float {
// https://forums.civfanatics.com/threads/getting-the-combat-damage-math.646582/#post-15468029 // https://forums.civfanatics.com/threads/getting-the-combat-damage-math.646582/#post-15468029
val strongerToWeakerRatio = val strongerToWeakerRatio =
attackerToDefenderRatio.pow(if (attackerToDefenderRatio < 1) -1 else 1) attackerToDefenderRatio.pow(if (attackerToDefenderRatio < 1) -1 else 1)
var ratioModifier = (((strongerToWeakerRatio + 3) / 4).pow(4) + 1) / 2 var ratioModifier = (((strongerToWeakerRatio + 3) / 4).pow(4) + 1) / 2
if (damageToAttacker && attackerToDefenderRatio > 1 || !damageToAttacker && attackerToDefenderRatio < 1) // damage ratio from the weaker party is inverted if (damageToAttacker && attackerToDefenderRatio > 1 || !damageToAttacker && attackerToDefenderRatio < 1) // damage ratio from the weaker party is inverted
ratioModifier = ratioModifier.pow(-1) ratioModifier = ratioModifier.pow(-1)
val randomCenteredAround30 = 24 + 12 * Random().nextFloat() val randomSeed = attacker.getCivInfo().gameInfo.turns * attacker.getTile().position.hashCode() // so people don't save-scum to get optimal results
val randomCenteredAround30 = 24 + 12 * Random(randomSeed.toLong()).nextFloat()
return randomCenteredAround30 * ratioModifier return randomCenteredAround30 * ratioModifier
} }
} }