From abd612c15799f604e671e83dc7c410ed2b44185f Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Thu, 25 Jun 2026 15:40:48 -0400 Subject: slop refactor --- internal/game/cmd_use.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'internal/game/cmd_use.go') diff --git a/internal/game/cmd_use.go b/internal/game/cmd_use.go index a2cddaf..64f35c0 100644 --- a/internal/game/cmd_use.go +++ b/internal/game/cmd_use.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "thehouseoficarus/internal/item" "thehouseoficarus/internal/net" - "thehouseoficarus/internal/object" "thehouseoficarus/internal/player" ) @@ -114,9 +114,9 @@ func (g *Game) useRoomObject(sess *net.Session, p *player.Player, input string) return true } -func (g *Game) stationRecipes(p *player.Player, stationDefID string) []*object.ItemDef { +func (g *Game) stationRecipes(p *player.Player, stationDefID string) []*item.ItemDef { items := g.CraftIndex.ByStation(stationDefID) - var results []*object.ItemDef + var results []*item.ItemDef for _, item := range items { c := item.FirstCraft() if !craftHasAllItemsQty(c, p.CountItem) { @@ -137,7 +137,7 @@ func (g *Game) stationRecipes(p *player.Player, stationDefID string) []*object.I return results } -func (g *Game) showRecipeMenu(sess *net.Session, p *player.Player, items []*object.ItemDef, stationName string) { +func (g *Game) showRecipeMenu(sess *net.Session, p *player.Player, items []*item.ItemDef, stationName string) { if len(items) == 0 { sess.WriteLine(fmt.Sprintf("You don't have anything you can make at the %s.", stationName)) return @@ -214,7 +214,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, cType = recipes[0].FirstCraft().Type } if cType == "smelting" { - var filtered []*object.ItemDef + var filtered []*item.ItemDef for _, item := range recipes { c := item.FirstCraft() if c.Type != "smelting" { @@ -237,7 +237,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, g.promptHowMany(sess, filtered[0].ID) return } - sess.PendingMenu = itemMenuData(itemIDs(filtered)) + sess.PendingMenu = itemMenuData(itemIDs(filtered)) sess.State = net.StateRecipeChoice var names []string for _, item := range filtered { @@ -258,7 +258,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, g.promptHowMany(sess, recipes[0].ID) return } - sess.PendingMenu = itemMenuData(itemIDs(recipes)) + sess.PendingMenu = itemMenuData(itemIDs(recipes)) sess.State = net.StateRecipeChoice var names []string for _, item := range recipes { @@ -328,7 +328,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, } if len(craftItems) > 0 { - var available []*object.ItemDef + var available []*item.ItemDef for _, item := range craftItems { if g.canDoItem(p, item, player.Crafting) { available = append(available, item) @@ -345,7 +345,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, } if len(fletchItems) > 0 { - var available []*object.ItemDef + var available []*item.ItemDef for _, item := range fletchItems { if g.canDoFletchItem(p, item) { available = append(available, item) @@ -362,7 +362,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, } matched := g.CraftIndex.FindByTwoInputs(itemAID, itemBID) - var matchable []*object.ItemDef + var matchable []*item.ItemDef for _, item := range matched { if craftHasAllItemsQty(item.FirstCraft(), p.CountItem) { matchable = append(matchable, item) @@ -373,7 +373,7 @@ func (g *Game) doUseItemOnTarget(sess *net.Session, p *player.Player, itemAName, return } if len(matchable) > 1 { - sess.PendingMenu = itemMenuData(itemIDs(matchable)) + sess.PendingMenu = itemMenuData(itemIDs(matchable)) sess.State = net.StateRecipeChoice var names []string for _, item := range matchable { -- cgit v1.2.3