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

1 files changed, 7 insertions, 7 deletions

diff --git a/internal/game/action_search.go b/internal/game/action_search.go
index 884157e..d7dabe0 100644
--- a/internal/game/action_search.go
+++ b/internal/game/action_search.go
@@ -53,7 +53,7 @@ func (g *Game) advanceSearch(sess *net.Session, p *player.Player) {
 	def, err := g.ItemStore.Load(itemID)
 	if err != nil {
 		sess.WriteLine("Something went wrong.")
-		g.CancelAction(p)
+		g.cancelAction(p)
 		return
 	}
 
@@ -70,7 +70,7 @@ func (g *Game) advanceSearch(sess *net.Session, p *player.Player) {
 	slot := p.InvSlot(slotIdx)
 	if slot == nil || slot.ItemID != itemID || slot.Quantity <= 0 {
 		sess.WriteLine("The item is gone.")
-		g.CancelAction(p)
+		g.cancelAction(p)
 		return
 	}
 
@@ -80,18 +80,18 @@ func (g *Game) advanceSearch(sess *net.Session, p *player.Player) {
 		p.SetInvSlot(slotIdx, nil)
 	}
 
-	dt, err := g.BehaviorStore.LoadDropTable(def.SearchTable)
+	dt, err := action.LoadDropTable(g.DataDir, def.SearchTable)
 	if err == nil && len(dt.Drops) > 0 {
-		drop := g.BehaviorStore.ResolveDrop(dt.Drops)
+		drop := action.ResolveDrop(g.DataDir, dt.Drops)
 		if drop != nil && drop.ItemID != "" {
 			g.giveSearchLoot(sess, p, drop)
 		}
 	}
 
 	if def.SearchMiscTable != "" {
-		dt2, err := g.BehaviorStore.LoadDropTable(def.SearchMiscTable)
+		dt2, err := action.LoadDropTable(g.DataDir, def.SearchMiscTable)
 		if err == nil && len(dt2.Drops) > 0 {
-			drop := g.BehaviorStore.ResolveDrop(dt2.Drops)
+			drop := action.ResolveDrop(g.DataDir, dt2.Drops)
 			if drop != nil && drop.ItemID != "" {
 				g.giveSearchLoot(sess, p, drop)
 			}
@@ -99,7 +99,7 @@ func (g *Game) advanceSearch(sess *net.Session, p *player.Player) {
 	}
 
 	g.AccountStore.SaveCharacter(p)
-	g.CancelAction(p)
+	g.cancelAction(p)
 }
 
 func (g *Game) giveSearchLoot(sess *net.Session, p *player.Player, drop *action.DropEntry) {