From e4400c5f1e84c18d2126f2cb502ae10685977cbb Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Sat, 20 Jun 2026 03:20:01 -0400
Subject: refactor: combined all station crafting

---
 internal/game/cmd_attack.go | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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

diff --git a/internal/game/cmd_attack.go b/internal/game/cmd_attack.go
index f9cfba2..89cde46 100644
--- a/internal/game/cmd_attack.go
+++ b/internal/game/cmd_attack.go
@@ -126,7 +126,7 @@ func (g *Game) findMob(sess *net.Session, input string, roomID int) *world.MobIn
 
 func (g *Game) startCombat(sess *net.Session, p *player.Player, mob *world.MobInstance) {
 	g.cancelRest(p.Name)
-	g.cancelBackgroundAction(p)
+	g.cancelBgAction(p)
 
 	combat.EnterCombat(p.Name, mob.InstanceID)
 	p.AttackTimer = 0
@@ -162,13 +162,7 @@ func (g *Game) startCombat(sess *net.Session, p *player.Player, mob *world.MobIn
 	}
 	p.ActionState = &ActionState{Type: ActionCombating, TargetName: mob.Name}
 
-	if g.Hub != nil {
-		for _, other := range g.Hub.PlayersInRoom(p.RoomID) {
-			if other != sess && other.Player != nil {
-				other.WriteLine(g.colorize(other, "broadcast", fmt.Sprintf("\n%s attacks %s!", p.Name, mobDisplayName(mob, true))))
-			}
-		}
-	}
+	g.broadcastAction(sess, "\n%s attacks %s!", p.Name, mobDisplayName(mob, true))
 
 	g.Ticks.Subscribe(1, func() bool {
 		cs := combat.GetCombat(p.Name)
@@ -567,7 +561,7 @@ func (g *Game) endCombat(sess *net.Session, p *player.Player, mob *world.MobInst
 		}
 
 		if mob.Drops.Remains != "" {
-			g.World.AddReservedGroundItem(p.RoomID, mob.Drops.Remains, 1, p.Name)
+			g.World.AddReservedItem(p.RoomID, mob.Drops.Remains, 1, p.Name)
 			def, _ := g.ItemStore.Load(mob.Drops.Remains)
 			name := mob.Drops.Remains
 			if def != nil {
@@ -588,7 +582,7 @@ func (g *Game) endCombat(sess *net.Session, p *player.Player, mob *world.MobInst
 				if qty <= 0 {
 					qty = 1
 				}
-				g.World.AddReservedGroundItem(p.RoomID, entry.ItemID, qty, p.Name)
+				g.World.AddReservedItem(p.RoomID, entry.ItemID, qty, p.Name)
 				def, _ := g.ItemStore.Load(entry.ItemID)
 				name := entry.ItemID
 				if def != nil {
-- 
cgit v1.2.3