feat: qol improvements to items crud in admin gui

40 files changed, 84 insertions, 101 deletions

diff --git a/data/items/materials/adamant_nails.yaml b/data/items/materials/adamant_nails.yaml
index e47e79c..25fb80b 100644
--- a/data/items/materials/adamant_nails.yaml
+++ b/data/items/materials/adamant_nails.yaml
@@ -1,12 +1,11 @@
 color: "78"
 craft:
-    consume:
+    ingredients:
         - items:
             - adamantite_bar
           quantity: 1
     level: 74
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/materials/adamantite_bar.yaml b/data/items/materials/adamantite_bar.yaml
index d5095e2..4fed7fc 100644
--- a/data/items/materials/adamantite_bar.yaml
+++ b/data/items/materials/adamantite_bar.yaml
@@ -1,6 +1,6 @@
 color: "47"
 craft:
-    consume:
+    ingredients:
         - items:
             - adamantite_ore
           quantity: 1
@@ -9,10 +9,10 @@ craft:
           quantity: 6
     fail_message: You fail to smelt a usable bar.
     level: 65
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 37
 description: A bar of adamantite metal, extremely durable.
diff --git a/data/items/materials/avantoe.yaml b/data/items/materials/avantoe.yaml
index 340a8d0..75727af 100644
--- a/data/items/materials/avantoe.yaml
+++ b/data/items/materials/avantoe.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_avantoe
           quantity: 1
     level: 48
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 10
 description: A clean avantoe leaf, ready for use in pharmacy.
diff --git a/data/items/materials/ball_of_wool.yaml b/data/items/materials/ball_of_wool.yaml
index de6bc98..d074203 100644
--- a/data/items/materials/ball_of_wool.yaml
+++ b/data/items/materials/ball_of_wool.yaml
@@ -1,12 +1,11 @@
 color: "FF"
 craft:
-    consume:
+    ingredients:
         - items:
             - wool
           quantity: 1
     level: 1
     message: "You spin the wool into a %n."
-    skill: crafting
     station:
         - spinning_wheel
     type: crafting
diff --git a/data/items/materials/bowstring.yaml b/data/items/materials/bowstring.yaml
index 30b01ae..fab0510 100644
--- a/data/items/materials/bowstring.yaml
+++ b/data/items/materials/bowstring.yaml
@@ -1,12 +1,11 @@
 color: "E6"
 craft:
-    consume:
+    ingredients:
         - items:
             - flax
           quantity: 1
     level: 1
     message: "You spin the flax into a %n."
-    skill: crafting
     station:
         - spinning_wheel
     type: crafting
diff --git a/data/items/materials/bronze_bar.yaml b/data/items/materials/bronze_bar.yaml
index fabdf07..c7a999e 100644
--- a/data/items/materials/bronze_bar.yaml
+++ b/data/items/materials/bronze_bar.yaml
@@ -1,6 +1,6 @@
 color: "B2"
 craft:
-    consume:
+    ingredients:
         - items:
             - copper_ore
           quantity: 1
@@ -9,10 +9,10 @@ craft:
           quantity: 1
     fail_message: You fail to smelt a usable bar.
     level: 1
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 6
 description: A bar of bronze metal, smelted from copper and tin ore.
diff --git a/data/items/materials/bronze_nails.yaml b/data/items/materials/bronze_nails.yaml
index 5b0ddfd..748f848 100644
--- a/data/items/materials/bronze_nails.yaml
+++ b/data/items/materials/bronze_nails.yaml
@@ -1,12 +1,11 @@
 color: "B2"
 craft:
-    consume:
+    ingredients:
         - items:
             - bronze_bar
           quantity: 1
     level: 4
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/materials/cadantine.yaml b/data/items/materials/cadantine.yaml
index 6f97167..24513ce 100644
--- a/data/items/materials/cadantine.yaml
+++ b/data/items/materials/cadantine.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_cadantine
           quantity: 1
     level: 65
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 13
 description: A clean cadantine leaf, ready for use in pharmacy.
diff --git a/data/items/materials/diamond.yaml b/data/items/materials/diamond.yaml
index 20e38b3..4bf610a 100644
--- a/data/items/materials/diamond.yaml
+++ b/data/items/materials/diamond.yaml
@@ -1,12 +1,11 @@
 color: "FF"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_diamond
           quantity: 1
     level: 43
     message: "You cut the %i1 into a beautiful %n."
-    skill: crafting
     tool: chisel
     type: crafting
     wait: 3
diff --git a/data/items/materials/dwarf_weed.yaml b/data/items/materials/dwarf_weed.yaml
index 486ea18..edb1058 100644
--- a/data/items/materials/dwarf_weed.yaml
+++ b/data/items/materials/dwarf_weed.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_dwarf_weed
           quantity: 1
     level: 70
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 14
 description: A clean dwarf weed leaf, ready for use in pharmacy.
diff --git a/data/items/materials/emerald.yaml b/data/items/materials/emerald.yaml
index 218a54a..5d729cd 100644
--- a/data/items/materials/emerald.yaml
+++ b/data/items/materials/emerald.yaml
@@ -1,12 +1,11 @@
 color: "53"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_emerald
           quantity: 1
     level: 27
     message: "You cut the %i1 into a beautiful %n."
-    skill: crafting
     tool: chisel
     type: crafting
     wait: 3
diff --git a/data/items/materials/gold_bar.yaml b/data/items/materials/gold_bar.yaml
index 749584a..895db74 100644
--- a/data/items/materials/gold_bar.yaml
+++ b/data/items/materials/gold_bar.yaml
@@ -1,15 +1,15 @@
 color: "DC"
 craft:
-    consume:
+    ingredients:
         - items:
             - gold_ore
           quantity: 1
     fail_message: You fail to smelt a usable bar.
     level: 45
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 22
 description: A bar of gold metal.
diff --git a/data/items/materials/guam.yaml b/data/items/materials/guam.yaml
index c0b2592..c0ad838 100644
--- a/data/items/materials/guam.yaml
+++ b/data/items/materials/guam.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_guam
           quantity: 1
     level: 1
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 3
 description: A clean guam leaf, ready for use in pharmacy.
diff --git a/data/items/materials/harralander.yaml b/data/items/materials/harralander.yaml
index b595db5..276c676 100644
--- a/data/items/materials/harralander.yaml
+++ b/data/items/materials/harralander.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_harralander
           quantity: 1
     level: 20
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 6
 description: A clean harralander leaf, ready for use in pharmacy.
diff --git a/data/items/materials/irit.yaml b/data/items/materials/irit.yaml
index c6d5028..90f41b5 100644
--- a/data/items/materials/irit.yaml
+++ b/data/items/materials/irit.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_irit
           quantity: 1
     level: 40
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 9
 description: A clean irit leaf, ready for use in pharmacy.
diff --git a/data/items/materials/iron_bar.yaml b/data/items/materials/iron_bar.yaml
index a6f89c8..4ef4c11 100644
--- a/data/items/materials/iron_bar.yaml
+++ b/data/items/materials/iron_bar.yaml
@@ -1,19 +1,19 @@
 color: "FA"
 craft:
-    consume:
+    ingredients:
         - items:
             - iron_ore
           quantity: 1
     fail_message: The iron is too impure to make a workable bar.
     level: 20
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
     success:
         base: 0.5
         cap: 0.5
         per_level: 0
-    type: smelting
+    type: smithing
     wait: 4
     xp: 12
 description: A bar of iron metal.
diff --git a/data/items/materials/iron_nails.yaml b/data/items/materials/iron_nails.yaml
index 39384e8..dc647f5 100644
--- a/data/items/materials/iron_nails.yaml
+++ b/data/items/materials/iron_nails.yaml
@@ -1,12 +1,11 @@
 color: "FA"
 craft:
-    consume:
+    ingredients:
         - items:
             - iron_bar
           quantity: 1
     level: 24
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/materials/kwuarm.yaml b/data/items/materials/kwuarm.yaml
index c31610a..77e0ead 100644
--- a/data/items/materials/kwuarm.yaml
+++ b/data/items/materials/kwuarm.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_kwuarm
           quantity: 1
     level: 54
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 11
 description: A clean kwuarm leaf, ready for use in pharmacy.
diff --git a/data/items/materials/lantadyme.yaml b/data/items/materials/lantadyme.yaml
index 3ed6ef5..67663ac 100644
--- a/data/items/materials/lantadyme.yaml
+++ b/data/items/materials/lantadyme.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_lantadyme
           quantity: 1
     level: 67
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 13
 description: A clean lantadyme leaf, ready for use in pharmacy.
diff --git a/data/items/materials/mahogany_planks.yaml b/data/items/materials/mahogany_planks.yaml
index a0e4ed7..a3f3e0b 100644
--- a/data/items/materials/mahogany_planks.yaml
+++ b/data/items/materials/mahogany_planks.yaml
@@ -1,12 +1,11 @@
 color: "60"
 craft:
-    consume:
+    ingredients:
         - items:
             - mahogany_logs
           quantity: 1
     level: 50
     message: "You saw the mahogany logs into %n."
-    skill: construction
     station:
         - workbench
     tool: saw
diff --git a/data/items/materials/marrentill.yaml b/data/items/materials/marrentill.yaml
index cb37431..17730b7 100644
--- a/data/items/materials/marrentill.yaml
+++ b/data/items/materials/marrentill.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_marrentill
           quantity: 1
     level: 5
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 4
 description: A clean marrentill leaf, ready for use in pharmacy.
diff --git a/data/items/materials/mithril_bar.yaml b/data/items/materials/mithril_bar.yaml
index f625c97..0cc0102 100644
--- a/data/items/materials/mithril_bar.yaml
+++ b/data/items/materials/mithril_bar.yaml
@@ -1,6 +1,6 @@
 color: "4B"
 craft:
-    consume:
+    ingredients:
         - items:
             - mithril_ore
           quantity: 1
@@ -9,10 +9,10 @@ craft:
           quantity: 4
     fail_message: You fail to smelt a usable bar.
     level: 50
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 30
 description: A bar of mithril metal, light and strong.
diff --git a/data/items/materials/mithril_nails.yaml b/data/items/materials/mithril_nails.yaml
index 43d39d2..f747da2 100644
--- a/data/items/materials/mithril_nails.yaml
+++ b/data/items/materials/mithril_nails.yaml
@@ -1,12 +1,11 @@
 color: "4B"
 craft:
-    consume:
+    ingredients:
         - items:
             - mithril_bar
           quantity: 1
     level: 54
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/materials/oak_planks.yaml b/data/items/materials/oak_planks.yaml
index 6f6b793..82e5504 100644
--- a/data/items/materials/oak_planks.yaml
+++ b/data/items/materials/oak_planks.yaml
@@ -1,12 +1,11 @@
 color: "66"
 craft:
-    consume:
+    ingredients:
         - items:
             - oak_logs
           quantity: 1
     level: 15
     message: "You saw the oak logs into %n."
-    skill: construction
     station:
         - workbench
     tool: saw
diff --git a/data/items/materials/planks.yaml b/data/items/materials/planks.yaml
index 1c1b8cf..d2ad6c2 100644
--- a/data/items/materials/planks.yaml
+++ b/data/items/materials/planks.yaml
@@ -1,12 +1,11 @@
 color: "89"
 craft:
-    consume:
+    ingredients:
         - items:
             - logs
           quantity: 1
     level: 1
     message: "You saw the logs into %n."
-    skill: construction
     station:
         - workbench
     tool: saw
diff --git a/data/items/materials/ranarr.yaml b/data/items/materials/ranarr.yaml
index 94b36aa..4527c52 100644
--- a/data/items/materials/ranarr.yaml
+++ b/data/items/materials/ranarr.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_ranarr
           quantity: 1
     level: 25
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 8
 description: A clean ranarr leaf, ready for use in pharmacy.
diff --git a/data/items/materials/ruby.yaml b/data/items/materials/ruby.yaml
index a2875f1..eb7968b 100644
--- a/data/items/materials/ruby.yaml
+++ b/data/items/materials/ruby.yaml
@@ -1,12 +1,11 @@
 color: "C4"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_ruby
           quantity: 1
     level: 63
     message: "You cut the %i1 into a beautiful %n."
-    skill: crafting
     tool: chisel
     type: crafting
     wait: 3
diff --git a/data/items/materials/rune_nails.yaml b/data/items/materials/rune_nails.yaml
index c49949f..5cea6e0 100644
--- a/data/items/materials/rune_nails.yaml
+++ b/data/items/materials/rune_nails.yaml
@@ -1,12 +1,11 @@
 color: "57"
 craft:
-    consume:
+    ingredients:
         - items:
             - runite_bar
           quantity: 1
     level: 89
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/materials/runite_bar.yaml b/data/items/materials/runite_bar.yaml
index d1c7bb0..1b4823d 100644
--- a/data/items/materials/runite_bar.yaml
+++ b/data/items/materials/runite_bar.yaml
@@ -1,6 +1,6 @@
 color: "27"
 craft:
-    consume:
+    ingredients:
         - items:
             - runite_ore
           quantity: 1
@@ -9,10 +9,10 @@ craft:
           quantity: 8
     fail_message: You fail to smelt a usable bar.
     level: 80
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 50
 description: A bar of runite metal, the finest alloy known.
diff --git a/data/items/materials/sapphire.yaml b/data/items/materials/sapphire.yaml
index fc11f76..bc73cd9 100644
--- a/data/items/materials/sapphire.yaml
+++ b/data/items/materials/sapphire.yaml
@@ -1,12 +1,11 @@
 color: "45"
 craft:
-    consume:
+    ingredients:
         - items:
             - uncut_sapphire
           quantity: 1
     level: 20
     message: "You cut the %i1 into a beautiful %n."
-    skill: crafting
     tool: chisel
     type: crafting
     wait: 3
diff --git a/data/items/materials/silver_bar.yaml b/data/items/materials/silver_bar.yaml
index ec4ae8d..cf85b31 100644
--- a/data/items/materials/silver_bar.yaml
+++ b/data/items/materials/silver_bar.yaml
@@ -1,15 +1,15 @@
 color: "FF"
 craft:
-    consume:
+    ingredients:
         - items:
             - silver_ore
           quantity: 1
     fail_message: You fail to smelt a usable bar.
     level: 25
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 14
 description: A bar of silver metal.
diff --git a/data/items/materials/snapdragon.yaml b/data/items/materials/snapdragon.yaml
index dec19d6..a05c87d 100644
--- a/data/items/materials/snapdragon.yaml
+++ b/data/items/materials/snapdragon.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_snapdragon
           quantity: 1
     level: 59
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 12
 description: A clean snapdragon leaf, ready for use in pharmacy.
diff --git a/data/items/materials/soft_clay.yaml b/data/items/materials/soft_clay.yaml
index b55ed16..d9935dd 100644
--- a/data/items/materials/soft_clay.yaml
+++ b/data/items/materials/soft_clay.yaml
@@ -1,7 +1,7 @@
 color: "AD"
 craft:
     type: combine
-    consume:
+    ingredients:
         - items:
             - clay
           quantity: 1
diff --git a/data/items/materials/steel_bar.yaml b/data/items/materials/steel_bar.yaml
index 5788911..31d8224 100644
--- a/data/items/materials/steel_bar.yaml
+++ b/data/items/materials/steel_bar.yaml
@@ -1,6 +1,6 @@
 color: "FE"
 craft:
-    consume:
+    ingredients:
         - items:
             - iron_ore
           quantity: 1
@@ -9,10 +9,10 @@ craft:
           quantity: 2
     fail_message: You fail to smelt a usable bar.
     level: 40
-    skill: smithing
+    subtype: smelt
     station:
         - furnace
-    type: smelting
+    type: smithing
     wait: 4
     xp: 17
 description: A bar of steel, forged from iron ore and coal.
diff --git a/data/items/materials/steel_nails.yaml b/data/items/materials/steel_nails.yaml
index ef1fe33..12bab1e 100644
--- a/data/items/materials/steel_nails.yaml
+++ b/data/items/materials/steel_nails.yaml
@@ -1,12 +1,11 @@
 color: "FD"
 craft:
-    consume:
+    ingredients:
         - items:
             - steel_bar
           quantity: 1
     level: 34
     output_qty: 15
-    skill: smithing
     station:
         - anvil
     type: smithing
diff --git a/data/items/materials/stim_cell.yaml b/data/items/materials/stim_cell.yaml
index c04bc05..6637cc7 100644
--- a/data/items/materials/stim_cell.yaml
+++ b/data/items/materials/stim_cell.yaml
@@ -1,6 +1,6 @@
 color: "E2"
 craft:
-    consume:
+    ingredients:
         - items:
             - harralander_potion_unf
           quantity: 1
@@ -8,7 +8,6 @@ craft:
             - chocolate_dust
           quantity: 1
     level: 26
-    skill: pharmacy
     type: pharmacy
     wait: 4
     xp: 68
diff --git a/data/items/materials/tarromin.yaml b/data/items/materials/tarromin.yaml
index fd77fcd..4783bed 100644
--- a/data/items/materials/tarromin.yaml
+++ b/data/items/materials/tarromin.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_tarromin
           quantity: 1
     level: 11
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 5
 description: A clean tarromin leaf, ready for use in pharmacy.
diff --git a/data/items/materials/teak_planks.yaml b/data/items/materials/teak_planks.yaml
index 3d41e0b..400c9e5 100644
--- a/data/items/materials/teak_planks.yaml
+++ b/data/items/materials/teak_planks.yaml
@@ -1,12 +1,11 @@
 color: "64"
 craft:
-    consume:
+    ingredients:
         - items:
             - teak_logs
           quantity: 1
     level: 35
     message: "You saw the teak logs into %n."
-    skill: construction
     station:
         - workbench
     tool: saw
diff --git a/data/items/materials/toadflax.yaml b/data/items/materials/toadflax.yaml
index ba63139..9405301 100644
--- a/data/items/materials/toadflax.yaml
+++ b/data/items/materials/toadflax.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_toadflax
           quantity: 1
     level: 30
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 8
 description: A clean toadflax leaf, ready for use in pharmacy.
diff --git a/data/items/materials/torstol.yaml b/data/items/materials/torstol.yaml
index c2cc1e8..f220b28 100644
--- a/data/items/materials/torstol.yaml
+++ b/data/items/materials/torstol.yaml
@@ -1,12 +1,12 @@
 color: "30"
 craft:
-    consume:
+    ingredients:
         - items:
             - grimy_torstol
           quantity: 1
     level: 75
-    skill: pharmacy
-    type: clean
+    subtype: clean
+    type: pharmacy
     wait: 2
     xp: 15
 description: A clean torstol leaf, ready for use in pharmacy.