refactor: pulled techs out to yaml files, unified numerous combat functions, broke up game object

1 files changed, 5 insertions, 6 deletions

diff --git a/internal/game/cmd_consume.go b/internal/game/cmd_consume.go
index 223d803..f45b912 100644
--- a/internal/game/cmd_consume.go
+++ b/internal/game/cmd_consume.go
@@ -64,12 +64,12 @@ func (g *Game) doEat(sess *net.Session, input string) {
 
 	g.cancelAction(p)
 
-	g.consumeQueue[p.Name] = &QueuedCommand{
+	g.queue.EnqueueConsume(p.Name, QueuedCommand{
 		Session:   sess,
 		Command:   "eat",
 		Args:      itemID,
 		Timestamp: time.Now(),
-	}
+	})
 
 	if !p.OptionBool("queue_silently") {
 		sess.WriteLine(fmt.Sprintf("You prepare to eat %s.", g.itemColorize(sess, def, def.Name)))
@@ -113,11 +113,10 @@ func (g *Game) doEatNow(sess *net.Session, p *player.Player, itemID string, def
 }
 
 func (g *Game) processConsumeQueue(p *player.Player, sess *net.Session) bool {
-	qc, ok := g.consumeQueue[p.Name]
+	qc, ok := g.queue.DrainConsume(p.Name)
 	if !ok {
 		return false
 	}
-	delete(g.consumeQueue, p.Name)
 
 	itemID := qc.Args
 	def, err := g.ItemStore.Load(itemID)
@@ -202,12 +201,12 @@ func (g *Game) doDrink(sess *net.Session, args []string) {
 
 	g.cancelAction(p)
 
-	g.consumeQueue[p.Name] = &QueuedCommand{
+	g.queue.EnqueueConsume(p.Name, QueuedCommand{
 		Session:   sess,
 		Command:   "drink",
 		Args:      itemID,
 		Timestamp: time.Now(),
-	}
+	})
 
 	if !p.OptionBool("queue_silently") {
 		sess.WriteLine(fmt.Sprintf("You prepare to drink the %s.", g.itemColorize(sess, def, def.Name)))