Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to -[amount] HP for battle notifications

Browse Source 
Update Unseen Interceptor Notification
This commit is contained in:
itanasi 2022-08-05 22:12:37 -07:00
parent 71bf858734
commit 63961029da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -403,9 +403,9 @@ object Battle {
if (defender.isDefeated() && attacker.isRanged()) " the defence of [" + defender.getName() + "]"
else " [" + defender.getName() + "]"
else " our [" + defender.getName() + "]"
val attackerDealtString = if (damageDealt != null) " ([-${damageDealt.attackerDealt}] HP)" else ""
val defenderDealtString = if (damageDealt != null) " ([-${damageDealt.defenderDealt}] HP)" else ""
val notificationString = attackerString + defenderDealtString + whatHappenedString + defenderString + attackerDealtString
val attackerHurtString = if (damageDealt != null) " ([-${damageDealt.defenderDealt}] HP)" else ""
val defenderHurtString = if (damageDealt != null) " ([-${damageDealt.attackerDealt}] HP)" else ""
val notificationString = attackerString + attackerHurtString + whatHappenedString + defenderString + defenderHurtString
val attackerIcon = if (attacker is CityCombatant) NotificationIcon.City else attacker.getName()
val defenderIcon = if (defender is CityCombatant) NotificationIcon.City else defender.getName()
val locations = LocationAction(attackedTile.position, attackerTile?.position)