1 files changed, 2 insertions, 12 deletions
diff --git a/internal/game/action_default_target.go b/internal/game/action_default_target.go
index b3825ca..2ca0bd3 100644
--- a/internal/game/action_default_target.go
+++ b/internal/game/action_default_target.go
@@ -30,21 +30,11 @@ func (g *Game) resolveDefaultTarget(roomID int, verb string) string {
 		seen[st.DefID] = true
 
 		objDef, err := g.ObjectStore.Load(st.DefID)
-		if err != nil || objDef.BehaviorID == "" {
+		if err != nil || !objDef.IsGatherable() {
 			continue
 		}
 
-		bh, err := g.BehaviorStore.Load(objDef.BehaviorID)
-		if err != nil || bh.Type != "gather" {
-			continue
-		}
-
-		cfg, err := g.BehaviorStore.LoadGather(objDef.BehaviorID)
-		if err != nil {
-			continue
-		}
-
-		if strings.EqualFold(cfg.Skill, skill) {
+		if strings.EqualFold(objDef.Gather.Skill, skill) {
 			candidates = append(candidates, candidate{defID: st.DefID, name: objDef.Name})
 		}
 	}