From 1dad15698845d370e998f7cc5feb8aece3fab58f Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Wed, 16 Sep 2026 17:05:17 -0400
Subject: refactor: remove dead code, consolidate save/error handling, add lint
 gate

---
 internal/game/combat_mob.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/internal/game/combat_mob.go b/internal/game/combat_mob.go
index 7d60a11..c53d847 100644
--- a/internal/game/combat_mob.go
+++ b/internal/game/combat_mob.go
@@ -139,7 +139,7 @@ func (g *Game) applyMobHit(sess *net.Session, p *player.Player, mob *world.MobIn
 			if cs != nil && !cs.DamageWarningShown {
 				cs.DamageWarningShown = true
 				fbName := g.itemDisplayName(mob.DamageWithout)
-				attacker := mobDisplayNameCap(mob, true)
+				attacker := mobDisplayNameCap(mob)
 				sess.WriteLine(g.colorize(sess, "warning",
 					fmt.Sprintf("  %s's attack is extra effective! Equip %s for protection.",
 						attacker, fbName)))
@@ -152,9 +152,9 @@ func (g *Game) applyMobHit(sess *net.Session, p *player.Player, mob *world.MobIn
 		p.HP = 0
 	}
 	p.StartRegen()
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 
-	attacker := mobDisplayNameCap(mob, true)
+	attacker := mobDisplayNameCap(mob)
 	mobName := mobDisplayName(mob, true)
 	prefix := fmt.Sprintf("%s hits you for %s damage.", g.colorize(sess, "mob", attacker), g.colorize(sess, "damage_taken", g.dmgDisplay(sess, dmg)))
 	prefix = padCombatPrefix(prefix,
@@ -174,7 +174,7 @@ func (g *Game) applyMobHit(sess *net.Session, p *player.Player, mob *world.MobIn
 			sess.WriteLine(g.colorize(sess, "miss",
 				fmt.Sprintf("You power through %s's relentless attacks and just flee!",
 					mobDisplayName(mob, false))))
-			g.beginEscapeMove(sess, p)
+			g.beginEscapeMove(p)
 		} else {
 			p.ClearEscape()
 			p.WalkSequence = nil
@@ -205,11 +205,11 @@ func padCombatPrefix(prefix, plainSelf, plainOther string) string {
 }
 
 func (g *Game) applyMobMiss(sess *net.Session, p *player.Player, mob *world.MobInstance) {
-	attacker := mobDisplayNameCap(mob, true)
+	attacker := mobDisplayNameCap(mob)
 	sess.WriteLine(g.colorize(sess, "miss", fmt.Sprintf("%s misses you.", attacker)))
 
 	if p.EscapeDir != "" {
-		g.beginEscapeMove(sess, p)
+		g.beginEscapeMove(p)
 	}
 }
 
@@ -238,7 +238,7 @@ func (g *Game) endCombat(sess *net.Session, p *player.Player, mob *world.MobInst
 	g.scheduleMobRespawn(mob)
 
 	if p.EscapeDir != "" {
-		g.beginEscapeMove(sess, p)
+		g.beginEscapeMove(p)
 		return
 	}
 
@@ -280,7 +280,7 @@ func (g *Game) announceKill(sess *net.Session, p *player.Player, mob *world.MobI
 func (g *Game) awardKillDrops(sess *net.Session, p *player.Player, mob *world.MobInstance, isTask bool) {
 	dropLabel := "You receive:"
 	if !isTask {
-		dropLabel = mobDisplayNameCap(mob, true) + " drops:"
+		dropLabel = mobDisplayNameCap(mob) + " drops:"
 	}
 
 	writeDrop := func(itemID string, qty int) {
@@ -373,7 +373,7 @@ func (g *Game) killPlayer(sess *net.Session, p *player.Player, mob *world.MobIns
 	p.HP = p.MaxHP()
 	p.RunEnergy = p.MaxRunEnergy()
 	p.RoomID = g.StartingRoom
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 	if g.Hub != nil {
 		g.Hub.EnterRoom(sess, p.RoomID)
 	}
@@ -412,7 +412,7 @@ func (g *Game) awardCombatXP(sess *net.Session, p *player.Player, dmg int, isRan
 	for _, gain := range gains {
 		g.awardSkillXP(sess, p, player.SkillName(gain.Skill), gain.XP)
 	}
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 	return gains
 }
 
@@ -432,7 +432,7 @@ func (g *Game) stopCombat(playerName string) {
 // escape, and that branch is itself gated on moveTicks returning > 0; the
 // Cape-of-Agility / GodMode 0-tick bypass never enters the stash path, so there
 // is no 0-tick branch to handle here.
-func (g *Game) beginEscapeMove(sess *net.Session, p *player.Player) {
+func (g *Game) beginEscapeMove(p *player.Player) {
 	p.MoveDirection = p.EscapeDir
 	p.MoveTarget = p.EscapeTarget
 	p.MovePendingTrigger = p.EscapeTrigger
-- 
cgit v1.2.3