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

36 files changed, 851 insertions, 86 deletions

diff --git a/data/objects/adamantite_rock.yaml b/data/objects/adamantite_rock.yaml
index 04f2f0c..4869a77 100644
--- a/data/objects/adamantite_rock.yaml
+++ b/data/objects/adamantite_rock.yaml
@@ -1,4 +1,23 @@
+color: "120"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: adamantite_ore
+          message: You manage to mine some {120}adamantite ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the adamantite rock...
+    level: 70
+    respawn_broadcast: A green glint of adamantite catches your eye from some {name}.
+    respawn_timer: 140
+    skill: mining
+    success:
+        base: 0.15
+        cap: 0.85
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 95
 id: adamantite_rock
 name: adamantite rock
-color: "120"
-behavior: mine_adamantite
diff --git a/data/objects/allotment_patch.yaml b/data/objects/allotment_patch.yaml
index 9d905b0..1074abe 100644
--- a/data/objects/allotment_patch.yaml
+++ b/data/objects/allotment_patch.yaml
@@ -1,7 +1,6 @@
 id: allotment_patch
 name: allotment patch
 color: "94"
-behavior: ""
 hidden: false
 inroom_description: "An allotment patch is marked out in the ground."
 description: "A large patch of soil for growing vegetables. Use 'inspect' to check its status."
diff --git a/data/objects/anglerfish_spot.yaml b/data/objects/anglerfish_spot.yaml
index 3385ac4..4829307 100644
--- a/data/objects/anglerfish_spot.yaml
+++ b/data/objects/anglerfish_spot.yaml
@@ -1,5 +1,23 @@
+color: "81"
+description: A faint glow emanates from the depths. Use a fishing rod with bait here.
+gather:
+    bait: fishing_bait
+    base_wait: 6
+    drops:
+        - item_id: raw_anglerfish
+          level: 82
+          message: You catch a {80}raw anglerfish{/}.
+          weight: 100
+          xp: 120
+    fail_message: Nothing seems to bite.
+    gather_message: You cast your line into the deep water...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.3
+        cap: 0.8
+        per_level: 0.005
+    tools:
+        - fishing_rod
 id: anglerfish_spot
 name: anglerfish spot
-color: "81"
-behavior: fish_angler
-description: "A faint glow emanates from the depths. Use a fishing rod with bait here."
diff --git a/data/objects/bait_fishing_spot.yaml b/data/objects/bait_fishing_spot.yaml
index 9ca3fba..8e506a8 100644
--- a/data/objects/bait_fishing_spot.yaml
+++ b/data/objects/bait_fishing_spot.yaml
@@ -1,5 +1,33 @@
+color: "75"
+description: Small fish ripple the surface. Use a fishing rod with bait here.
+gather:
+    bait: fishing_bait
+    base_wait: 5
+    drops:
+        - item_id: raw_sardine
+          level: 5
+          message: You catch a {75}raw sardine{/}.
+          weight: 60
+          xp: 20
+        - item_id: raw_herring
+          level: 10
+          message: You catch a {75}raw herring{/}.
+          weight: 40
+          xp: 30
+        - item_id: raw_pike
+          level: 25
+          message: You catch a {69}raw pike{/}.
+          weight: 30
+          xp: 60
+    fail_message: Nothing seems to bite.
+    gather_message: You cast your line into the water...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.5
+        cap: 0.9
+        per_level: 0.005
+    tools:
+        - fishing_rod
 id: bait_fishing_spot
 name: bait fishing spot
-color: "75"
-behavior: fish_bait
-description: "Small fish ripple the surface. Use a fishing rod with bait here."
diff --git a/data/objects/cage_fishing_spot.yaml b/data/objects/cage_fishing_spot.yaml
index 05e3e0e..691bb54 100644
--- a/data/objects/cage_fishing_spot.yaml
+++ b/data/objects/cage_fishing_spot.yaml
@@ -1,5 +1,22 @@
+color: "75"
+description: A rocky underwater shelf. Use a lobster pot here.
+gather:
+    base_wait: 6
+    drops:
+        - item_id: raw_lobster
+          level: 40
+          message: You catch a {33}raw lobster{/}.
+          weight: 100
+          xp: 90
+    fail_message: The pot comes up empty.
+    gather_message: You lower your lobster pot into the water...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.45
+        cap: 0.85
+        per_level: 0.005
+    tools:
+        - lobster_pot
 id: cage_fishing_spot
 name: cage fishing spot
-color: "75"
-behavior: fish_cage
-description: "A rocky underwater shelf. Use a lobster pot here."
diff --git a/data/objects/clay_rock.yaml b/data/objects/clay_rock.yaml
index 8a69d3b..70cfc4e 100644
--- a/data/objects/clay_rock.yaml
+++ b/data/objects/clay_rock.yaml
@@ -1,5 +1,24 @@
+color: "173"
+description: A soft rock of clay.
+gather:
+    base_wait: 4
+    drops:
+        - depletes: true
+          item_id: clay
+          message: You manage to mine some clay.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the clay rock...
+    level: 1
+    respawn_broadcast: Some clay fills in a nearby rock.
+    respawn_timer: 10
+    skill: mining
+    success:
+        base: 0.6
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 5
 id: clay_rock
 name: clay rock
-color: "173"
-behavior: mine_clay
-description: "A soft rock of clay."
diff --git a/data/objects/coal_rock.yaml b/data/objects/coal_rock.yaml
index 5bccc0e..f033965 100644
--- a/data/objects/coal_rock.yaml
+++ b/data/objects/coal_rock.yaml
@@ -1,4 +1,23 @@
+color: "240"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: coal
+          message: You manage to mine some {240}coal{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the coal rock...
+    level: 30
+    respawn_broadcast: A dark vein of coal is visible in some {name}.
+    respawn_timer: 80
+    skill: mining
+    success:
+        base: 0.3
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 50
 id: coal_rock
 name: coal rock
-color: "240"
-behavior: mine_coal
diff --git a/data/objects/copper_rock.yaml b/data/objects/copper_rock.yaml
index 0162181..aa2a5cc 100644
--- a/data/objects/copper_rock.yaml
+++ b/data/objects/copper_rock.yaml
@@ -1,4 +1,28 @@
+color: "178"
+gather:
+    base_wait: 10
+    depleted_message: You don't see any ore in this rock.
+    drops:
+        - depletes: true
+          item_id: copper_ore
+          message: You manage to mine some {178}copper ore{/}.
+          weight: 90
+        - depletes: false
+          message: You spot a glint of something valuable!
+          table: gem_table
+          weight: 10
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the rock...
+    level: 1
+    respawn_broadcast: A glint of copper catches your eye from some {name}.
+    respawn_timer: 50
+    skill: mining
+    success:
+        base: 0.5
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 17
 id: copper_rock
 name: copper rock
-color: "178"
-behavior: mine_copper
diff --git a/data/objects/fire.yaml b/data/objects/fire.yaml
index a214dc7..864b7a8 100644
--- a/data/objects/fire.yaml
+++ b/data/objects/fire.yaml
@@ -1,7 +1,6 @@
 id: fire
 name: fire
 color: "208"
-behavior: ""
 hidden: false
 inroom_description: "A fire is burning warmly."
 removal_item: ashes
diff --git a/data/objects/flower_patch.yaml b/data/objects/flower_patch.yaml
index c5f6d42..6d4ee70 100644
--- a/data/objects/flower_patch.yaml
+++ b/data/objects/flower_patch.yaml
@@ -1,7 +1,6 @@
 id: flower_patch
 name: flower patch
 color: "213"
-behavior: ""
 hidden: false
 inroom_description: "A flower patch is outlined with small stones."
 description: "A small decorative patch for growing flowers. Use 'inspect' to check its status."
diff --git a/data/objects/fly_fishing_spot.yaml b/data/objects/fly_fishing_spot.yaml
index 1634ab5..88fc61b 100644
--- a/data/objects/fly_fishing_spot.yaml
+++ b/data/objects/fly_fishing_spot.yaml
@@ -1,5 +1,33 @@
+color: "75"
+description: Insects dance above the water. Use a fly fishing rod with feathers here.
+gather:
+    bait: feather
+    base_wait: 5
+    drops:
+        - item_id: raw_trout
+          level: 20
+          message: You catch a {69}raw trout{/}.
+          weight: 50
+          xp: 50
+        - item_id: raw_salmon
+          level: 30
+          message: You catch a {69}raw salmon{/}.
+          weight: 50
+          xp: 70
+        - item_id: raw_rainbow_fish
+          level: 38
+          message: You catch a {177}raw rainbow fish{/}.
+          weight: 30
+          xp: 80
+    fail_message: Nothing seems to bite.
+    gather_message: You cast your fly into the water...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.5
+        cap: 0.9
+        per_level: 0.005
+    tools:
+        - fly_rod
 id: fly_fishing_spot
 name: fly fishing spot
-color: "75"
-behavior: fish_fly
-description: "Insects dance above the water. Use a fly fishing rod with feathers here."
diff --git a/data/objects/gold_rock.yaml b/data/objects/gold_rock.yaml
index d57be8f..cc3c816 100644
--- a/data/objects/gold_rock.yaml
+++ b/data/objects/gold_rock.yaml
@@ -1,4 +1,23 @@
+color: "220"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: gold_ore
+          message: You manage to mine some {220}gold ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the gold rock...
+    level: 40
+    respawn_broadcast: A golden glint catches your eye from some {name}.
+    respawn_timer: 90
+    skill: mining
+    success:
+        base: 0.25
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 65
 id: gold_rock
 name: gold rock
-color: "220"
-behavior: mine_gold
diff --git a/data/objects/harpoon_fishing_spot.yaml b/data/objects/harpoon_fishing_spot.yaml
index 4df56b9..2a059e9 100644
--- a/data/objects/harpoon_fishing_spot.yaml
+++ b/data/objects/harpoon_fishing_spot.yaml
@@ -1,5 +1,32 @@
+color: "75"
+description: Large shadows move beneath the waves. Use a harpoon here.
+gather:
+    base_wait: 6
+    drops:
+        - item_id: raw_tuna
+          level: 35
+          message: You harpoon a {33}raw tuna{/}.
+          weight: 60
+          xp: 80
+        - item_id: raw_swordfish
+          level: 50
+          message: You harpoon a {33}raw swordfish{/}.
+          weight: 50
+          xp: 100
+        - item_id: raw_shark
+          level: 76
+          message: You harpoon a {27}raw shark{/}.
+          weight: 30
+          xp: 110
+    fail_message: You fail to spear anything.
+    gather_message: You ready your harpoon...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.4
+        cap: 0.8
+        per_level: 0.005
+    tools:
+        - harpoon
 id: harpoon_fishing_spot
 name: harpoon fishing spot
-color: "75"
-behavior: fish_harpoon
-description: "Large shadows move beneath the waves. Use a harpoon here."
diff --git a/data/objects/herb_patch.yaml b/data/objects/herb_patch.yaml
index cca6e27..81acaf3 100644
--- a/data/objects/herb_patch.yaml
+++ b/data/objects/herb_patch.yaml
@@ -1,7 +1,6 @@
 id: herb_patch
 name: herb patch
 color: "28"
-behavior: ""
 hidden: false
 inroom_description: "A prepared herb patch sits in the soil."
 description: "A small patch of tilled soil suitable for growing herbs. Use 'inspect' to check its status."
diff --git a/data/objects/iron_gate.yaml b/data/objects/iron_gate.yaml
index 91f59c0..8193f0a 100644
--- a/data/objects/iron_gate.yaml
+++ b/data/objects/iron_gate.yaml
@@ -1,6 +1,14 @@
-id: iron_gate
-name: iron gate
 color: "250"
-behavior: iron_gate_toggle
+description: A heavy iron gate. It looks like it can be pushed open.
 hidden: true
-description: "A heavy iron gate. It looks like it can be pushed open."
+id: iron_gate
+name: iron gate
+use_interactions:
+  - condition:
+      flag: gate_open
+      not: true
+      value: true
+    message: You push the heavy iron gate open.
+    action:
+      set_flags:
+        gate_open: true
diff --git a/data/objects/iron_rock.yaml b/data/objects/iron_rock.yaml
index 3019895..b66bd03 100644
--- a/data/objects/iron_rock.yaml
+++ b/data/objects/iron_rock.yaml
@@ -1,4 +1,23 @@
+color: "250"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: iron_ore
+          message: You manage to mine some {250}iron ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the iron rock...
+    level: 15
+    respawn_broadcast: A glint of iron catches your eye from some {name}.
+    respawn_timer: 60
+    skill: mining
+    success:
+        base: 0.4
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 35
 id: iron_rock
 name: iron rock
-color: "250"
-behavior: mine_iron
diff --git a/data/objects/magic_tree.yaml b/data/objects/magic_tree.yaml
index 6caaf49..7e1a37b 100644
--- a/data/objects/magic_tree.yaml
+++ b/data/objects/magic_tree.yaml
@@ -1,4 +1,25 @@
+color: "135"
+gather:
+    base_wait: 12
+    deplete_timer: 390
+    drops:
+        - depletes: false
+          item_id: magic_logs
+          message: You get some {135}magic logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the magic tree...
+    level: 75
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 199
+    skill: woodcutting
+    success:
+        base: 0.15
+        cap: 0.65
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 250
 id: magic_tree
 name: magic tree
-color: "135"
-behavior: chop_magic
diff --git a/data/objects/mahogany_tree.yaml b/data/objects/mahogany_tree.yaml
index 9813b5c..5e84b2b 100644
--- a/data/objects/mahogany_tree.yaml
+++ b/data/objects/mahogany_tree.yaml
@@ -1,4 +1,25 @@
+color: "131"
+gather:
+    base_wait: 8
+    deplete_timer: 100
+    drops:
+        - depletes: false
+          item_id: mahogany_logs
+          message: You get some {131}mahogany logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the mahogany tree...
+    level: 50
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 14
+    skill: woodcutting
+    success:
+        base: 0.25
+        cap: 0.75
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 125
 id: mahogany_tree
 name: mahogany tree
-color: "131"
-behavior: chop_mahogany
diff --git a/data/objects/maple_tree.yaml b/data/objects/maple_tree.yaml
index a2ac67a..1c11e82 100644
--- a/data/objects/maple_tree.yaml
+++ b/data/objects/maple_tree.yaml
@@ -1,4 +1,25 @@
+color: "173"
+gather:
+    base_wait: 8
+    deplete_timer: 100
+    drops:
+        - depletes: false
+          item_id: maple_logs
+          message: You get some {173}maple logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the maple tree...
+    level: 45
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 59
+    skill: woodcutting
+    success:
+        base: 0.28
+        cap: 0.78
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 100
 id: maple_tree
 name: maple tree
-color: "173"
-behavior: chop_maple
diff --git a/data/objects/mithril_rock.yaml b/data/objects/mithril_rock.yaml
index d4f4858..ffd2a74 100644
--- a/data/objects/mithril_rock.yaml
+++ b/data/objects/mithril_rock.yaml
@@ -1,4 +1,23 @@
+color: "75"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: mithril_ore
+          message: You manage to mine some {75}mithril ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the mithril rock...
+    level: 55
+    respawn_broadcast: A blue glint of mithril catches your eye from some {name}.
+    respawn_timer: 110
+    skill: mining
+    success:
+        base: 0.2
+        cap: 0.9
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 80
 id: mithril_rock
 name: mithril rock
-color: "75"
-behavior: mine_mithril
diff --git a/data/objects/net_fishing_spot.yaml b/data/objects/net_fishing_spot.yaml
index 10824bc..11263a9 100644
--- a/data/objects/net_fishing_spot.yaml
+++ b/data/objects/net_fishing_spot.yaml
@@ -1,5 +1,44 @@
+color: "75"
+description: Bubbles break the surface. Use a small or big fishing net here.
+gather:
+    base_wait: 5
+    depleted_message: You don't see any fish swimming here.
+    drops:
+        - item_id: raw_shrimps
+          level: 1
+          message: You catch some {75}raw shrimps{/}.
+          weight: 50
+          xp: 10
+        - item_id: raw_anchovies
+          level: 1
+          message: You catch some {75}raw anchovies{/}.
+          weight: 50
+          xp: 10
+        - item_id: raw_mackerel
+          level: 16
+          message: You catch a {69}raw mackerel{/}.
+          weight: 50
+          xp: 20
+        - item_id: raw_cod
+          level: 23
+          message: You catch a {69}raw cod{/}.
+          weight: 50
+          xp: 30
+        - item_id: raw_bass
+          level: 46
+          message: You catch a {69}raw bass{/}.
+          weight: 50
+          xp: 50
+    fail_message: You catch nothing.
+    gather_message: You cast your net into the water...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.5
+        cap: 0.9
+        per_level: 0.005
+    tools:
+        - small_net
+        - big_net
 id: net_fishing_spot
 name: net fishing spot
-color: "75"
-behavior: fish_net
-description: "Bubbles break the surface. Use a small or big fishing net here."
diff --git a/data/objects/netrunner.yaml b/data/objects/netrunner.yaml
index f81f7c5..dcb7d40 100644
--- a/data/objects/netrunner.yaml
+++ b/data/objects/netrunner.yaml
@@ -1,6 +1,67 @@
+color: "39"
+description: A wiry figure hunched over a custom rig, fingers dancing across holographic keys. Cables snake from the back of their neck into the terminal. They glance up at you with augmented eyes.
 id: netrunner
+inroom_description: A {39}Netrunner{/} sits cross-legged on the floor, wired into the network.
 name: Netrunner
-color: "39"
-behavior: netrunner_talk
-description: "A wiry figure hunched over a custom rig, fingers dancing across holographic keys. Cables snake from the back of their neck into the terminal. They glance up at you with augmented eyes."
-inroom_description: "A {39}Netrunner{/} sits cross-legged on the floor, wired into the network."
+talk:
+    nodes:
+        start:
+            message: The Netrunner looks up. "You want in on the network? I can give you some pointers."
+            options:
+                - goto: what_is
+                  text: '"What is hacking?"'
+                - goto: terminals
+                  text: '"Where can I find terminals?"'
+                - goto: tips_basic
+                  text: '"Any tips for the basic terminal?"'
+                - condition:
+                    player_flag: hacking_asked_basic
+                    value: true
+                  goto: tips_advanced
+                  text: '"What about the advanced terminal?"'
+                - condition:
+                    player_flag: hacking_asked_advanced
+                    value: true
+                  goto: tips_secure
+                  text: '"Tell me about the secure terminal."'
+                - end: true
+                  text: '"Goodbye."'
+        terminals:
+            message: '"There''s a basic terminal right here in this lab -- good for beginners. The station down east has an advanced one if you''ve got the chops. And if you''re really good, there''s a secure terminal deep in the compound. You''ll need the skills to match though."'
+            options:
+                - goto: tips_basic
+                  text: '"Any tips?"'
+                - end: true
+                  text: '"Thanks."'
+        tips_advanced:
+            action:
+                set_player_flags:
+                    hacking_asked_advanced: true
+            message: '"Advanced terminal runs a cipher crack. Four symbols, no repeats. You get feedback after each guess -- locked means right spot, found means right symbol wrong spot. Process of elimination. Ten tries."'
+            options:
+                - goto: tips_secure
+                  text: '"Tell me about the secure terminal."'
+                - end: true
+                  text: '"Thanks."'
+        tips_basic:
+            action:
+                set_player_flags:
+                    hacking_asked_basic: true
+            message: '"The basic terminal runs an old rogue AI hunt. Twenty nodes in a network. You''ve got probes to flush it out. Listen for the warnings -- corrupted data means it''s close, voids mean a trap, static means ICE. Shoot into adjacent nodes, don''t walk into danger."'
+            options:
+                - goto: tips_advanced
+                  text: '"What about the advanced terminal?"'
+                - end: true
+                  text: '"Thanks."'
+        tips_secure:
+            message: '"Secure terminal? Signal Bluff. It''s a bluffing game -- you and the system each roll hidden dice and take turns making claims about the total. Ones are wild. Call the bluff or raise the stakes. Read the probabilities, play the odds, and don''t let it psych you out."'
+            options:
+                - end: true
+                  text: '"Thanks."'
+        what_is:
+            message: '"Hacking''s about jacking into terminals and running their gauntlets. Each terminal runs a different challenge -- puzzles, hunts, pattern games. Crack ''em and you get better at it. Simple as that."'
+            options:
+                - goto: terminals
+                  text: '"Where can I find terminals?"'
+                - end: true
+                  text: '"Goodbye."'
diff --git a/data/objects/oak_tree.yaml b/data/objects/oak_tree.yaml
index 2ad1ed2..0d42dab 100644
--- a/data/objects/oak_tree.yaml
+++ b/data/objects/oak_tree.yaml
@@ -1,4 +1,25 @@
+color: "113"
+gather:
+    base_wait: 6
+    deplete_timer: 45
+    drops:
+        - depletes: false
+          item_id: oak_logs
+          message: You get some {113}oak logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the oak tree...
+    level: 15
+    nest_chance: 256
+    respawn_broadcast: An {name} grows back.
+    respawn_timer: 14
+    skill: woodcutting
+    success:
+        base: 0.4
+        cap: 0.9
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 37
 id: oak_tree
 name: oak tree
-color: "113"
-behavior: chop_oak
diff --git a/data/objects/redwood_tree.yaml b/data/objects/redwood_tree.yaml
index 541095a..cf16e86 100644
--- a/data/objects/redwood_tree.yaml
+++ b/data/objects/redwood_tree.yaml
@@ -1,4 +1,25 @@
+color: "131"
+gather:
+    base_wait: 14
+    deplete_timer: 440
+    drops:
+        - depletes: false
+          item_id: redwood_logs
+          message: You get some {131}redwood logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the redwood tree...
+    level: 90
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 199
+    skill: woodcutting
+    success:
+        base: 0.1
+        cap: 0.6
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 380
 id: redwood_tree
 name: redwood tree
-color: "131"
-behavior: chop_redwood
diff --git a/data/objects/runite_rock.yaml b/data/objects/runite_rock.yaml
index 2475908..abfb06c 100644
--- a/data/objects/runite_rock.yaml
+++ b/data/objects/runite_rock.yaml
@@ -1,4 +1,23 @@
+color: "87"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: runite_ore
+          message: You manage to mine some {87}runite ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the runite rock...
+    level: 85
+    respawn_broadcast: A pale blue glint of runite catches your eye from some {name}.
+    respawn_timer: 180
+    skill: mining
+    success:
+        base: 0.08
+        cap: 0.8
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 125
 id: runite_rock
 name: runite rock
-color: "87"
-behavior: mine_runite
diff --git a/data/objects/sacred_eel_spot.yaml b/data/objects/sacred_eel_spot.yaml
index 199ad96..07c1388 100644
--- a/data/objects/sacred_eel_spot.yaml
+++ b/data/objects/sacred_eel_spot.yaml
@@ -1,5 +1,23 @@
+color: "177"
+description: Waters shimmer with an otherworldly light. Use a fishing rod with bait here.
+gather:
+    bait: fishing_bait
+    base_wait: 6
+    drops:
+        - item_id: sacred_eel
+          level: 87
+          message: You catch a {177}sacred eel{/}.
+          weight: 100
+          xp: 125
+    fail_message: Nothing seems to bite.
+    gather_message: You cast your line near the sacred waters...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.25
+        cap: 0.75
+        per_level: 0.005
+    tools:
+        - fishing_rod
 id: sacred_eel_spot
 name: sacred eel spot
-color: "177"
-behavior: fish_sacred_eel
-description: "Waters shimmer with an otherworldly light. Use a fishing rod with bait here."
diff --git a/data/objects/scrap_pile.yaml b/data/objects/scrap_pile.yaml
index 2106822..d4a6a48 100644
--- a/data/objects/scrap_pile.yaml
+++ b/data/objects/scrap_pile.yaml
@@ -1,4 +1,19 @@
+color: "243"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: false
+          item_id: scrap_metal
+          message: You salvage some {243}scrap metal{/}.
+          weight: 100
+    gather_message: You swing your pickaxe at the scrap pile...
+    level: 1
+    skill: mining
+    success:
+        base: 1.0
+        cap: 1.0
+    tools:
+        - pickaxe
+    xp: 5
 id: scrap_pile
 name: scrap pile
-color: "243"
-behavior: mine_scrap
diff --git a/data/objects/sheep.yaml b/data/objects/sheep.yaml
index 2739c9c..865c20e 100644
--- a/data/objects/sheep.yaml
+++ b/data/objects/sheep.yaml
@@ -1,6 +1,25 @@
+color: "255"
+description: A fluffy sheep, ready to be shorn.
+gather:
+    base_wait: 3
+    drops:
+        - depletes: true
+          item_id: wool
+          message: You shear some wool from the sheep.
+          weight: 100
+    fail_message: The sheep wriggles free!
+    gather_message: You hold the sheep still and begin shearing...
+    level: 1
+    respawn_broadcast: A sheep grows a fresh coat of wool.
+    respawn_timer: 100
+    skill: crafting
+    success:
+        base: 0.95
+        cap: 0.95
+        per_level: 0
+    tools:
+        - shears
+    xp: 0
 id: sheep
+inroom_description: A fluffy sheep is wandering around here.
 name: sheep
-color: "255"
-behavior: shear_sheep
-description: "A fluffy sheep, ready to be shorn."
-inroom_description: "A fluffy sheep is wandering around here."
diff --git a/data/objects/silver_rock.yaml b/data/objects/silver_rock.yaml
index 702df59..9cc7d22 100644
--- a/data/objects/silver_rock.yaml
+++ b/data/objects/silver_rock.yaml
@@ -1,4 +1,23 @@
+color: "253"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: silver_ore
+          message: You manage to mine some {253}silver ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the silver rock...
+    level: 20
+    respawn_broadcast: A silvery glint catches your eye from some {name}.
+    respawn_timer: 70
+    skill: mining
+    success:
+        base: 0.35
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 40
 id: silver_rock
 name: silver rock
-color: "253"
-behavior: mine_silver
diff --git a/data/objects/swamp_fishing_spot.yaml b/data/objects/swamp_fishing_spot.yaml
index f5a3f13..e05b424 100644
--- a/data/objects/swamp_fishing_spot.yaml
+++ b/data/objects/swamp_fishing_spot.yaml
@@ -1,5 +1,28 @@
+color: "108"
+description: Murky water bubbles ominously. Use a fishing rod with bait here.
+gather:
+    bait: fishing_bait
+    base_wait: 5
+    drops:
+        - item_id: raw_slimy_eel
+          level: 28
+          message: You catch a {108}raw slimy eel{/}.
+          weight: 60
+          xp: 80
+        - item_id: raw_cave_eel
+          level: 38
+          message: You catch a {80}raw cave eel{/}.
+          weight: 40
+          xp: 80
+    fail_message: Nothing seems to bite.
+    gather_message: You cast your line into the murky swamp...
+    level: 1
+    skill: fishing
+    success:
+        base: 0.45
+        cap: 0.85
+        per_level: 0.005
+    tools:
+        - fishing_rod
 id: swamp_fishing_spot
 name: swamp fishing spot
-color: "108"
-behavior: fish_swamp
-description: "Murky water bubbles ominously. Use a fishing rod with bait here."
diff --git a/data/objects/teak_tree.yaml b/data/objects/teak_tree.yaml
index a680c10..f234f17 100644
--- a/data/objects/teak_tree.yaml
+++ b/data/objects/teak_tree.yaml
@@ -1,4 +1,25 @@
+color: "179"
+gather:
+    base_wait: 6
+    deplete_timer: 50
+    drops:
+        - depletes: false
+          item_id: teak_logs
+          message: You get some {179}teak logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the teak tree...
+    level: 35
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 15
+    skill: woodcutting
+    success:
+        base: 0.32
+        cap: 0.82
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 85
 id: teak_tree
 name: teak tree
-color: "179"
-behavior: chop_teak
diff --git a/data/objects/tin_rock.yaml b/data/objects/tin_rock.yaml
index d0969fb..baa5caf 100644
--- a/data/objects/tin_rock.yaml
+++ b/data/objects/tin_rock.yaml
@@ -1,4 +1,23 @@
+color: "253"
+gather:
+    base_wait: 10
+    drops:
+        - depletes: true
+          item_id: tin_ore
+          message: You manage to mine some {253}tin ore{/}.
+          weight: 100
+    fail_message: You chip away but get nothing useful.
+    gather_message: You swing your pickaxe at the rock...
+    level: 1
+    respawn_broadcast: A glint of tin catches your eye from some {name}.
+    respawn_timer: 50
+    skill: mining
+    success:
+        base: 0.5
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - pickaxe
+    xp: 17
 id: tin_rock
 name: tin rock
-color: "253"
-behavior: mine_tin
diff --git a/data/objects/tool_shed.yaml b/data/objects/tool_shed.yaml
index 752c921..9b59682 100644
--- a/data/objects/tool_shed.yaml
+++ b/data/objects/tool_shed.yaml
@@ -1,7 +1,91 @@
-id: tool_shed
-name: tool shed
 color: "94"
-behavior: tool_shed_talk
+description: A small shed for storing farming tools. Talk to it to store or retrieve tools.
 hidden: false
-inroom_description: "A weathered tool shed stands against the wall."
-description: "A small shed for storing farming tools. Talk to it to store or retrieve tools."
+id: tool_shed
+inroom_description: A weathered tool shed stands against the wall.
+name: tool shed
+talk:
+    nodes:
+        retrieve_rake:
+            action:
+                give_item: rake
+                set_player_flags:
+                    tool_shed_rake: false
+            message: You retrieve the rake from the tool shed.
+            options:
+                - goto: start
+                  text: Continue
+        retrieve_spade:
+            action:
+                give_item: spade
+                set_player_flags:
+                    tool_shed_spade: false
+            message: You retrieve the spade from the tool shed.
+            options:
+                - goto: start
+                  text: Continue
+        retrieve_watering_can:
+            action:
+                give_item: watering_can
+                set_player_flags:
+                    tool_shed_watering_can: false
+            message: You retrieve the watering can from the tool shed.
+            options:
+                - goto: start
+                  text: Continue
+        start:
+            message: The tool shed is open. What would you like to do?
+            options:
+                - condition:
+                    has_item: rake
+                  goto: store_rake
+                  text: Store rake
+                - condition:
+                    has_item: spade
+                  goto: store_spade
+                  text: Store spade
+                - condition:
+                    has_item: watering_can
+                  goto: store_watering_can
+                  text: Store watering can
+                - condition:
+                    player_flag: tool_shed_rake
+                  goto: retrieve_rake
+                  text: Retrieve rake
+                - condition:
+                    player_flag: tool_shed_spade
+                  goto: retrieve_spade
+                  text: Retrieve spade
+                - condition:
+                    player_flag: tool_shed_watering_can
+                  goto: retrieve_watering_can
+                  text: Retrieve watering can
+                - end: true
+                  text: Never mind
+        store_rake:
+            action:
+                set_player_flags:
+                    tool_shed_rake: true
+                take_item: rake
+            message: You store the rake in the tool shed.
+            options:
+                - goto: start
+                  text: Continue
+        store_spade:
+            action:
+                set_player_flags:
+                    tool_shed_spade: true
+                take_item: spade
+            message: You store the spade in the tool shed.
+            options:
+                - goto: start
+                  text: Continue
+        store_watering_can:
+            action:
+                set_player_flags:
+                    tool_shed_watering_can: true
+                take_item: watering_can
+            message: You store the watering can in the tool shed.
+            options:
+                - goto: start
+                  text: Continue
diff --git a/data/objects/tree.yaml b/data/objects/tree.yaml
index 4f799e8..1d4bdee 100644
--- a/data/objects/tree.yaml
+++ b/data/objects/tree.yaml
@@ -1,4 +1,25 @@
+color: "107"
+gather:
+    base_wait: 4
+    depleted_message: You don't see any usable wood in this tree.
+    drops:
+        - depletes: true
+          item_id: logs
+          message: You get some {107}logs{/}.
+          weight: 100
+    exhausted_message: The tree comes crashing down!
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the tree...
+    level: 1
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 80
+    skill: woodcutting
+    success:
+        base: 0.5
+        cap: 0.95
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 25
 id: tree
 name: tree
-color: "107"
-behavior: chop_tree
diff --git a/data/objects/willow_tree.yaml b/data/objects/willow_tree.yaml
index 01cc346..a4db0cf 100644
--- a/data/objects/willow_tree.yaml
+++ b/data/objects/willow_tree.yaml
@@ -1,4 +1,25 @@
+color: "114"
+gather:
+    base_wait: 6
+    deplete_timer: 50
+    drops:
+        - depletes: false
+          item_id: willow_logs
+          message: You get some {114}willow logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the willow tree...
+    level: 30
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 14
+    skill: woodcutting
+    success:
+        base: 0.35
+        cap: 0.85
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 67
 id: willow_tree
 name: willow tree
-color: "114"
-behavior: chop_willow
diff --git a/data/objects/yew_tree.yaml b/data/objects/yew_tree.yaml
index cb81172..b521052 100644
--- a/data/objects/yew_tree.yaml
+++ b/data/objects/yew_tree.yaml
@@ -1,4 +1,25 @@
+color: "108"
+gather:
+    base_wait: 10
+    deplete_timer: 190
+    drops:
+        - depletes: false
+          item_id: yew_logs
+          message: You get some {108}yew logs{/}.
+          weight: 100
+    fail_message: You swing but get no logs.
+    gather_message: You swing your axe at the yew tree...
+    level: 60
+    nest_chance: 256
+    respawn_broadcast: A {name} grows back.
+    respawn_timer: 99
+    skill: woodcutting
+    success:
+        base: 0.2
+        cap: 0.7
+        per_level: 0.01
+    tools:
+        - axe
+    xp: 175
 id: yew_tree
 name: yew tree
-color: "108"
-behavior: chop_yew