From e4bc2de6e6aa507044a6a75b4c1954974539a857 Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Sun, 21 Jun 2026 02:26:57 -0400
Subject: feat: combat health bar. color improvements.

---
 internal/game/cmd_trigger_combat.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'internal/game/cmd_trigger_combat.go')

diff --git a/internal/game/cmd_trigger_combat.go b/internal/game/cmd_trigger_combat.go
index 444f80d..2086235 100644
--- a/internal/game/cmd_trigger_combat.go
+++ b/internal/game/cmd_trigger_combat.go
@@ -62,12 +62,12 @@ func (g *Game) scienceAttack(sess *net.Session, p *player.Player, mob *world.Mob
 		g.AccountStore.SaveCharacter(p)
 
 		mobName := mobDisplayName(mob, true)
-		prefix := fmt.Sprintf("  %s hits %s for %s damage.",
+		prefix := fmt.Sprintf("%s hits %s for %s damage.",
 			g.colorize(sess, "science_mod", mod.Name),
-			g.colorize(sess, "mob_name", mobName),
-			g.colorize(sess, "damage", fmt.Sprint(dmg)))
-		hpPart := fmt.Sprintf("[%s/%dhp]", g.colorize(sess, "enemy_hp", fmt.Sprint(mob.HP)), mob.MaxHP)
-		line := prefix + " " + hpPart
+			g.colorize(sess, "mob", mobName),
+			g.colorize(sess, "damage_dealt", fmt.Sprint(dmg)))
+		hpSuffix := fmt.Sprintf("%s [%2d/%d]", g.hpBar(sess, mob.HP, mob.MaxHP), mob.HP, mob.MaxHP)
+		line := prefix + " " + hpSuffix
 		if p.OptionBool("xp_drops") && len(gains) > 0 {
 			var parts []string
 			for _, gain := range gains {
@@ -77,7 +77,7 @@ func (g *Game) scienceAttack(sess *net.Session, p *player.Player, mob *world.Mob
 		}
 		sess.WriteLine(line)
 	} else {
-		sess.WriteLine(g.colorize(sess, "miss", fmt.Sprintf("  %s fails to connect.", mod.Name)))
+		sess.WriteLine(g.colorize(sess, "miss", fmt.Sprintf("%s fails to connect.", mod.Name)))
 	}
 	return true
 }
-- 
cgit v1.2.3