refactor: remove dead code, consolidate save/error handling, add lint gate

1 files changed, 16 insertions, 16 deletions

diff --git a/internal/game/cmd_farm.go b/internal/game/cmd_farm.go
index aaa3779..dec16c0 100644
--- a/internal/game/cmd_farm.go
+++ b/internal/game/cmd_farm.go
@@ -138,13 +138,13 @@ func (g *Game) doPlant(sess *net.Session, input string) {
 		},
 	}
 
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 }
 
 func (g *Game) doHarvest(sess *net.Session, input string) {
 	p := sess.Player
 
-	prefix, _, _ := g.findFarmPatch(sess, p, input, func(flags map[string]any, prefix string) bool {
+	prefix := g.findFarmPatch(p, input, func(flags map[string]any, prefix string) bool {
 		ready, _ := flags[prefix+"_ready"].(bool)
 		return ready
 	})
@@ -223,7 +223,7 @@ func (g *Game) doHarvest(sess *net.Session, input string) {
 		},
 	}
 
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 }
 
 func (g *Game) doRake(sess *net.Session, input string) {
@@ -234,7 +234,7 @@ func (g *Game) doRake(sess *net.Session, input string) {
 		return
 	}
 
-	prefix, _, _ := g.findFarmPatch(sess, p, input, func(flags map[string]any, prefix string) bool {
+	prefix := g.findFarmPatch(p, input, func(flags map[string]any, prefix string) bool {
 		weeds, _ := flags[prefix+"_weeds"].(bool)
 		dead, _ := flags[prefix+"_dead"].(bool)
 		return weeds || dead
@@ -268,7 +268,7 @@ func (g *Game) doRake(sess *net.Session, input string) {
 		},
 	}
 
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 }
 
 func (g *Game) doWater(sess *net.Session, input string) {
@@ -279,7 +279,7 @@ func (g *Game) doWater(sess *net.Session, input string) {
 		return
 	}
 
-	prefix, _, _ := g.findFarmPatch(sess, p, input, func(flags map[string]any, prefix string) bool {
+	prefix := g.findFarmPatch(p, input, func(flags map[string]any, prefix string) bool {
 		seed, _ := flags[prefix+"_seed"].(string)
 		if seed == "" {
 			return false
@@ -327,7 +327,7 @@ func (g *Game) doWater(sess *net.Session, input string) {
 		},
 	}
 
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 }
 
 func (g *Game) doCure(sess *net.Session, input string) {
@@ -338,7 +338,7 @@ func (g *Game) doCure(sess *net.Session, input string) {
 		return
 	}
 
-	prefix, _, _ := g.findFarmPatch(sess, p, input, func(flags map[string]any, prefix string) bool {
+	prefix := g.findFarmPatch(p, input, func(flags map[string]any, prefix string) bool {
 		diseased, _ := flags[prefix+"_diseased"].(bool)
 		return diseased
 	})
@@ -370,7 +370,7 @@ func (g *Game) doCure(sess *net.Session, input string) {
 		},
 	}
 
-	g.AccountStore.SaveCharacter(p)
+	g.saveCharacter(p)
 }
 
 func (g *Game) ShowFarmPatchDetail(sess *net.Session, p *player.Player, prefix, defID string, index int) {
@@ -436,10 +436,10 @@ func boolToYes(b bool) string {
 	return "No"
 }
 
-func (g *Game) findFarmPatch(sess *net.Session, p *player.Player, input string, matcher func(map[string]any, string) bool) (prefix string, defID string, index int) {
+func (g *Game) findFarmPatch(p *player.Player, input string, matcher func(map[string]any, string) bool) (prefix string) {
 	objInstances := g.World.AllObjInstances(p.RoomID)
 	if len(objInstances) == 0 {
-		return "", "", -1
+		return ""
 	}
 
 	type patchInfo struct {
@@ -478,24 +478,24 @@ func (g *Game) findFarmPatch(sess *net.Session, p *player.Player, input string,
 	}
 
 	if len(patches) == 0 {
-		return "", "", -1
+		return ""
 	}
 
 	if input == "" {
-		return patches[0].prefix, patches[0].defID, patches[0].index
+		return patches[0].prefix
 	}
 
 	lower := strings.ToLower(input)
 	for _, pi := range patches {
 		if strings.Contains(lower, strings.ToLower(pi.name)) {
-			return pi.prefix, pi.defID, pi.index
+			return pi.prefix
 		}
 	}
 	for _, pi := range patches {
 		if strings.Contains(lower, pi.prefix) {
-			return pi.prefix, pi.defID, pi.index
+			return pi.prefix
 		}
 	}
 
-	return "", "", -1
+	return ""
 }