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

1 files changed, 170 insertions, 0 deletions

diff --git a/internal/game/cmd_registry.go b/internal/game/cmd_registry.go
new file mode 100644
index 0000000..e5bf30e
--- /dev/null
+++ b/internal/game/cmd_registry.go
@@ -0,0 +1,170 @@
+package game
+
+import (
+	"fmt"
+	"strings"
+
+	"thehouseoficarus/internal/net"
+)
+
+type commandHandler func(g *Game, sess *net.Session, args []string, rawInput string)
+
+type commandDef struct {
+	handler commandHandler
+	class   CommandClass
+}
+
+var commandRegistry = map[string]commandDef{
+	"get":    {(*Game).executeGet, ClassActive},
+	"take":   {(*Game).executeGet, ClassActive},
+	"grab":   {(*Game).executeGet, ClassActive},
+	"pick":   {(*Game).executeGet, ClassActive},
+	"drop":   {(*Game).executeDrop, ClassActive},
+	"attack": {(*Game).executeAttack, ClassActive},
+	"kill":   {(*Game).executeAttack, ClassActive},
+	"style":  {(*Game).executeStyle, ClassInstant},
+	"look":   {(*Game).executeLook, ClassInstant},
+	"l":      {(*Game).executeLook, ClassInstant},
+	"north":  {(*Game).executeMove, ClassActive},
+	"n":      {(*Game).executeMove, ClassActive},
+	"south":  {(*Game).executeMove, ClassActive},
+	"s":      {(*Game).executeMove, ClassActive},
+	"east":   {(*Game).executeMove, ClassActive},
+	"e":      {(*Game).executeMove, ClassActive},
+	"west":   {(*Game).executeMove, ClassActive},
+	"w":      {(*Game).executeMove, ClassActive},
+	"up":     {(*Game).executeMove, ClassActive},
+	"u":      {(*Game).executeMove, ClassActive},
+	"down":   {(*Game).executeMove, ClassActive},
+	"d":      {(*Game).executeMove, ClassActive},
+	"say":    {(*Game).executeSay, ClassInstant},
+	"sc":     {(*Game).executeScore, ClassInstant},
+	"score":  {(*Game).executeScore, ClassInstant},
+	"task":   {(*Game).executeTask, ClassInstant},
+	"stats":  {(*Game).executeStats, ClassInstant},
+	"tech":   {(*Game).executeTech, ClassInstant},
+	"t":      {(*Game).executeTech, ClassInstant},
+	"i":      {(*Game).executeInventory, ClassInstant},
+	"inv":    {(*Game).executeInventory, ClassInstant},
+	"inventory": {(*Game).executeInventory, ClassInstant},
+	"quit":   {(*Game).executeQuit, ClassActive},
+	"description": {(*Game).executeDescription, ClassInstant},
+	"desc":   {(*Game).executeDescription, ClassInstant},
+	"option": {(*Game).executeOption, ClassInstant},
+	"options": {(*Game).executeOption, ClassInstant},
+	"color":  {(*Game).executeColor, ClassInstant},
+	"colors": {(*Game).executeColor, ClassInstant},
+	"colortable": {(*Game).executeColortable, ClassInstant},
+	"prompt": {(*Game).executePrompt, ClassInstant},
+	"exits":  {(*Game).executeExits, ClassInstant},
+	"map":    {(*Game).executeMap, ClassInstant},
+	"queued": {(*Game).executeQueued, ClassInstant},
+	"help":   {(*Game).executeHelp, ClassInstant},
+	"mine":   {(*Game).executeGather, ClassActive},
+	"chop":   {(*Game).executeGather, ClassActive},
+	"fish":   {(*Game).executeGather, ClassActive},
+	"cut":    {(*Game).executeGather, ClassActive},
+	"pull":   {(*Game).executeUse, ClassActive},
+	"push":   {(*Game).executeUse, ClassActive},
+	"use":    {(*Game).executeUse, ClassActive},
+	"cook":   {(*Game).executeCook, ClassActive},
+	"smelt":  {(*Game).executeSmelt, ClassActive},
+	"smith":  {(*Game).executeSmith, ClassActive},
+	"craft":  {(*Game).executeCraft, ClassActive},
+	"eat":    {(*Game).executeEat, ClassFree},
+	"drink":  {(*Game).executeDrink, ClassFree},
+	"fletch": {(*Game).executeFletch, ClassFree},
+	"clean":  {(*Game).executeClean, ClassFree},
+	"mix":    {(*Game).executeMix, ClassActive},
+	"id":     {(*Game).executeIdentify, ClassActive},
+	"identify": {(*Game).executeIdentify, ClassActive},
+	"autotrigger": {(*Game).executeAutotrigger, ClassInstant},
+	"auto":      {(*Game).executeAutotrigger, ClassInstant},
+	"mods":      {(*Game).executeMods, ClassInstant},
+	"modlist":   {(*Game).executeMods, ClassInstant},
+	"mod":       {(*Game).executeMods, ClassInstant},
+	"sneak":     {(*Game).executeSneak, ClassInstant},
+	"trigger":   {(*Game).executeTrigger, ClassActive},
+	"talk":   {(*Game).executeTalk, ClassActive},
+	"speak":  {(*Game).executeTalk, ClassActive},
+	"ask":    {(*Game).executeTalk, ClassActive},
+	"burn":   {(*Game).executeBurn, ClassActive},
+	"stoke":  {(*Game).executeStoke, ClassActive},
+	"alias":  {(*Game).executeAlias, ClassInstant},
+	"unalias": {(*Game).executeUnalias, ClassInstant},
+	"search": {(*Game).executeSearch, ClassActive},
+	"steal":  {(*Game).executeSteal, ClassActive},
+	"thieve": {(*Game).executeSteal, ClassActive},
+	"plant":  {(*Game).executePlant, ClassActive},
+	"harvest": {(*Game).executeHarvest, ClassActive},
+	"rake":   {(*Game).executeRake, ClassActive},
+	"water":  {(*Game).executeWater, ClassActive},
+	"cure":   {(*Game).executeCure, ClassActive},
+	"inspect": {(*Game).executeInspect, ClassInstant},
+	"walk":   {(*Game).executeWalk, ClassActive},
+	"bank":   {(*Game).executeBank, ClassActive},
+	"construct": {(*Game).executeConstruct, ClassActive},
+	"make":   {(*Game).executeConstruct, ClassActive},
+	"jack":   {(*Game).executeJack, ClassActive},
+	"jackin": {(*Game).executeJack, ClassActive},
+	"eq":     {(*Game).executeWear, ClassFree},
+	"equipment": {(*Game).executeWear, ClassFree},
+	"equip":  {(*Game).executeWear, ClassFree},
+	"wear":   {(*Game).executeWear, ClassFree},
+	"wield":  {(*Game).executeWear, ClassFree},
+	"remove": {(*Game).executeRemove, ClassFree},
+	"unwear": {(*Game).executeRemove, ClassFree},
+	"unwield": {(*Game).executeRemove, ClassFree},
+}
+
+func classifyCommand(cmd string) CommandClass {
+	if def, ok := commandRegistry[cmd]; ok {
+		return def.class
+	}
+	if _, ok := verbAliases[cmd]; ok {
+		return ClassActive
+	}
+	if obstacleVerbs[cmd] {
+		return ClassActive
+	}
+	return ClassUnknown
+}
+
+func (g *Game) executeCommand(sess *net.Session, cmd string, args []string, rawInput string) {
+	if def, ok := commandRegistry[cmd]; ok {
+		def.handler(g, sess, args, rawInput)
+		return
+	}
+
+	if obstacleVerbs[cmd] {
+		g.doObstacle(sess, cmd)
+		return
+	}
+
+	p := sess.Player
+	if a, ok := verbAliases[cmd]; ok {
+		g.cancelAction(p)
+		switch a {
+		case "gather":
+			if len(args) == 0 {
+				target := g.resolveDefaultTarget(p.RoomID, cmd)
+				if target == "" {
+					sess.WriteLine(fmt.Sprintf("%s what?", cmd))
+					return
+				}
+				g.startAction(sess, cmd, target)
+			} else {
+				g.startAction(sess, cmd, strings.Join(args, " "))
+			}
+		case "talk":
+			if len(args) == 0 {
+				sess.WriteLine("Talk to whom?")
+			} else {
+				g.startAction(sess, "talk", strings.Join(args, " "))
+			}
+		}
+		return
+	}
+
+	sess.WriteLine("Unknown command.")
+}