feat: qol improvements to items crud in admin gui

38 files changed, 343 insertions, 342 deletions

diff --git a/data/items/ammo/adamant_arrow.yaml b/data/items/ammo/adamant_arrow.yaml
index a7cb647..3b1a750 100644
--- a/data/items/ammo/adamant_arrow.yaml
+++ b/data/items/ammo/adamant_arrow.yaml
@@ -1,23 +1,24 @@
 color: "78"
 craft:
-    consume:
-        - items:
-            - headless_arrow
-          quantity: 15
-        - items:
-            - adamant_arrowtips
-          quantity: 15
-    level: 60
-    output_qty: 15
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 10
+  ingredients:
+    - items:
+        - headless_arrow
+      quantity: 15
+    - items:
+        - adamant_arrowtips
+      quantity: 15
+  level: 60
+  output_qty: 15
+  type: fletching
+  wait: 2
+  xp: 10
 description: An adamant-tipped arrow.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 31
+  slot: ammo
+  type: ammo
 name: adamant arrow
-stackable: true
 recoverable: true
-stats:
-    ranged_strength: 31
+stackable: true
 value: 20
diff --git a/data/items/ammo/adamant_arrowtips.yaml b/data/items/ammo/adamant_arrowtips.yaml
index 6a8bb76..8e83ec8 100644
--- a/data/items/ammo/adamant_arrowtips.yaml
+++ b/data/items/ammo/adamant_arrowtips.yaml
@@ -1,12 +1,11 @@
 color: "78"
 craft:
-    consume:
+    ingredients:
         - items:
             - adamantite_bar
           quantity: 1
     level: 75
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/adamant_bolts.yaml b/data/items/ammo/adamant_bolts.yaml
index e61acd6..2a416ec 100644
--- a/data/items/ammo/adamant_bolts.yaml
+++ b/data/items/ammo/adamant_bolts.yaml
@@ -1,22 +1,23 @@
 color: "78"
 craft:
-    consume:
-        - items:
-            - adamant_bolts_unf
-          quantity: 10
-        - items:
-            - feather
-          quantity: 10
-    level: 61
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 0
-    xp: 70
+  ingredients:
+    - items:
+        - adamant_bolts_unf
+      quantity: 10
+    - items:
+        - feather
+      quantity: 10
+  level: 61
+  output_qty: 10
+  type: fletching
+  wait: 0
+  xp: 70
 description: Adamant crossbow bolts.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 43
+  slot: ammo
+  type: ammo
 name: adamant bolts
 stackable: true
-stats:
-    ranged_strength: 43
 value: 24
diff --git a/data/items/ammo/adamant_bolts_unf.yaml b/data/items/ammo/adamant_bolts_unf.yaml
index 96d2fec..857dc34 100644
--- a/data/items/ammo/adamant_bolts_unf.yaml
+++ b/data/items/ammo/adamant_bolts_unf.yaml
@@ -1,12 +1,11 @@
 color: "78"
 craft:
-    consume:
+    ingredients:
         - items:
             - adamantite_bar
           quantity: 1
     level: 76
     output_qty: 10
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/arrow_shaft.yaml b/data/items/ammo/arrow_shaft.yaml
index b4500a9..ce44c90 100644
--- a/data/items/ammo/arrow_shaft.yaml
+++ b/data/items/ammo/arrow_shaft.yaml
@@ -1,67 +1,61 @@
 color: "89"
 craft:
-    - consume:
+    - ingredients:
         - items:
             - logs
           quantity: 1
       level: 1
       output_qty: 15
-      skill: fletching
       tool: knife
       type: fletching
       wait: 5
       xp: 5
-    - consume:
+    - ingredients:
         - items:
             - oak_logs
           quantity: 1
       level: 15
       output_qty: 20
-      skill: fletching
       tool: knife
       type: fletching
       wait: 5
       xp: 10
-    - consume:
+    - ingredients:
         - items:
             - willow_logs
           quantity: 1
       level: 30
       output_qty: 25
-      skill: fletching
       tool: knife
       type: fletching
       wait: 5
       xp: 15
-    - consume:
+    - ingredients:
         - items:
             - maple_logs
           quantity: 1
       level: 45
       output_qty: 30
-      skill: fletching
       tool: knife
       type: fletching
       wait: 5
       xp: 20
-    - consume:
+    - ingredients:
         - items:
             - yew_logs
           quantity: 1
       level: 60
       output_qty: 35
-      skill: fletching
       tool: knife
       type: fletching
       wait: 5
       xp: 25
-    - consume:
+    - ingredients:
         - items:
             - magic_logs
           quantity: 1
       level: 75
       output_qty: 40
-      skill: fletching
       tool: knife
       type: fletching
       wait: 5
diff --git a/data/items/ammo/bronze_arrow.yaml b/data/items/ammo/bronze_arrow.yaml
index 85fac40..dfdac57 100644
--- a/data/items/ammo/bronze_arrow.yaml
+++ b/data/items/ammo/bronze_arrow.yaml
@@ -1,23 +1,24 @@
-color: "B2"
+color: B2
 craft:
-    consume:
-        - items:
-            - headless_arrow
-          quantity: 15
-        - items:
-            - bronze_arrowtips
-          quantity: 15
-    level: 1
-    output_qty: 15
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 1
+  ingredients:
+    - items:
+        - headless_arrow
+      quantity: 15
+    - items:
+        - bronze_arrowtips
+      quantity: 15
+  level: 1
+  output_qty: 15
+  type: fletching
+  wait: 2
+  xp: 1
 description: A bronze-tipped arrow.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 7
+  slot: ammo
+  type: ammo
 name: bronze arrow
-stackable: true
 recoverable: true
-stats:
-    ranged_strength: 7
+stackable: true
 value: 1
diff --git a/data/items/ammo/bronze_arrowtips.yaml b/data/items/ammo/bronze_arrowtips.yaml
index 3935852..d8dd71e 100644
--- a/data/items/ammo/bronze_arrowtips.yaml
+++ b/data/items/ammo/bronze_arrowtips.yaml
@@ -1,12 +1,11 @@
 color: "B2"
 craft:
-    consume:
+    ingredients:
         - items:
             - bronze_bar
           quantity: 1
     level: 5
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/bronze_bolts.yaml b/data/items/ammo/bronze_bolts.yaml
index bd45e8b..3aeb21b 100644
--- a/data/items/ammo/bronze_bolts.yaml
+++ b/data/items/ammo/bronze_bolts.yaml
@@ -1,22 +1,23 @@
-color: "B2"
+color: B2
 craft:
-    consume:
-        - items:
-            - bronze_bolts_unf
-          quantity: 10
-        - items:
-            - feather
-          quantity: 10
-    level: 9
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 0
-    xp: 5
+  ingredients:
+    - items:
+        - bronze_bolts_unf
+      quantity: 10
+    - items:
+        - feather
+      quantity: 10
+  level: 9
+  output_qty: 10
+  type: fletching
+  wait: 0
+  xp: 5
 description: Bronze crossbow bolts.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 10
+  slot: ammo
+  type: ammo
 name: bronze bolts
 stackable: true
-stats:
-    ranged_strength: 10
 value: 1
diff --git a/data/items/ammo/bronze_bolts_unf.yaml b/data/items/ammo/bronze_bolts_unf.yaml
index 83ed723..ff0a8be 100644
--- a/data/items/ammo/bronze_bolts_unf.yaml
+++ b/data/items/ammo/bronze_bolts_unf.yaml
@@ -1,12 +1,11 @@
 color: "B2"
 craft:
-    consume:
+    ingredients:
         - items:
             - bronze_bar
           quantity: 1
     level: 6
     output_qty: 10
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/diamond_bolt_tips.yaml b/data/items/ammo/diamond_bolt_tips.yaml
index 4ad1809..96bc0eb 100644
--- a/data/items/ammo/diamond_bolt_tips.yaml
+++ b/data/items/ammo/diamond_bolt_tips.yaml
@@ -1,12 +1,11 @@
 color: "FF"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_diamond
           quantity: 1
     level: 65
     output_qty: 12
-    skill: fletching
     tool: chisel
     type: fletching
     wait: 5
diff --git a/data/items/ammo/diamond_bolts.yaml b/data/items/ammo/diamond_bolts.yaml
index ea3e0af..1cbc3f6 100644
--- a/data/items/ammo/diamond_bolts.yaml
+++ b/data/items/ammo/diamond_bolts.yaml
@@ -1,22 +1,23 @@
-color: "FF"
+color: FF
 craft:
-    consume:
-        - items:
-            - adamant_bolts
-          quantity: 10
-        - items:
-            - diamond_bolt_tips
-          quantity: 10
-    level: 65
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 7
+  ingredients:
+    - items:
+        - adamant_bolts
+      quantity: 10
+    - items:
+        - diamond_bolt_tips
+      quantity: 10
+  level: 65
+  output_qty: 10
+  type: fletching
+  wait: 2
+  xp: 7
 description: Bolts tipped with diamond. Can be enchanted via science.
-equip_slot: ammo
+equipment:
+  attack:
+    ranged: 9
+  slot: ammo
+  type: ammo
 name: diamond bolts
 stackable: true
-stats:
-    ranged_attack: 9
 value: 130
diff --git a/data/items/ammo/diamond_bolts_e.yaml b/data/items/ammo/diamond_bolts_e.yaml
index 1243882..86209f2 100644
--- a/data/items/ammo/diamond_bolts_e.yaml
+++ b/data/items/ammo/diamond_bolts_e.yaml
@@ -1,8 +1,10 @@
+color: FF bold
+description: Enchanted diamond-tipped bolts. Have a chance to ignore the target's defense.
+equipment:
+  attack:
+    ranged: 10
+  slot: ammo
+  type: ammo
 name: diamond bolts e
-color: "FF bold"
-description: "Enchanted diamond-tipped bolts. Have a chance to ignore the target's defense."
-value: 180
 stackable: true
-equip_slot: ammo
-stats:
-  ranged_attack: 10
+value: 180
diff --git a/data/items/ammo/emerald_bolt_tips.yaml b/data/items/ammo/emerald_bolt_tips.yaml
index 9d94694..871ac1d 100644
--- a/data/items/ammo/emerald_bolt_tips.yaml
+++ b/data/items/ammo/emerald_bolt_tips.yaml
@@ -1,12 +1,11 @@
 color: "53"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_emerald
           quantity: 1
     level: 66
     output_qty: 12
-    skill: fletching
     tool: chisel
     type: fletching
     wait: 5
diff --git a/data/items/ammo/emerald_bolts.yaml b/data/items/ammo/emerald_bolts.yaml
index 15fde56..8cafc32 100644
--- a/data/items/ammo/emerald_bolts.yaml
+++ b/data/items/ammo/emerald_bolts.yaml
@@ -1,22 +1,23 @@
 color: "22"
 craft:
-    consume:
-        - items:
-            - mithril_bolts
-          quantity: 10
-        - items:
-            - emerald_bolt_tips
-          quantity: 10
-    level: 66
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 5
+  ingredients:
+    - items:
+        - mithril_bolts
+      quantity: 10
+    - items:
+        - emerald_bolt_tips
+      quantity: 10
+  level: 66
+  output_qty: 10
+  type: fletching
+  wait: 2
+  xp: 5
 description: Bolts tipped with emerald. Can be enchanted via science.
-equip_slot: ammo
+equipment:
+  attack:
+    ranged: 5
+  slot: ammo
+  type: ammo
 name: emerald bolts
 stackable: true
-stats:
-    ranged_attack: 5
 value: 40
diff --git a/data/items/ammo/emerald_bolts_e.yaml b/data/items/ammo/emerald_bolts_e.yaml
index 390730f..59f3883 100644
--- a/data/items/ammo/emerald_bolts_e.yaml
+++ b/data/items/ammo/emerald_bolts_e.yaml
@@ -1,8 +1,10 @@
+color: 22 bold
+description: Enchanted emerald-tipped bolts. Have a chance to poison the target.
+equipment:
+  attack:
+    ranged: 6
+  slot: ammo
+  type: ammo
 name: emerald bolts e
-color: "22 bold"
-description: "Enchanted emerald-tipped bolts. Have a chance to poison the target."
-value: 55
 stackable: true
-equip_slot: ammo
-stats:
-  ranged_attack: 6
+value: 55
diff --git a/data/items/ammo/headless_arrow.yaml b/data/items/ammo/headless_arrow.yaml
index d27cc1e..61ad40f 100644
--- a/data/items/ammo/headless_arrow.yaml
+++ b/data/items/ammo/headless_arrow.yaml
@@ -1,6 +1,6 @@
 color: "89"
 craft:
-    consume:
+    ingredients:
         - items:
             - arrow_shaft
           quantity: 15
@@ -10,7 +10,6 @@ craft:
     level: 1
     message: "You attach feathers to the %i1."
     output_qty: 15
-    skill: fletching
     type: fletching
     wait: 2
     xp: 1
diff --git a/data/items/ammo/iron_arrow.yaml b/data/items/ammo/iron_arrow.yaml
index 9a17ff8..f0036d8 100644
--- a/data/items/ammo/iron_arrow.yaml
+++ b/data/items/ammo/iron_arrow.yaml
@@ -1,23 +1,24 @@
-color: "FA"
+color: FA
 craft:
-    consume:
-        - items:
-            - headless_arrow
-          quantity: 15
-        - items:
-            - iron_arrowtips
-          quantity: 15
-    level: 15
-    output_qty: 15
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 2
+  ingredients:
+    - items:
+        - headless_arrow
+      quantity: 15
+    - items:
+        - iron_arrowtips
+      quantity: 15
+  level: 15
+  output_qty: 15
+  type: fletching
+  wait: 2
+  xp: 2
 description: An iron-tipped arrow.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 10
+  slot: ammo
+  type: ammo
 name: iron arrow
-stackable: true
 recoverable: true
-stats:
-    ranged_strength: 10
+stackable: true
 value: 2
diff --git a/data/items/ammo/iron_arrowtips.yaml b/data/items/ammo/iron_arrowtips.yaml
index aa4cc33..8aec7d9 100644
--- a/data/items/ammo/iron_arrowtips.yaml
+++ b/data/items/ammo/iron_arrowtips.yaml
@@ -1,12 +1,11 @@
 color: "FA"
 craft:
-    consume:
+    ingredients:
         - items:
             - iron_bar
           quantity: 1
     level: 25
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/iron_bolts.yaml b/data/items/ammo/iron_bolts.yaml
index f8ac883..30e5b28 100644
--- a/data/items/ammo/iron_bolts.yaml
+++ b/data/items/ammo/iron_bolts.yaml
@@ -1,22 +1,23 @@
-color: "FA"
+color: FA
 craft:
-    consume:
-        - items:
-            - iron_bolts_unf
-          quantity: 10
-        - items:
-            - feather
-          quantity: 10
-    level: 39
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 0
-    xp: 15
+  ingredients:
+    - items:
+        - iron_bolts_unf
+      quantity: 10
+    - items:
+        - feather
+      quantity: 10
+  level: 39
+  output_qty: 10
+  type: fletching
+  wait: 0
+  xp: 15
 description: Iron crossbow bolts.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 17
+  slot: ammo
+  type: ammo
 name: iron bolts
 stackable: true
-stats:
-    ranged_strength: 17
 value: 3
diff --git a/data/items/ammo/iron_bolts_unf.yaml b/data/items/ammo/iron_bolts_unf.yaml
index 32950fa..181a5e2 100644
--- a/data/items/ammo/iron_bolts_unf.yaml
+++ b/data/items/ammo/iron_bolts_unf.yaml
@@ -1,12 +1,11 @@
 color: "FA"
 craft:
-    consume:
+    ingredients:
         - items:
             - iron_bar
           quantity: 1
     level: 26
     output_qty: 10
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/mithril_arrow.yaml b/data/items/ammo/mithril_arrow.yaml
index 281f24a..853b38d 100644
--- a/data/items/ammo/mithril_arrow.yaml
+++ b/data/items/ammo/mithril_arrow.yaml
@@ -1,23 +1,24 @@
-color: "4B"
+color: 4B
 craft:
-    consume:
-        - items:
-            - headless_arrow
-          quantity: 15
-        - items:
-            - mithril_arrowtips
-          quantity: 15
-    level: 45
-    output_qty: 15
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 7
+  ingredients:
+    - items:
+        - headless_arrow
+      quantity: 15
+    - items:
+        - mithril_arrowtips
+      quantity: 15
+  level: 45
+  output_qty: 15
+  type: fletching
+  wait: 2
+  xp: 7
 description: A mithril-tipped arrow.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 22
+  slot: ammo
+  type: ammo
 name: mithril arrow
-stackable: true
 recoverable: true
-stats:
-    ranged_strength: 22
+stackable: true
 value: 10
diff --git a/data/items/ammo/mithril_arrowtips.yaml b/data/items/ammo/mithril_arrowtips.yaml
index d6acbf8..8f213ec 100644
--- a/data/items/ammo/mithril_arrowtips.yaml
+++ b/data/items/ammo/mithril_arrowtips.yaml
@@ -1,12 +1,11 @@
 color: "4B"
 craft:
-    consume:
+    ingredients:
         - items:
             - mithril_bar
           quantity: 1
     level: 55
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/mithril_bolts.yaml b/data/items/ammo/mithril_bolts.yaml
index fb3f10c..5f64ba1 100644
--- a/data/items/ammo/mithril_bolts.yaml
+++ b/data/items/ammo/mithril_bolts.yaml
@@ -1,22 +1,23 @@
-color: "4B"
+color: 4B
 craft:
-    consume:
-        - items:
-            - mithril_bolts_unf
-          quantity: 10
-        - items:
-            - feather
-          quantity: 10
-    level: 54
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 0
-    xp: 50
+  ingredients:
+    - items:
+        - mithril_bolts_unf
+      quantity: 10
+    - items:
+        - feather
+      quantity: 10
+  level: 54
+  output_qty: 10
+  type: fletching
+  wait: 0
+  xp: 50
 description: Mithril crossbow bolts.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 32
+  slot: ammo
+  type: ammo
 name: mithril bolts
 stackable: true
-stats:
-    ranged_strength: 32
 value: 12
diff --git a/data/items/ammo/mithril_bolts_unf.yaml b/data/items/ammo/mithril_bolts_unf.yaml
index ea3879a..0ff8efe 100644
--- a/data/items/ammo/mithril_bolts_unf.yaml
+++ b/data/items/ammo/mithril_bolts_unf.yaml
@@ -1,12 +1,11 @@
 color: "4B"
 craft:
-    consume:
+    ingredients:
         - items:
             - mithril_bar
           quantity: 1
     level: 56
     output_qty: 10
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/ruby_bolt_tips.yaml b/data/items/ammo/ruby_bolt_tips.yaml
index e8a1e0b..a900f90 100644
--- a/data/items/ammo/ruby_bolt_tips.yaml
+++ b/data/items/ammo/ruby_bolt_tips.yaml
@@ -1,12 +1,11 @@
 color: "C4"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_ruby
           quantity: 1
     level: 73
     output_qty: 12
-    skill: fletching
     tool: chisel
     type: fletching
     wait: 5
diff --git a/data/items/ammo/ruby_bolts.yaml b/data/items/ammo/ruby_bolts.yaml
index a30b5bb..354d595 100644
--- a/data/items/ammo/ruby_bolts.yaml
+++ b/data/items/ammo/ruby_bolts.yaml
@@ -1,22 +1,23 @@
-color: "C4"
+color: C4
 craft:
-    consume:
-        - items:
-            - adamant_bolts
-          quantity: 10
-        - items:
-            - ruby_bolt_tips
-          quantity: 10
-    level: 73
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 6
+  ingredients:
+    - items:
+        - adamant_bolts
+      quantity: 10
+    - items:
+        - ruby_bolt_tips
+      quantity: 10
+  level: 73
+  output_qty: 10
+  type: fletching
+  wait: 2
+  xp: 6
 description: Bolts tipped with ruby. Can be enchanted via science.
-equip_slot: ammo
+equipment:
+  attack:
+    ranged: 7
+  slot: ammo
+  type: ammo
 name: ruby bolts
 stackable: true
-stats:
-    ranged_attack: 7
 value: 75
diff --git a/data/items/ammo/ruby_bolts_e.yaml b/data/items/ammo/ruby_bolts_e.yaml
index 0aaa79e..618cf62 100644
--- a/data/items/ammo/ruby_bolts_e.yaml
+++ b/data/items/ammo/ruby_bolts_e.yaml
@@ -1,8 +1,10 @@
+color: C4 bold
+description: Enchanted ruby-tipped bolts. Have a chance to deal extra damage based on the target's remaining HP.
+equipment:
+  attack:
+    ranged: 8
+  slot: ammo
+  type: ammo
 name: ruby bolts e
-color: "C4 bold"
-description: "Enchanted ruby-tipped bolts. Have a chance to deal extra damage based on the target's remaining HP."
-value: 100
 stackable: true
-equip_slot: ammo
-stats:
-  ranged_attack: 8
+value: 100
diff --git a/data/items/ammo/rune_arrow.yaml b/data/items/ammo/rune_arrow.yaml
index f6cee8e..e997871 100644
--- a/data/items/ammo/rune_arrow.yaml
+++ b/data/items/ammo/rune_arrow.yaml
@@ -1,23 +1,24 @@
 color: "57"
 craft:
-    consume:
-        - items:
-            - headless_arrow
-          quantity: 15
-        - items:
-            - rune_arrowtips
-          quantity: 15
-    level: 75
-    output_qty: 15
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 12
+  ingredients:
+    - items:
+        - headless_arrow
+      quantity: 15
+    - items:
+        - rune_arrowtips
+      quantity: 15
+  level: 75
+  output_qty: 15
+  type: fletching
+  wait: 2
+  xp: 12
 description: A rune-tipped arrow.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 49
+  slot: ammo
+  type: ammo
 name: rune arrow
-stackable: true
 recoverable: true
-stats:
-    ranged_strength: 49
+stackable: true
 value: 40
diff --git a/data/items/ammo/rune_arrowtips.yaml b/data/items/ammo/rune_arrowtips.yaml
index d729996..354cf0e 100644
--- a/data/items/ammo/rune_arrowtips.yaml
+++ b/data/items/ammo/rune_arrowtips.yaml
@@ -1,12 +1,11 @@
 color: "57"
 craft:
-    consume:
+    ingredients:
         - items:
             - runite_bar
           quantity: 1
     level: 90
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/rune_bolts.yaml b/data/items/ammo/rune_bolts.yaml
index 738cd4c..534dc94 100644
--- a/data/items/ammo/rune_bolts.yaml
+++ b/data/items/ammo/rune_bolts.yaml
@@ -1,22 +1,23 @@
 color: "57"
 craft:
-    consume:
-        - items:
-            - rune_bolts_unf
-          quantity: 10
-        - items:
-            - feather
-          quantity: 10
-    level: 69
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 0
-    xp: 100
+  ingredients:
+    - items:
+        - rune_bolts_unf
+      quantity: 10
+    - items:
+        - feather
+      quantity: 10
+  level: 69
+  output_qty: 10
+  type: fletching
+  wait: 0
+  xp: 100
 description: Rune crossbow bolts.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 55
+  slot: ammo
+  type: ammo
 name: rune bolts
 stackable: true
-stats:
-    ranged_strength: 55
 value: 48
diff --git a/data/items/ammo/rune_bolts_unf.yaml b/data/items/ammo/rune_bolts_unf.yaml
index 0b824f6..a529c37 100644
--- a/data/items/ammo/rune_bolts_unf.yaml
+++ b/data/items/ammo/rune_bolts_unf.yaml
@@ -1,12 +1,11 @@
 color: "57"
 craft:
-    consume:
+    ingredients:
         - items:
             - runite_bar
           quantity: 1
     level: 91
     output_qty: 10
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/sapphire_bolt_tips.yaml b/data/items/ammo/sapphire_bolt_tips.yaml
index 92e04f0..bffee83 100644
--- a/data/items/ammo/sapphire_bolt_tips.yaml
+++ b/data/items/ammo/sapphire_bolt_tips.yaml
@@ -1,12 +1,11 @@
 color: "45"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_sapphire
           quantity: 1
     level: 63
     output_qty: 12
-    skill: fletching
     tool: chisel
     type: fletching
     wait: 5
diff --git a/data/items/ammo/sapphire_bolts.yaml b/data/items/ammo/sapphire_bolts.yaml
index ec7ae3d..253de08 100644
--- a/data/items/ammo/sapphire_bolts.yaml
+++ b/data/items/ammo/sapphire_bolts.yaml
@@ -1,22 +1,23 @@
 color: "27"
 craft:
-    consume:
-        - items:
-            - mithril_bolts
-          quantity: 10
-        - items:
-            - sapphire_bolt_tips
-          quantity: 10
-    level: 63
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 4
+  ingredients:
+    - items:
+        - mithril_bolts
+      quantity: 10
+    - items:
+        - sapphire_bolt_tips
+      quantity: 10
+  level: 63
+  output_qty: 10
+  type: fletching
+  wait: 2
+  xp: 4
 description: Bolts tipped with sapphire. Can be enchanted via science.
-equip_slot: ammo
+equipment:
+  attack:
+    ranged: 3
+  slot: ammo
+  type: ammo
 name: sapphire bolts
 stackable: true
-stats:
-    ranged_attack: 3
 value: 20
diff --git a/data/items/ammo/sapphire_bolts_e.yaml b/data/items/ammo/sapphire_bolts_e.yaml
index af05b9c..07694ea 100644
--- a/data/items/ammo/sapphire_bolts_e.yaml
+++ b/data/items/ammo/sapphire_bolts_e.yaml
@@ -1,8 +1,10 @@
+color: 27 bold
+description: Enchanted sapphire-tipped bolts. Have a chance to drain the target's Science level.
+equipment:
+  attack:
+    ranged: 4
+  slot: ammo
+  type: ammo
 name: sapphire bolts e
-color: "27 bold"
-description: "Enchanted sapphire-tipped bolts. Have a chance to drain the target's Science level."
-value: 30
 stackable: true
-equip_slot: ammo
-stats:
-  ranged_attack: 4
+value: 30
diff --git a/data/items/ammo/steel_arrow.yaml b/data/items/ammo/steel_arrow.yaml
index 8d8f18c..4f0fe7d 100644
--- a/data/items/ammo/steel_arrow.yaml
+++ b/data/items/ammo/steel_arrow.yaml
@@ -1,23 +1,24 @@
-color: "FD"
+color: FD
 craft:
-    consume:
-        - items:
-            - headless_arrow
-          quantity: 15
-        - items:
-            - steel_arrowtips
-          quantity: 15
-    level: 30
-    output_qty: 15
-    skill: fletching
-    type: fletching
-    wait: 2
-    xp: 5
+  ingredients:
+    - items:
+        - headless_arrow
+      quantity: 15
+    - items:
+        - steel_arrowtips
+      quantity: 15
+  level: 30
+  output_qty: 15
+  type: fletching
+  wait: 2
+  xp: 5
 description: A steel-tipped arrow.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 16
+  slot: ammo
+  type: ammo
 name: steel arrow
-stackable: true
 recoverable: true
-stats:
-    ranged_strength: 16
+stackable: true
 value: 5
diff --git a/data/items/ammo/steel_arrowtips.yaml b/data/items/ammo/steel_arrowtips.yaml
index 519ce09..b455f31 100644
--- a/data/items/ammo/steel_arrowtips.yaml
+++ b/data/items/ammo/steel_arrowtips.yaml
@@ -1,12 +1,11 @@
 color: "FD"
 craft:
-    consume:
+    ingredients:
         - items:
             - steel_bar
           quantity: 1
     level: 35
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/ammo/steel_bolts.yaml b/data/items/ammo/steel_bolts.yaml
index 4dfa7d4..f91b024 100644
--- a/data/items/ammo/steel_bolts.yaml
+++ b/data/items/ammo/steel_bolts.yaml
@@ -1,22 +1,23 @@
-color: "FD"
+color: FD
 craft:
-    consume:
-        - items:
-            - steel_bolts_unf
-          quantity: 10
-        - items:
-            - feather
-          quantity: 10
-    level: 46
-    output_qty: 10
-    skill: fletching
-    type: fletching
-    wait: 0
-    xp: 35
+  ingredients:
+    - items:
+        - steel_bolts_unf
+      quantity: 10
+    - items:
+        - feather
+      quantity: 10
+  level: 46
+  output_qty: 10
+  type: fletching
+  wait: 0
+  xp: 35
 description: Steel crossbow bolts.
-equip_slot: ammo
+equipment:
+  other:
+    ranged: 25
+  slot: ammo
+  type: ammo
 name: steel bolts
 stackable: true
-stats:
-    ranged_strength: 25
 value: 6
diff --git a/data/items/ammo/steel_bolts_unf.yaml b/data/items/ammo/steel_bolts_unf.yaml
index dd69c37..4532220 100644
--- a/data/items/ammo/steel_bolts_unf.yaml
+++ b/data/items/ammo/steel_bolts_unf.yaml
@@ -1,12 +1,11 @@
 color: "FD"
 craft:
-    consume:
+    ingredients:
         - items:
             - steel_bar
           quantity: 1
     level: 36
     output_qty: 10
-    skill: smithing
     station:
         - anvil
     type: smithing