feat: qol improvements to items crud in admin gui

37 files changed, 392 insertions, 339 deletions

diff --git a/data/items/tools/adamant_axe.yaml b/data/items/tools/adamant_axe.yaml
index 865bec0..78118be 100644
--- a/data/items/tools/adamant_axe.yaml
+++ b/data/items/tools/adamant_axe.yaml
@@ -1,18 +1,21 @@
-name: adamant axe
 color: "78"
-description: "A sturdy adamant axe, good for woodcutting."
-value: 500
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: slash
-stats:
-  stab_attack: -2
-  slash_attack: 29
-  crush_attack: 22
-  strength_bonus: 24
-speed: 5
-tool_type: axe
-tool_speed: 2
+description: A sturdy adamant axe, good for woodcutting.
+equipment:
+  attack:
+    crush: 22
+    slash: 29
+    stab: -2
+  attack_type: slash
+  other:
+    strength: 24
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
+name: adamant axe
 requirements:
   accuracy: 30
+stackable: false
+tool:
+  speed: 2
+  type: axe
+value: 500
diff --git a/data/items/tools/adamant_pickaxe.yaml b/data/items/tools/adamant_pickaxe.yaml
index d2ea9bb..95ca1f5 100644
--- a/data/items/tools/adamant_pickaxe.yaml
+++ b/data/items/tools/adamant_pickaxe.yaml
@@ -1,18 +1,21 @@
-name: adamant pickaxe
 color: "78"
-description: "A sturdy adamant pickaxe, good for mining."
-value: 500
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 23
-  slash_attack: -2
-  crush_attack: 10
-  strength_bonus: 16
-speed: 5
-tool_type: pickaxe
-tool_speed: 0.75
+description: A sturdy adamant pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 10
+    slash: -2
+    stab: 23
+  attack_type: stab
+  other:
+    strength: 16
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
+name: adamant pickaxe
 requirements:
   accuracy: 30
+stackable: false
+tool:
+  speed: 0.75
+  type: pickaxe
+value: 500
diff --git a/data/items/tools/big_fishing_net.yaml b/data/items/tools/big_fishing_net.yaml
index 4398587..10f3f57 100644
--- a/data/items/tools/big_fishing_net.yaml
+++ b/data/items/tools/big_fishing_net.yaml
@@ -1,14 +1,14 @@
+color: E6
+description: A larger fishing net for catching bigger fish.
+equipment:
+  other:
+    strength: 0
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: big fishing net
-color: "E6"
-description: "A larger fishing net for catching bigger fish."
-value: 20
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-stats:
-  attack_bonus: 0
-  strength_bonus: 0
-  defense_bonus: 0
-speed: 5
-tool_type: big_net
-tool_speed: 1
+tool:
+  speed: 1
+  type: big_net
+value: 20
diff --git a/data/items/tools/black_pickaxe.yaml b/data/items/tools/black_pickaxe.yaml
index 22d5363..5b06f32 100644
--- a/data/items/tools/black_pickaxe.yaml
+++ b/data/items/tools/black_pickaxe.yaml
@@ -1,18 +1,21 @@
+color: F0
+description: A black pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 6
+    slash: -2
+    stab: 14
+  attack_type: stab
+  other:
+    strength: 9
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: black pickaxe
-color: "F0"
-description: "A black pickaxe, good for mining."
-value: 150
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 14
-  slash_attack: -2
-  crush_attack: 6
-  strength_bonus: 9
-speed: 5
-tool_type: pickaxe
-tool_speed: 1
 requirements:
   accuracy: 10
+stackable: false
+tool:
+  speed: 1
+  type: pickaxe
+value: 150
diff --git a/data/items/tools/bronze_axe.yaml b/data/items/tools/bronze_axe.yaml
index 863c34a..91c0b43 100644
--- a/data/items/tools/bronze_axe.yaml
+++ b/data/items/tools/bronze_axe.yaml
@@ -1,16 +1,19 @@
+color: B2
+description: A sturdy bronze axe, good for woodcutting.
+equipment:
+  attack:
+    crush: 5
+    slash: 7
+    stab: -2
+  attack_type: slash
+  other:
+    strength: 5
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: bronze axe
-color: "B2"
-description: "A sturdy bronze axe, good for woodcutting."
-value: 10
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: slash
-stats:
-  stab_attack: -2
-  slash_attack: 7
-  crush_attack: 5
-  strength_bonus: 5
-speed: 5
-tool_type: axe
-tool_speed: 4
+tool:
+  speed: 4
+  type: axe
+value: 10
diff --git a/data/items/tools/bronze_pickaxe.yaml b/data/items/tools/bronze_pickaxe.yaml
index e280020..807cadb 100644
--- a/data/items/tools/bronze_pickaxe.yaml
+++ b/data/items/tools/bronze_pickaxe.yaml
@@ -1,16 +1,19 @@
+color: B2
+description: A sturdy bronze pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 2
+    slash: -2
+    stab: 4
+  attack_type: stab
+  other:
+    strength: 3
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: bronze pickaxe
-color: "B2"
-description: "A sturdy bronze pickaxe, good for mining."
-value: 10
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 4
-  slash_attack: -2
-  crush_attack: 2
-  strength_bonus: 3
-speed: 5
-tool_type: pickaxe
-tool_speed: 2
+tool:
+  speed: 2
+  type: pickaxe
+value: 10
diff --git a/data/items/tools/chisel.yaml b/data/items/tools/chisel.yaml
index c4d67b7..c5b9ca6 100644
--- a/data/items/tools/chisel.yaml
+++ b/data/items/tools/chisel.yaml
@@ -1,5 +1,6 @@
+color: FA
+description: A chisel used for cutting gems.
 name: chisel
-color: "FA"
-description: "A chisel used for cutting gems."
+tool:
+  type: chisel
 value: 5
-tool_type: chisel
diff --git a/data/items/tools/dragon_pickaxe.yaml b/data/items/tools/dragon_pickaxe.yaml
index 0dd3cd4..25c5cce 100644
--- a/data/items/tools/dragon_pickaxe.yaml
+++ b/data/items/tools/dragon_pickaxe.yaml
@@ -1,18 +1,21 @@
+color: C4
+description: A powerful dragon pickaxe.
+equipment:
+  attack:
+    crush: 16
+    slash: -2
+    stab: 34
+  attack_type: stab
+  other:
+    strength: 26
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: dragon pickaxe
-color: "C4"
-description: "A powerful dragon pickaxe."
-value: 50000
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 34
-  slash_attack: -2
-  crush_attack: 16
-  strength_bonus: 26
-speed: 5
-tool_type: pickaxe
-tool_speed: 0.25
 requirements:
   accuracy: 60
+stackable: false
+tool:
+  speed: 0.25
+  type: pickaxe
+value: 50000
diff --git a/data/items/tools/empty_pot.yaml b/data/items/tools/empty_pot.yaml
index 93c9a04..371a783 100644
--- a/data/items/tools/empty_pot.yaml
+++ b/data/items/tools/empty_pot.yaml
@@ -1,13 +1,12 @@
 color: "82"
 craft:
-    consume:
+    ingredients:
         - items:
             - unfired_pot
           quantity: 1
     fail_message: The pot cracks in the oven and is ruined.
     level: 1
     message: "You fire the %i1 in the oven."
-    skill: crafting
     station:
         - pottery_oven
     success:
diff --git a/data/items/tools/firesteel.yaml b/data/items/tools/firesteel.yaml
index bccd390..861e879 100644
--- a/data/items/tools/firesteel.yaml
+++ b/data/items/tools/firesteel.yaml
@@ -1,7 +1,8 @@
+color: FA
+description: A rugged firesteel that never wears out.
 name: firesteel
-color: "FA"
-description: "A rugged firesteel that never wears out."
-value: 20
 stackable: false
-tool_type: fire
-tool_speed: 4
+tool:
+  speed: 4
+  type: fire
+value: 20
diff --git a/data/items/tools/fishing_rod.yaml b/data/items/tools/fishing_rod.yaml
index e7e3023..b9e5610 100644
--- a/data/items/tools/fishing_rod.yaml
+++ b/data/items/tools/fishing_rod.yaml
@@ -1,14 +1,14 @@
+color: 6B
+description: A simple fishing rod. Use with fishing bait.
+equipment:
+  other:
+    strength: 0
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: fishing rod
-color: "6B"
-description: "A simple fishing rod. Use with fishing bait."
-value: 5
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-stats:
-  attack_bonus: 0
-  strength_bonus: 0
-  defense_bonus: 0
-speed: 5
-tool_type: fishing_rod
-tool_speed: 0
+tool:
+  speed: 0
+  type: fishing_rod
+value: 5
diff --git a/data/items/tools/fly_fishing_rod.yaml b/data/items/tools/fly_fishing_rod.yaml
index a65b90c..fc4655d 100644
--- a/data/items/tools/fly_fishing_rod.yaml
+++ b/data/items/tools/fly_fishing_rod.yaml
@@ -1,14 +1,14 @@
+color: 6B
+description: A flexible rod for fly fishing with artificial flies.
+equipment:
+  other:
+    strength: 0
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: fly fishing rod
-color: "6B"
-description: "A flexible rod for fly fishing with artificial flies."
-value: 20
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-stats:
-  attack_bonus: 0
-  strength_bonus: 0
-  defense_bonus: 0
-speed: 5
-tool_type: fly_rod
-tool_speed: 1
+tool:
+  speed: 1
+  type: fly_rod
+value: 20
diff --git a/data/items/tools/hammer.yaml b/data/items/tools/hammer.yaml
index a017160..3f156aa 100644
--- a/data/items/tools/hammer.yaml
+++ b/data/items/tools/hammer.yaml
@@ -1,6 +1,7 @@
+color: FA
+description: A sturdy hammer for smithing metal on an anvil.
 name: hammer
-color: "FA"
-description: "A sturdy hammer for smithing metal on an anvil."
-value: 10
 stackable: false
-tool_type: hammer
+tool:
+  type: hammer
+value: 10
diff --git a/data/items/tools/harpoon.yaml b/data/items/tools/harpoon.yaml
index 639f978..51163f5 100644
--- a/data/items/tools/harpoon.yaml
+++ b/data/items/tools/harpoon.yaml
@@ -1,14 +1,14 @@
+color: FA
+description: A barbed harpoon for spearing large fish.
+equipment:
+  other:
+    strength: 0
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: harpoon
-color: "FA"
-description: "A barbed harpoon for spearing large fish."
-value: 30
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-stats:
-  attack_bonus: 0
-  strength_bonus: 0
-  defense_bonus: 0
-speed: 5
-tool_type: harpoon
-tool_speed: 0
+tool:
+  speed: 0
+  type: harpoon
+value: 30
diff --git a/data/items/tools/iron_axe.yaml b/data/items/tools/iron_axe.yaml
index bac2530..bb633f5 100644
--- a/data/items/tools/iron_axe.yaml
+++ b/data/items/tools/iron_axe.yaml
@@ -1,16 +1,19 @@
+color: FA
+description: A sturdy iron axe, good for woodcutting.
+equipment:
+  attack:
+    crush: 7
+    slash: 10
+    stab: -2
+  attack_type: slash
+  other:
+    strength: 8
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: iron axe
-color: "FA"
-description: "A sturdy iron axe, good for woodcutting."
-value: 25
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: slash
-stats:
-  stab_attack: -2
-  slash_attack: 10
-  crush_attack: 7
-  strength_bonus: 8
-speed: 5
-tool_type: axe
-tool_speed: 3.5
+tool:
+  speed: 3.5
+  type: axe
+value: 25
diff --git a/data/items/tools/iron_pickaxe.yaml b/data/items/tools/iron_pickaxe.yaml
index bdb4531..e003c93 100644
--- a/data/items/tools/iron_pickaxe.yaml
+++ b/data/items/tools/iron_pickaxe.yaml
@@ -1,16 +1,19 @@
+color: FA
+description: A sturdy iron pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 3
+    slash: -2
+    stab: 7
+  attack_type: stab
+  other:
+    strength: 5
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: iron pickaxe
-color: "FA"
-description: "A sturdy iron pickaxe, good for mining."
-value: 25
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 7
-  slash_attack: -2
-  crush_attack: 3
-  strength_bonus: 5
-speed: 5
-tool_type: pickaxe
-tool_speed: 1.5
+tool:
+  speed: 1.5
+  type: pickaxe
+value: 25
diff --git a/data/items/tools/knife.yaml b/data/items/tools/knife.yaml
index ce27095..353d859 100644
--- a/data/items/tools/knife.yaml
+++ b/data/items/tools/knife.yaml
@@ -1,5 +1,6 @@
+color: FA
+description: A small knife used for cutting wood and fletching.
 name: knife
-color: "FA"
-description: "A small knife used for cutting wood and fletching."
+tool:
+  type: knife
 value: 5
-tool_type: knife
diff --git a/data/items/tools/lighter.yaml b/data/items/tools/lighter.yaml
index ff38aa4..9f47a45 100644
--- a/data/items/tools/lighter.yaml
+++ b/data/items/tools/lighter.yaml
@@ -1,10 +1,13 @@
-name: lighter
 color: "51"
-description: "A reliable butane lighter."
-value: 15
-stackable: false
-equip_slot: main_hand
-tool_type: fire
-tool_speed: 4
-quality: 100
+description: A reliable butane lighter.
+equipment:
+  slot: main_hand
+  type: tool
 max_quality: 100
+name: lighter
+quality: 100
+stackable: false
+tool:
+  speed: 4
+  type: fire
+value: 15
diff --git a/data/items/tools/lobster_pot.yaml b/data/items/tools/lobster_pot.yaml
index 6e4a1d4..56760de 100644
--- a/data/items/tools/lobster_pot.yaml
+++ b/data/items/tools/lobster_pot.yaml
@@ -1,14 +1,14 @@
+color: FA
+description: A wire cage for trapping lobsters.
+equipment:
+  other:
+    strength: 0
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: lobster pot
-color: "FA"
-description: "A wire cage for trapping lobsters."
-value: 20
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-stats:
-  attack_bonus: 0
-  strength_bonus: 0
-  defense_bonus: 0
-speed: 5
-tool_type: lobster_pot
-tool_speed: 0
+tool:
+  speed: 0
+  type: lobster_pot
+value: 20
diff --git a/data/items/tools/matches.yaml b/data/items/tools/matches.yaml
index c7cf9dd..75f8c1a 100644
--- a/data/items/tools/matches.yaml
+++ b/data/items/tools/matches.yaml
@@ -1,8 +1,11 @@
+color: C4
+description: A small box of matches for starting fires.
+equipment:
+  slot: main_hand
+  type: tool
 name: matches
-color: "C4"
-description: "A small box of matches for starting fires."
-value: 5
 stackable: true
-equip_slot: main_hand
-tool_type: fire
-tool_speed: 4
+tool:
+  speed: 4
+  type: fire
+value: 5
diff --git a/data/items/tools/mithril_axe.yaml b/data/items/tools/mithril_axe.yaml
index f0976a9..31aef89 100644
--- a/data/items/tools/mithril_axe.yaml
+++ b/data/items/tools/mithril_axe.yaml
@@ -1,18 +1,21 @@
+color: 4B
+description: A sturdy mithril axe, good for woodcutting.
+equipment:
+  attack:
+    crush: 16
+    slash: 21
+    stab: -2
+  attack_type: slash
+  other:
+    strength: 17
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: mithril axe
-color: "4B"
-description: "A sturdy mithril axe, good for woodcutting."
-value: 200
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: slash
-stats:
-  stab_attack: -2
-  slash_attack: 21
-  crush_attack: 16
-  strength_bonus: 17
-speed: 5
-tool_type: axe
-tool_speed: 2.5
 requirements:
   accuracy: 20
+stackable: false
+tool:
+  speed: 2.5
+  type: axe
+value: 200
diff --git a/data/items/tools/mithril_pickaxe.yaml b/data/items/tools/mithril_pickaxe.yaml
index e525c21..ab2996d 100644
--- a/data/items/tools/mithril_pickaxe.yaml
+++ b/data/items/tools/mithril_pickaxe.yaml
@@ -1,18 +1,21 @@
+color: 4B
+description: A sturdy mithril pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 8
+    slash: -2
+    stab: 17
+  attack_type: stab
+  other:
+    strength: 12
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: mithril pickaxe
-color: "4B"
-description: "A sturdy mithril pickaxe, good for mining."
-value: 200
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 17
-  slash_attack: -2
-  crush_attack: 8
-  strength_bonus: 12
-speed: 5
-tool_type: pickaxe
-tool_speed: 1
 requirements:
   accuracy: 20
+stackable: false
+tool:
+  speed: 1
+  type: pickaxe
+value: 200
diff --git a/data/items/tools/needle.yaml b/data/items/tools/needle.yaml
index a5adf2a..bc12202 100644
--- a/data/items/tools/needle.yaml
+++ b/data/items/tools/needle.yaml
@@ -1,5 +1,6 @@
+color: FA
+description: A needle for crafting leather goods.
 name: needle
-color: "FA"
-description: "A needle for crafting leather goods."
+tool:
+  type: needle
 value: 5
-tool_type: needle
diff --git a/data/items/tools/plant_pot.yaml b/data/items/tools/plant_pot.yaml
index ede859c..e758167 100644
--- a/data/items/tools/plant_pot.yaml
+++ b/data/items/tools/plant_pot.yaml
@@ -1,13 +1,12 @@
 color: "82"
 craft:
-    consume:
+    ingredients:
         - items:
             - unfired_plant_pot
           quantity: 1
     fail_message: The plant pot cracks in the oven and is ruined.
     level: 19
     message: "You fire the %i1 in the oven."
-    skill: crafting
     station:
         - pottery_oven
     success:
diff --git a/data/items/tools/rake.yaml b/data/items/tools/rake.yaml
index 3848104..ca5e44b 100644
--- a/data/items/tools/rake.yaml
+++ b/data/items/tools/rake.yaml
@@ -1,6 +1,7 @@
+color: 5E
+description: A sturdy rake for clearing weeds and dead plants from farming patches.
 name: rake
-color: "5E"
-description: "A sturdy rake for clearing weeds and dead plants from farming patches."
-value: 8
 stackable: false
-tool_type: rake
+tool:
+  type: rake
+value: 8
diff --git a/data/items/tools/rune_axe.yaml b/data/items/tools/rune_axe.yaml
index e239a0a..46cc948 100644
--- a/data/items/tools/rune_axe.yaml
+++ b/data/items/tools/rune_axe.yaml
@@ -1,18 +1,21 @@
-name: rune axe
 color: "57"
-description: "A sturdy rune axe, good for woodcutting."
-value: 5000
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: slash
-stats:
-  stab_attack: -2
-  slash_attack: 38
-  crush_attack: 29
-  strength_bonus: 32
-speed: 5
-tool_type: axe
-tool_speed: 1.5
+description: A sturdy rune axe, good for woodcutting.
+equipment:
+  attack:
+    crush: 29
+    slash: 38
+    stab: -2
+  attack_type: slash
+  other:
+    strength: 32
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
+name: rune axe
 requirements:
   accuracy: 40
+stackable: false
+tool:
+  speed: 1.5
+  type: axe
+value: 5000
diff --git a/data/items/tools/rune_pickaxe.yaml b/data/items/tools/rune_pickaxe.yaml
index b4e9ac1..d580df5 100644
--- a/data/items/tools/rune_pickaxe.yaml
+++ b/data/items/tools/rune_pickaxe.yaml
@@ -1,18 +1,21 @@
-name: rune pickaxe
 color: "57"
-description: "A sturdy rune pickaxe, good for mining."
-value: 5000
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 30
-  slash_attack: -2
-  crush_attack: 14
-  strength_bonus: 22
-speed: 5
-tool_type: pickaxe
-tool_speed: 0.5
+description: A sturdy rune pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 14
+    slash: -2
+    stab: 30
+  attack_type: stab
+  other:
+    strength: 22
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
+name: rune pickaxe
 requirements:
   accuracy: 40
+stackable: false
+tool:
+  speed: 0.5
+  type: pickaxe
+value: 5000
diff --git a/data/items/tools/saw.yaml b/data/items/tools/saw.yaml
index d671923..8f6a287 100644
--- a/data/items/tools/saw.yaml
+++ b/data/items/tools/saw.yaml
@@ -1,6 +1,7 @@
-name: saw
-tool_type: saw
 color: "98"
-description: "A sharp-toothed saw for cutting planks from logs at a workbench."
-value: 30
+description: A sharp-toothed saw for cutting planks from logs at a workbench.
+name: saw
 stackable: false
+tool:
+  type: saw
+value: 30
diff --git a/data/items/tools/shears.yaml b/data/items/tools/shears.yaml
index 0fbbafb..c9739f4 100644
--- a/data/items/tools/shears.yaml
+++ b/data/items/tools/shears.yaml
@@ -1,5 +1,6 @@
+color: FA
+description: A pair of shears for shearing sheep.
 name: shears
-color: "FA"
-description: "A pair of shears for shearing sheep."
+tool:
+  type: shears
 value: 5
-tool_type: shears
diff --git a/data/items/tools/small_fishing_net.yaml b/data/items/tools/small_fishing_net.yaml
index 2d3c6bd..9b127b6 100644
--- a/data/items/tools/small_fishing_net.yaml
+++ b/data/items/tools/small_fishing_net.yaml
@@ -1,14 +1,14 @@
+color: E6
+description: A small hand-held fishing net.
+equipment:
+  other:
+    strength: 0
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: small fishing net
-color: "E6"
-description: "A small hand-held fishing net."
-value: 5
 stackable: false
-equip_slot: main_hand
-weapon_type: melee
-stats:
-  attack_bonus: 0
-  strength_bonus: 0
-  defense_bonus: 0
-speed: 5
-tool_type: small_net
-tool_speed: 0
+tool:
+  speed: 0
+  type: small_net
+value: 5
diff --git a/data/items/tools/spade.yaml b/data/items/tools/spade.yaml
index aab5ee8..e755981 100644
--- a/data/items/tools/spade.yaml
+++ b/data/items/tools/spade.yaml
@@ -1,6 +1,7 @@
+color: F1
+description: A metal spade used for planting seeds and harvesting crops.
 name: spade
-color: "F1"
-description: "A metal spade used for planting seeds and harvesting crops."
-value: 8
 stackable: false
-tool_type: spade
+tool:
+  type: spade
+value: 8
diff --git a/data/items/tools/steel_axe.yaml b/data/items/tools/steel_axe.yaml
index 929bc9e..c0f5a7f 100644
--- a/data/items/tools/steel_axe.yaml
+++ b/data/items/tools/steel_axe.yaml
@@ -1,18 +1,21 @@
+color: FD
+description: A sturdy steel axe, good for woodcutting.
+equipment:
+  attack:
+    crush: 11
+    slash: 15
+    stab: -2
+  attack_type: slash
+  other:
+    strength: 12
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: steel axe
-color: "FD"
-description: "A sturdy steel axe, good for woodcutting."
-value: 75
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: slash
-stats:
-  stab_attack: -2
-  slash_attack: 15
-  crush_attack: 11
-  strength_bonus: 12
-speed: 5
-tool_type: axe
-tool_speed: 3
 requirements:
   accuracy: 5
+stackable: false
+tool:
+  speed: 3
+  type: axe
+value: 75
diff --git a/data/items/tools/steel_pickaxe.yaml b/data/items/tools/steel_pickaxe.yaml
index 2acd5e5..7560612 100644
--- a/data/items/tools/steel_pickaxe.yaml
+++ b/data/items/tools/steel_pickaxe.yaml
@@ -1,18 +1,21 @@
+color: FD
+description: A sturdy steel pickaxe, good for mining.
+equipment:
+  attack:
+    crush: 4
+    slash: -2
+    stab: 10
+  attack_type: stab
+  other:
+    strength: 7
+  slot: main_hand
+  speed: 5
+  type: melee_weapon
 name: steel pickaxe
-color: "FD"
-description: "A sturdy steel pickaxe, good for mining."
-value: 75
-stackable: false
-equip_slot: main_hand
-weapon_type: melee
-attack_type: stab
-stats:
-  stab_attack: 10
-  slash_attack: -2
-  crush_attack: 4
-  strength_bonus: 7
-speed: 5
-tool_type: pickaxe
-tool_speed: 1.25
 requirements:
   accuracy: 5
+stackable: false
+tool:
+  speed: 1.25
+  type: pickaxe
+value: 75
diff --git a/data/items/tools/unfired_pie_dish.yaml b/data/items/tools/unfired_pie_dish.yaml
index eb5d2b6..bc0c5a5 100644
--- a/data/items/tools/unfired_pie_dish.yaml
+++ b/data/items/tools/unfired_pie_dish.yaml
@@ -1,12 +1,11 @@
 color: "AD"
 craft:
-    consume:
+    ingredients:
         - items:
             - soft_clay
           quantity: 1
     level: 7
     message: "You shape the clay into a %n."
-    skill: crafting
     station:
         - pottery_wheel
     type: crafting
diff --git a/data/items/tools/unfired_plant_pot.yaml b/data/items/tools/unfired_plant_pot.yaml
index 3c6c28f..30ccd83 100644
--- a/data/items/tools/unfired_plant_pot.yaml
+++ b/data/items/tools/unfired_plant_pot.yaml
@@ -1,12 +1,11 @@
 color: "AD"
 craft:
-    consume:
+    ingredients:
         - items:
             - soft_clay
           quantity: 1
     level: 19
     message: "You shape the clay into a %n."
-    skill: crafting
     station:
         - pottery_wheel
     type: crafting
diff --git a/data/items/tools/unfired_pot.yaml b/data/items/tools/unfired_pot.yaml
index 26e8771..9dc2406 100644
--- a/data/items/tools/unfired_pot.yaml
+++ b/data/items/tools/unfired_pot.yaml
@@ -1,12 +1,11 @@
 color: "AD"
 craft:
-    consume:
+    ingredients:
         - items:
             - soft_clay
           quantity: 1
     level: 1
     message: "You shape the clay into a %n."
-    skill: crafting
     station:
         - pottery_wheel
     type: crafting
diff --git a/data/items/tools/watering_can.yaml b/data/items/tools/watering_can.yaml
index eab9b0d..4d747a6 100644
--- a/data/items/tools/watering_can.yaml
+++ b/data/items/tools/watering_can.yaml
@@ -1,6 +1,7 @@
-name: watering can
 color: "27"
-description: "A watering can for hydrating farming patches. Watering eliminates disease risk."
-value: 12
+description: A watering can for hydrating farming patches. Watering eliminates disease risk.
+name: watering can
 stackable: false
-tool_type: watering_can
+tool:
+  type: watering_can
+value: 12