mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 11:38:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Show numbers on attack damage

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-11 12:24:00 +02:00
parent 20f64e2ce5
commit b183297a5f
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
View File

@ -186,25 +186,30 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
row() row()
} }
var damageToDefender = BattleDamage.calculateDamageToDefender(attacker, defender, 0.5f) val maxDamageToDefender = BattleDamage.calculateDamageToDefender(attacker, defender, 1f)
var damageToAttacker = BattleDamage.calculateDamageToAttacker(attacker, defender, 0.5f) val minDamageToDefender = BattleDamage.calculateDamageToDefender(attacker, defender, 0f)
var expectedDamageToDefenderForHealthbar = (maxDamageToDefender + minDamageToDefender) / 2
if (damageToAttacker > attacker.getHealth() && damageToDefender > defender.getHealth()) { val maxDamageToAttacker = BattleDamage.calculateDamageToAttacker(attacker, defender, 1f)
val minDamageToAttacker = BattleDamage.calculateDamageToAttacker(attacker, defender, 0f)
var expectedDamageToAttackerForHealthbar = (maxDamageToAttacker + minDamageToAttacker) / 2
if (expectedDamageToAttackerForHealthbar > attacker.getHealth() && expectedDamageToDefenderForHealthbar > defender.getHealth()) {
// when damage exceeds health, we don't want to show negative health numbers // when damage exceeds health, we don't want to show negative health numbers
// Also if both parties are supposed to die it's not indicative of who is more likely to win // Also if both parties are supposed to die it's not indicative of who is more likely to win
// So we "normalize" the damages until one dies // So we "normalize" the damages until one dies
if (damageToDefender * attacker.getHealth() > damageToAttacker * defender.getHealth()) { // defender dies quicker ie first if (expectedDamageToDefenderForHealthbar * attacker.getHealth() > expectedDamageToAttackerForHealthbar * defender.getHealth()) { // defender dies quicker ie first
// Both damages *= (defender.health/damageToDefender) // Both damages *= (defender.health/damageToDefender)
damageToDefender = defender.getHealth() expectedDamageToDefenderForHealthbar = defender.getHealth()
damageToAttacker *= (defender.getHealth() / damageToDefender.toFloat()).toInt() expectedDamageToAttackerForHealthbar *= (defender.getHealth() / expectedDamageToDefenderForHealthbar.toFloat()).toInt()
} else { // attacker dies first } else { // attacker dies first
// Both damages *= (attacker.health/damageToAttacker) // Both damages *= (attacker.health/damageToAttacker)
damageToAttacker = attacker.getHealth() expectedDamageToAttackerForHealthbar = attacker.getHealth()
damageToDefender *= (attacker.getHealth() / damageToAttacker.toFloat()).toInt() expectedDamageToDefenderForHealthbar *= (attacker.getHealth() / expectedDamageToAttackerForHealthbar.toFloat()).toInt()
} }
} }
else if (damageToAttacker > attacker.getHealth()) damageToAttacker = attacker.getHealth() else if (expectedDamageToAttackerForHealthbar > attacker.getHealth()) expectedDamageToAttackerForHealthbar = attacker.getHealth()
else if (damageToDefender > defender.getHealth()) damageToDefender = defender.getHealth() else if (expectedDamageToDefenderForHealthbar > defender.getHealth()) expectedDamageToDefenderForHealthbar = defender.getHealth()
if (attacker.isMelee() && if (attacker.isMelee() &&
(defender.isCivilian() || defender is CityCombatant && defender.isDefeated())) { (defender.isCivilian() || defender is CityCombatant && defender.isDefeated())) {
@ -216,8 +221,11 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
} }
add(defeatedText.toLabel()) add(defeatedText.toLabel())
} else { } else {
add(getHealthBar(attacker.getHealth(), attacker.getMaxHealth(), damageToAttacker)) add(getHealthBar(attacker.getHealth(), attacker.getMaxHealth(), expectedDamageToAttackerForHealthbar))
add(getHealthBar(defender.getHealth(), defender.getMaxHealth(), damageToDefender)) add(getHealthBar(defender.getHealth(), defender.getMaxHealth(), expectedDamageToDefenderForHealthbar)).row()
if (maxDamageToAttacker == 0) add("${attacker.getHealth()}".toLabel())
else add("${attacker.getHealth()} → ${attacker.getHealth()-maxDamageToAttacker}-${attacker.getHealth()-minDamageToAttacker}".toLabel())
add("${defender.getHealth()} → ${defender.getHealth()-maxDamageToDefender}-${defender.getHealth()-minDamageToDefender}".toLabel())
} }
row().pad(5f) row().pad(5f)
@ -247,7 +255,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
attackButton.label.color = Color.GRAY attackButton.label.color = Color.GRAY
} else { } else {
attackButton.onClick(UncivSound.Silent) { // onAttackButtonClicked will do the sound attackButton.onClick(UncivSound.Silent) { // onAttackButtonClicked will do the sound
onAttackButtonClicked(attacker, defender, attackableTile, damageToAttacker, damageToDefender) onAttackButtonClicked(attacker, defender, attackableTile, expectedDamageToAttackerForHealthbar, expectedDamageToDefenderForHealthbar)
} }
} }