feat: admin gui map, item, and objects mostly complete

40 files changed, 62 insertions, 62 deletions

diff --git a/data/items/materials/adamant_nails.yaml b/data/items/materials/adamant_nails.yaml
index 25fb80b..4b48a75 100644
--- a/data/items/materials/adamant_nails.yaml
+++ b/data/items/materials/adamant_nails.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - anvil
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 62
 description: A set of adamant nails.
 name: adamant nails
diff --git a/data/items/materials/adamantite_bar.yaml b/data/items/materials/adamantite_bar.yaml
index 4fed7fc..5e1ff84 100644
--- a/data/items/materials/adamantite_bar.yaml
+++ b/data/items/materials/adamantite_bar.yaml
@@ -9,11 +9,11 @@ craft:
           quantity: 6
     fail_message: You fail to smelt a usable bar.
     level: 65
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 37
 description: A bar of adamantite metal, extremely durable.
 name: adamantite bar
diff --git a/data/items/materials/avantoe.yaml b/data/items/materials/avantoe.yaml
index 75727af..ed09e84 100644
--- a/data/items/materials/avantoe.yaml
+++ b/data/items/materials/avantoe.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_avantoe
           quantity: 1
     level: 48
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 10
 description: A clean avantoe leaf, ready for use in pharmacy.
 name: avantoe
diff --git a/data/items/materials/ball_of_wool.yaml b/data/items/materials/ball_of_wool.yaml
index 5dc1a2d..ad0bce4 100644
--- a/data/items/materials/ball_of_wool.yaml
+++ b/data/items/materials/ball_of_wool.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - spinning_wheel
     type: crafting
-    wait: 3
+    ticks_per_cycle: 3
     xp: 3
 description: A ball of spun wool.
 name: ball of wool
diff --git a/data/items/materials/bowstring.yaml b/data/items/materials/bowstring.yaml
index e0f63b3..5a968a8 100644
--- a/data/items/materials/bowstring.yaml
+++ b/data/items/materials/bowstring.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - spinning_wheel
     type: crafting
-    wait: 3
+    ticks_per_cycle: 3
     xp: 15
 description: A string used for stringing bows.
 name: bowstring
diff --git a/data/items/materials/bronze_bar.yaml b/data/items/materials/bronze_bar.yaml
index c7a999e..1dacbc4 100644
--- a/data/items/materials/bronze_bar.yaml
+++ b/data/items/materials/bronze_bar.yaml
@@ -9,11 +9,11 @@ craft:
           quantity: 1
     fail_message: You fail to smelt a usable bar.
     level: 1
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 6
 description: A bar of bronze metal, smelted from copper and tin ore.
 name: bronze bar
diff --git a/data/items/materials/bronze_nails.yaml b/data/items/materials/bronze_nails.yaml
index 748f848..e85bce9 100644
--- a/data/items/materials/bronze_nails.yaml
+++ b/data/items/materials/bronze_nails.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - anvil
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 12
 description: A set of bronze nails.
 name: bronze nails
diff --git a/data/items/materials/cadantine.yaml b/data/items/materials/cadantine.yaml
index 24513ce..fcf9494 100644
--- a/data/items/materials/cadantine.yaml
+++ b/data/items/materials/cadantine.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_cadantine
           quantity: 1
     level: 65
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 13
 description: A clean cadantine leaf, ready for use in pharmacy.
 name: cadantine
diff --git a/data/items/materials/diamond.yaml b/data/items/materials/diamond.yaml
index 0e8fe92..5569cf4 100644
--- a/data/items/materials/diamond.yaml
+++ b/data/items/materials/diamond.yaml
@@ -8,7 +8,7 @@ craft:
     success_message: "You cut the %i1 into a beautiful %n."
     tool: chisel
     type: crafting
-    wait: 3
+    ticks_per_cycle: 3
     xp: 108
 description: A beautifully cut diamond.
 name: diamond
diff --git a/data/items/materials/dwarf_weed.yaml b/data/items/materials/dwarf_weed.yaml
index edb1058..bbbec7a 100644
--- a/data/items/materials/dwarf_weed.yaml
+++ b/data/items/materials/dwarf_weed.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_dwarf_weed
           quantity: 1
     level: 70
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 14
 description: A clean dwarf weed leaf, ready for use in pharmacy.
 name: dwarf weed
diff --git a/data/items/materials/emerald.yaml b/data/items/materials/emerald.yaml
index a39257c..dd844d8 100644
--- a/data/items/materials/emerald.yaml
+++ b/data/items/materials/emerald.yaml
@@ -8,7 +8,7 @@ craft:
     success_message: "You cut the %i1 into a beautiful %n."
     tool: chisel
     type: crafting
-    wait: 3
+    ticks_per_cycle: 3
     xp: 68
 description: A beautifully cut emerald.
 name: emerald
diff --git a/data/items/materials/gold_bar.yaml b/data/items/materials/gold_bar.yaml
index 895db74..cc290e8 100644
--- a/data/items/materials/gold_bar.yaml
+++ b/data/items/materials/gold_bar.yaml
@@ -6,11 +6,11 @@ craft:
           quantity: 1
     fail_message: You fail to smelt a usable bar.
     level: 45
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 22
 description: A bar of gold metal.
 name: gold bar
diff --git a/data/items/materials/guam.yaml b/data/items/materials/guam.yaml
index c0ad838..423238f 100644
--- a/data/items/materials/guam.yaml
+++ b/data/items/materials/guam.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_guam
           quantity: 1
     level: 1
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 3
 description: A clean guam leaf, ready for use in pharmacy.
 name: guam
diff --git a/data/items/materials/harralander.yaml b/data/items/materials/harralander.yaml
index 276c676..22e2736 100644
--- a/data/items/materials/harralander.yaml
+++ b/data/items/materials/harralander.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_harralander
           quantity: 1
     level: 20
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 6
 description: A clean harralander leaf, ready for use in pharmacy.
 name: harralander
diff --git a/data/items/materials/irit.yaml b/data/items/materials/irit.yaml
index 90f41b5..7ff6187 100644
--- a/data/items/materials/irit.yaml
+++ b/data/items/materials/irit.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_irit
           quantity: 1
     level: 40
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 9
 description: A clean irit leaf, ready for use in pharmacy.
 name: irit
diff --git a/data/items/materials/iron_bar.yaml b/data/items/materials/iron_bar.yaml
index 4ef4c11..aedeabe 100644
--- a/data/items/materials/iron_bar.yaml
+++ b/data/items/materials/iron_bar.yaml
@@ -6,7 +6,7 @@ craft:
           quantity: 1
     fail_message: The iron is too impure to make a workable bar.
     level: 20
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     success:
@@ -14,7 +14,7 @@ craft:
         cap: 0.5
         per_level: 0
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 12
 description: A bar of iron metal.
 name: iron bar
diff --git a/data/items/materials/iron_nails.yaml b/data/items/materials/iron_nails.yaml
index dc647f5..bf491ee 100644
--- a/data/items/materials/iron_nails.yaml
+++ b/data/items/materials/iron_nails.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - anvil
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 25
 description: A set of iron nails.
 name: iron nails
diff --git a/data/items/materials/kwuarm.yaml b/data/items/materials/kwuarm.yaml
index 77e0ead..9a458a3 100644
--- a/data/items/materials/kwuarm.yaml
+++ b/data/items/materials/kwuarm.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_kwuarm
           quantity: 1
     level: 54
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 11
 description: A clean kwuarm leaf, ready for use in pharmacy.
 name: kwuarm
diff --git a/data/items/materials/lantadyme.yaml b/data/items/materials/lantadyme.yaml
index 67663ac..0bb2a90 100644
--- a/data/items/materials/lantadyme.yaml
+++ b/data/items/materials/lantadyme.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_lantadyme
           quantity: 1
     level: 67
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 13
 description: A clean lantadyme leaf, ready for use in pharmacy.
 name: lantadyme
diff --git a/data/items/materials/mahogany_planks.yaml b/data/items/materials/mahogany_planks.yaml
index e75ec1c..6269cba 100644
--- a/data/items/materials/mahogany_planks.yaml
+++ b/data/items/materials/mahogany_planks.yaml
@@ -10,7 +10,7 @@ craft:
         - workbench
     tool: saw
     type: construction
-    wait: 20
+    ticks_per_cycle: 20
     xp: 30
 description: Luxurious mahogany planks with a deep reddish hue.
 name: mahogany planks
diff --git a/data/items/materials/marrentill.yaml b/data/items/materials/marrentill.yaml
index 17730b7..41b6ead 100644
--- a/data/items/materials/marrentill.yaml
+++ b/data/items/materials/marrentill.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_marrentill
           quantity: 1
     level: 5
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 4
 description: A clean marrentill leaf, ready for use in pharmacy.
 name: marrentill
diff --git a/data/items/materials/mithril_bar.yaml b/data/items/materials/mithril_bar.yaml
index 0cc0102..76a2204 100644
--- a/data/items/materials/mithril_bar.yaml
+++ b/data/items/materials/mithril_bar.yaml
@@ -9,11 +9,11 @@ craft:
           quantity: 4
     fail_message: You fail to smelt a usable bar.
     level: 50
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 30
 description: A bar of mithril metal, light and strong.
 name: mithril bar
diff --git a/data/items/materials/mithril_nails.yaml b/data/items/materials/mithril_nails.yaml
index f747da2..85d105e 100644
--- a/data/items/materials/mithril_nails.yaml
+++ b/data/items/materials/mithril_nails.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - anvil
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 50
 description: A set of mithril nails.
 name: mithril nails
diff --git a/data/items/materials/oak_planks.yaml b/data/items/materials/oak_planks.yaml
index 6b2571c..39405b0 100644
--- a/data/items/materials/oak_planks.yaml
+++ b/data/items/materials/oak_planks.yaml
@@ -10,7 +10,7 @@ craft:
         - workbench
     tool: saw
     type: construction
-    wait: 20
+    ticks_per_cycle: 20
     xp: 10
 description: Sturdy oak planks, ideal for furniture.
 name: oak planks
diff --git a/data/items/materials/planks.yaml b/data/items/materials/planks.yaml
index b616120..86cc5d5 100644
--- a/data/items/materials/planks.yaml
+++ b/data/items/materials/planks.yaml
@@ -10,7 +10,7 @@ craft:
         - workbench
     tool: saw
     type: construction
-    wait: 20
+    ticks_per_cycle: 20
     xp: 5
 description: Some regular wooden planks, ready for construction.
 name: planks
diff --git a/data/items/materials/ranarr.yaml b/data/items/materials/ranarr.yaml
index 4527c52..101edbb 100644
--- a/data/items/materials/ranarr.yaml
+++ b/data/items/materials/ranarr.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_ranarr
           quantity: 1
     level: 25
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 8
 description: A clean ranarr leaf, ready for use in pharmacy.
 name: ranarr
diff --git a/data/items/materials/ruby.yaml b/data/items/materials/ruby.yaml
index 6a2b18f..ef880bf 100644
--- a/data/items/materials/ruby.yaml
+++ b/data/items/materials/ruby.yaml
@@ -8,7 +8,7 @@ craft:
     success_message: "You cut the %i1 into a beautiful %n."
     tool: chisel
     type: crafting
-    wait: 3
+    ticks_per_cycle: 3
     xp: 85
 description: A beautifully cut ruby.
 name: ruby
diff --git a/data/items/materials/rune_nails.yaml b/data/items/materials/rune_nails.yaml
index 5cea6e0..f039df8 100644
--- a/data/items/materials/rune_nails.yaml
+++ b/data/items/materials/rune_nails.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - anvil
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 75
 description: A set of rune nails.
 name: rune nails
diff --git a/data/items/materials/runite_bar.yaml b/data/items/materials/runite_bar.yaml
index 1b4823d..5b60034 100644
--- a/data/items/materials/runite_bar.yaml
+++ b/data/items/materials/runite_bar.yaml
@@ -9,11 +9,11 @@ craft:
           quantity: 8
     fail_message: You fail to smelt a usable bar.
     level: 80
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 50
 description: A bar of runite metal, the finest alloy known.
 name: runite bar
diff --git a/data/items/materials/sapphire.yaml b/data/items/materials/sapphire.yaml
index 9a5a7d6..2f2fafb 100644
--- a/data/items/materials/sapphire.yaml
+++ b/data/items/materials/sapphire.yaml
@@ -8,7 +8,7 @@ craft:
     success_message: "You cut the %i1 into a beautiful %n."
     tool: chisel
     type: crafting
-    wait: 3
+    ticks_per_cycle: 3
     xp: 50
 description: A beautifully cut sapphire.
 name: sapphire
diff --git a/data/items/materials/silver_bar.yaml b/data/items/materials/silver_bar.yaml
index cf85b31..25aad23 100644
--- a/data/items/materials/silver_bar.yaml
+++ b/data/items/materials/silver_bar.yaml
@@ -6,11 +6,11 @@ craft:
           quantity: 1
     fail_message: You fail to smelt a usable bar.
     level: 25
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 14
 description: A bar of silver metal.
 name: silver bar
diff --git a/data/items/materials/snapdragon.yaml b/data/items/materials/snapdragon.yaml
index a05c87d..0d4943c 100644
--- a/data/items/materials/snapdragon.yaml
+++ b/data/items/materials/snapdragon.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_snapdragon
           quantity: 1
     level: 59
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 12
 description: A clean snapdragon leaf, ready for use in pharmacy.
 name: snapdragon
diff --git a/data/items/materials/soft_clay.yaml b/data/items/materials/soft_clay.yaml
index d9935dd..8c05d12 100644
--- a/data/items/materials/soft_clay.yaml
+++ b/data/items/materials/soft_clay.yaml
@@ -12,7 +12,7 @@ craft:
             - bucket_of_water
             - jug_of_water
           quantity: 1
-    wait: 2
+    ticks_per_cycle: 2
 description: Soft, workable clay ready for shaping on a pottery wheel.
 name: soft clay
 stackable: false
diff --git a/data/items/materials/steel_bar.yaml b/data/items/materials/steel_bar.yaml
index 31d8224..b972bfc 100644
--- a/data/items/materials/steel_bar.yaml
+++ b/data/items/materials/steel_bar.yaml
@@ -9,11 +9,11 @@ craft:
           quantity: 2
     fail_message: You fail to smelt a usable bar.
     level: 40
-    subtype: smelt
+    subtype: smelting
     station:
         - furnace
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 17
 description: A bar of steel, forged from iron ore and coal.
 name: steel bar
diff --git a/data/items/materials/steel_nails.yaml b/data/items/materials/steel_nails.yaml
index 12bab1e..bde4596 100644
--- a/data/items/materials/steel_nails.yaml
+++ b/data/items/materials/steel_nails.yaml
@@ -9,7 +9,7 @@ craft:
     station:
         - anvil
     type: smithing
-    wait: 4
+    ticks_per_cycle: 4
     xp: 37
 description: A set of steel nails.
 name: steel nails
diff --git a/data/items/materials/stim_cell.yaml b/data/items/materials/stim_cell.yaml
index 6637cc7..8c870a5 100644
--- a/data/items/materials/stim_cell.yaml
+++ b/data/items/materials/stim_cell.yaml
@@ -9,7 +9,7 @@ craft:
           quantity: 1
     level: 26
     type: pharmacy
-    wait: 4
+    ticks_per_cycle: 4
     xp: 68
 description: A bright yellow energy supplement that restores stamina.
 name: stim cell
diff --git a/data/items/materials/tarromin.yaml b/data/items/materials/tarromin.yaml
index 4783bed..36f1618 100644
--- a/data/items/materials/tarromin.yaml
+++ b/data/items/materials/tarromin.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_tarromin
           quantity: 1
     level: 11
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 5
 description: A clean tarromin leaf, ready for use in pharmacy.
 name: tarromin
diff --git a/data/items/materials/teak_planks.yaml b/data/items/materials/teak_planks.yaml
index 145b731..d8b4ec7 100644
--- a/data/items/materials/teak_planks.yaml
+++ b/data/items/materials/teak_planks.yaml
@@ -10,7 +10,7 @@ craft:
         - workbench
     tool: saw
     type: construction
-    wait: 20
+    ticks_per_cycle: 20
     xp: 20
 description: Fine teak planks with a rich grain.
 name: teak planks
diff --git a/data/items/materials/toadflax.yaml b/data/items/materials/toadflax.yaml
index 9405301..42713a9 100644
--- a/data/items/materials/toadflax.yaml
+++ b/data/items/materials/toadflax.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_toadflax
           quantity: 1
     level: 30
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 8
 description: A clean toadflax leaf, ready for use in pharmacy.
 name: toadflax
diff --git a/data/items/materials/torstol.yaml b/data/items/materials/torstol.yaml
index f220b28..bd71245 100644
--- a/data/items/materials/torstol.yaml
+++ b/data/items/materials/torstol.yaml
@@ -5,9 +5,9 @@ craft:
             - grimy_torstol
           quantity: 1
     level: 75
-    subtype: clean
+    subtype: cleaning
     type: pharmacy
-    wait: 2
+    ticks_per_cycle: 2
     xp: 15
 description: A clean torstol leaf, ready for use in pharmacy.
 name: torstol