From e4400c5f1e84c18d2126f2cb502ae10685977cbb Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Sat, 20 Jun 2026 03:20:01 -0400 Subject: refactor: combined all station crafting --- internal/game/action_farm.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'internal/game/action_farm.go') diff --git a/internal/game/action_farm.go b/internal/game/action_farm.go index d79150f..21604aa 100644 --- a/internal/game/action_farm.go +++ b/internal/game/action_farm.go @@ -51,7 +51,7 @@ func (g *Game) ensureFarmState(p *player.Player, prefix string) { } } -func (g *Game) findActiveFarmPrefixes(p *player.Player) []string { +func (g *Game) findFarmPrefixes(p *player.Player) []string { seen := make(map[string]bool) var prefixes []string for key := range p.Flags { @@ -94,7 +94,7 @@ func (g *Game) FarmTick() { } func (g *Game) advanceFarmGrowth(sess *net.Session, p *player.Player) { - prefixes := g.findActiveFarmPrefixes(p) + prefixes := g.findFarmPrefixes(p) for _, prefix := range prefixes { seedID, _ := p.Flags[prefix+"_seed"].(string) if seedID == "" { @@ -492,7 +492,7 @@ func (g *Game) farmMatchPrefix(p *player.Player, input string) (prefix string, d return "", "", -1 } -func (g *Game) farmLookSuffixForObj(p *player.Player, defID string, index int) string { +func (g *Game) farmObjSuffix(p *player.Player, defID string, index int) string { if defID == "tool_shed" { return g.toolShedLookSuffix(p) } @@ -538,7 +538,7 @@ func (g *Game) showFarmPatches(sess *net.Session, p *player.Player) { g.ensureFarmState(p, prefix) idxStr := "" - if obj.Index > 0 || g.countFarmPatchesOfType(objInstances, obj.DefID) > 1 { + if obj.Index > 0 || g.countPatchesByType(objInstances, obj.DefID) > 1 { idxStr = fmt.Sprintf(" %d", obj.Index+1) } @@ -618,7 +618,7 @@ func (g *Game) showFarmPatches(sess *net.Session, p *player.Player) { } } -func (g *Game) countFarmPatchesOfType(instances []world.ObjState, defID string) int { +func (g *Game) countPatchesByType(instances []world.ObjState, defID string) int { count := 0 for _, obj := range instances { if obj.DefID == defID && farmPatchDefIDs[obj.DefID] { -- cgit v1.2.3