shop fixes, 'toggle' completely removed, movement speed increased

1 files changed, 8 insertions, 4 deletions

diff --git a/internal/game/cmd_cook.go b/internal/game/cmd_cook.go
index 9b76a84..5b78745 100644
--- a/internal/game/cmd_cook.go
+++ b/internal/game/cmd_cook.go
@@ -9,8 +9,8 @@ import (
 )
 
 func (g *Game) doCook(sess *net.Session, input string) {
-	p := sess.Player.(*player.Player)
-	g.CancelAction(p)
+	p := sess.Player
+	g.cancelAction(p)
 
 	stationDefID, stationName := g.findStation(p.RoomID, []string{"fire", "cooking_range"})
 	if stationDefID == "" {
@@ -66,7 +66,7 @@ func (g *Game) doCook(sess *net.Session, input string) {
 		return
 	}
 
-	sess.PendingMenu = recipeMenuData(recipes)
+	sess.PendingMenu = recipeMenuData(recipeDefIDs(recipes))
 	sess.State = net.StateRecipeChoice
 	var names []string
 	for _, r := range recipes {
@@ -116,7 +116,11 @@ func (g *Game) showCookMenu(sess *net.Session, p *player.Player, allRecipes []ac
 		names = append(names, e.ItemName)
 	}
 	g.showMenuTable(sess, fmt.Sprintf("What would you like to cook on the %s?", stationName), names)
-	sess.PendingMenu = entryMenuData(entries)
+	ids := make([]string, len(entries))
+	for i, e := range entries {
+		ids[i] = e.Recipe.ID
+	}
+	sess.PendingMenu = recipeMenuData(ids)
 }
 
 func (g *Game) recipeName(sess *net.Session, r *action.RecipeDef) string {