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

"Street fighter" style of health bars

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-14 20:13:43 +02:00
parent b6215690b7
commit 1f0fd6ab1f
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,8 +230,8 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
} }
add(defeatedText.toLabel()) add(defeatedText.toLabel())
} else { } else {
add(getHealthBar(attacker.getHealth(), attacker.getMaxHealth(), maxDamageToAttacker, minDamageToAttacker)) add(getHealthBar(attacker.getHealth(), attacker.getMaxHealth(), maxDamageToAttacker, minDamageToAttacker, true))
add(getHealthBar(defender.getHealth(), defender.getMaxHealth(), maxDamageToDefender, minDamageToDefender)).row() add(getHealthBar(defender.getHealth(), defender.getMaxHealth(), maxDamageToDefender, minDamageToDefender, false)).row()
val attackerHealth = attacker.getHealth() val attackerHealth = attacker.getHealth()
val minRemainingLifeAttacker = max(attackerHealth-maxDamageToAttacker, 0) val minRemainingLifeAttacker = max(attackerHealth-maxDamageToAttacker, 0)
@ -393,8 +393,8 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
row().pad(2f) row().pad(2f)
} }
add(getHealthBar(attacker.getHealth(), attacker.getMaxHealth(), 0,0)) add(getHealthBar(attacker.getHealth(), attacker.getMaxHealth(), 0,0, true))
add(getHealthBar(attacker.getMaxHealth(), attacker.getMaxHealth(), 0,0)) add(getHealthBar(attacker.getMaxHealth(), attacker.getMaxHealth(), 0,0, false))
row().pad(5f) row().pad(5f)
val attackButton = "Air Sweep".toTextButton().apply { color = Color.RED } val attackButton = "Air Sweep".toTextButton().apply { color = Color.RED }

18
core/src/com/unciv/ui/worldscreen/bottombar/BattleTableHelpers.kt
View File

@ -63,14 +63,13 @@ object BattleTableHelpers {
)) ))
} }
fun getHealthBar(currentHealth: Int, maxHealth: Int, maxDamage: Int, minDamage: Int): Table { fun getHealthBar(currentHealth: Int, maxHealth: Int, maxDamage: Int, minDamage: Int, leftToRight:Boolean): Table {
val healthBar = Table() val healthBar = Table()
val totalWidth = 100f val totalWidth = 100f
fun addHealthToBar(image: Image, amount:Int) { fun addHealthToBar(image: Image, amount:Int) {
val width = totalWidth * amount / maxHealth val width = totalWidth * amount / maxHealth
healthBar.add(image).size(width.coerceIn(0f, totalWidth),3f) healthBar.add(image).size(width.coerceIn(0f, totalWidth),3f)
} }
addHealthToBar(ImageGetter.getDot(Color.BLACK), maxHealth - currentHealth)
val damagedHealth = ImageGetter.getDot(Color.FIREBRICK) val damagedHealth = ImageGetter.getDot(Color.FIREBRICK)
if (UncivGame.Current.settings.continuousRendering) { if (UncivGame.Current.settings.continuousRendering) {
@ -79,15 +78,24 @@ object BattleTableHelpers {
Actions.color(Color.BLACK, 0.7f), Actions.color(Color.BLACK, 0.7f),
Actions.color(Color.FIREBRICK, 0.7f) Actions.color(Color.FIREBRICK, 0.7f)
))) } ))) }
addHealthToBar(damagedHealth, maxDamage - minDamage)
val maybeDamagedHealth = ImageGetter.getDot(Color.ORANGE) val maybeDamagedHealth = ImageGetter.getDot(Color.ORANGE)
addHealthToBar(maybeDamagedHealth, minDamage)
val remainingHealth = currentHealth - minDamage val remainingHealth = currentHealth - minDamage
val remainingHealthDot = ImageGetter.getWhiteDot() val remainingHealthDot = ImageGetter.getWhiteDot()
remainingHealthDot.color = Color.GREEN remainingHealthDot.color = Color.GREEN
addHealthToBar(remainingHealthDot ,remainingHealth)
if (leftToRight) {
addHealthToBar(ImageGetter.getDot(Color.BLACK), maxHealth - currentHealth)
addHealthToBar(damagedHealth, maxDamage - minDamage)
addHealthToBar(maybeDamagedHealth, minDamage)
addHealthToBar(remainingHealthDot, remainingHealth)
} else {
addHealthToBar(remainingHealthDot, remainingHealth)
addHealthToBar(maybeDamagedHealth, minDamage)
addHealthToBar(damagedHealth, maxDamage - minDamage)
addHealthToBar(ImageGetter.getDot(Color.BLACK), maxHealth - currentHealth)
}
healthBar.pack() healthBar.pack()
return healthBar return healthBar