refactor: removed separate crafting recipes and combined them into item YAML

40 files changed, 707 insertions, 294 deletions

diff --git a/data/items/consumables/amp_potion.yaml b/data/items/consumables/amp_potion.yaml
index 8167932..ac98966 100644
--- a/data/items/consumables/amp_potion.yaml
+++ b/data/items/consumables/amp_potion.yaml
@@ -1,9 +1,23 @@
-id: amp_potion
-name: "amp potion"
 color: "220"
-description: "A glowing gold potion that amplifies physical strength."
-value: 55
-stackable: false
-potion_effect: "strength"
+craft:
+    consume:
+        - items:
+            - tarromin_potion_unf
+          quantity: 1
+        - items:
+            - limpwurt_root
+          quantity: 1
+    level: 12
+    message: You mix an amp potion.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 50
+description: A glowing gold potion that amplifies physical strength.
+id: amp_potion
+name: amp potion
 potion_bonus: 10
 potion_duration: 200
+potion_effect: strength
+stackable: false
+value: 55
diff --git a/data/items/consumables/anchovies.yaml b/data/items/consumables/anchovies.yaml
index 0abd846..535585a 100644
--- a/data/items/consumables/anchovies.yaml
+++ b/data/items/consumables/anchovies.yaml
@@ -1,8 +1,24 @@
+color: "209"
+craft:
+    consume:
+        - items:
+            - raw_anchovies
+          quantity: 1
+    fail: burnt_fish
+    fail_message: You accidentally burn the anchovies.
+    level: 1
+    message: Cooked to perfection. It looks great!
+    skill: cooking
+    station:
+        - fire
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 30
+description: Some nicely cooked anchovies.
+eat_message: You eat the anchovies.
+heal_value: 3
 id: anchovies
 name: anchovies
-color: "209"
-description: "Some nicely cooked anchovies."
-value: 5
 stackable: false
-heal_value: 3
-eat_message: "You eat the anchovies."
+value: 5
diff --git a/data/items/consumables/avantoe_potion_unf.yaml b/data/items/consumables/avantoe_potion_unf.yaml
index 62f2218..bd2ebb1 100644
--- a/data/items/consumables/avantoe_potion_unf.yaml
+++ b/data/items/consumables/avantoe_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: avantoe_potion_unf
-name: "avantoe potion (unf)"
 color: "48"
-description: "An unfinished potion with avantoe floating in water."
-value: 50
+craft:
+    type: combine
+    consume:
+        - items:
+            - avantoe
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with avantoe floating in water.
+id: avantoe_potion_unf
+name: avantoe potion (unf)
 stackable: false
-made_from:
-  - items: [avantoe]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 50
diff --git a/data/items/consumables/bio_serum.yaml b/data/items/consumables/bio_serum.yaml
index b397e46..6a7e181 100644
--- a/data/items/consumables/bio_serum.yaml
+++ b/data/items/consumables/bio_serum.yaml
@@ -1,9 +1,23 @@
-id: bio_serum
-name: "bio serum"
 color: "48"
-description: "A green serum that neutralizes biological toxins and restores health."
-value: 45
-stackable: false
-potion_effect: "heal"
+craft:
+    consume:
+        - items:
+            - marrentill_potion_unf
+          quantity: 1
+        - items:
+            - antitoxin_powder
+          quantity: 1
+    level: 5
+    message: You mix a bio serum.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 38
+description: A green serum that neutralizes biological toxins and restores health.
+id: bio_serum
+name: bio serum
 potion_bonus: 60
 potion_duration: 0
+potion_effect: heal
+stackable: false
+value: 45
diff --git a/data/items/consumables/bread.yaml b/data/items/consumables/bread.yaml
index 68cefdc..a00a3ef 100644
--- a/data/items/consumables/bread.yaml
+++ b/data/items/consumables/bread.yaml
@@ -1,8 +1,23 @@
+color: "222"
+craft:
+    consume:
+        - items:
+            - bread_dough
+          quantity: 1
+    fail: burnt_meat
+    fail_message: You burn the bread to a crisp.
+    level: 1
+    message: You bake the dough into a fresh loaf of bread.
+    skill: cooking
+    station:
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 40
+description: A fresh loaf of bread, still warm from the oven.
+eat_message: You eat the bread. Warm and satisfying.
+heal_value: 5
 id: bread
 name: bread
-color: "222"
-description: "A fresh loaf of bread, still warm from the oven."
-value: 5
 stackable: false
-heal_value: 5
-eat_message: "You eat the bread. Warm and satisfying."
+value: 5
diff --git a/data/items/consumables/bread_dough.yaml b/data/items/consumables/bread_dough.yaml
index 73ac998..7e09f3d 100644
--- a/data/items/consumables/bread_dough.yaml
+++ b/data/items/consumables/bread_dough.yaml
@@ -1,14 +1,22 @@
+color: "222"
+craft:
+    type: combine
+    consume:
+        - byproducts:
+            - empty_pot
+          items:
+            - pot_of_flour
+          quantity: 1
+        - byproducts:
+            - empty_bucket
+            - empty_jug
+          items:
+            - bucket_of_water
+            - jug_of_water
+          quantity: 1
+    wait: 2
+description: A ball of uncooked bread dough. It needs to be baked.
 id: bread_dough
 name: bread dough
-color: "222"
-description: "A ball of uncooked bread dough. It needs to be baked."
-value: 3
 stackable: false
-ticks: 2
-made_from:
-  - items: [pot_of_flour]
-    quantity: 1
-    byproducts: [empty_pot]
-  - items: [bucket_of_water, jug_of_water]
-    quantity: 1
-    byproducts: [empty_bucket, empty_jug]
+value: 3
diff --git a/data/items/consumables/cadantine_potion_unf.yaml b/data/items/consumables/cadantine_potion_unf.yaml
index d1f13c6..5d5db0b 100644
--- a/data/items/consumables/cadantine_potion_unf.yaml
+++ b/data/items/consumables/cadantine_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: cadantine_potion_unf
-name: "cadantine potion (unf)"
 color: "48"
-description: "An unfinished potion with cadantine floating in water."
-value: 72
+craft:
+    type: combine
+    consume:
+        - items:
+            - cadantine
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with cadantine floating in water.
+id: cadantine_potion_unf
+name: cadantine potion (unf)
 stackable: false
-made_from:
-  - items: [cadantine]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 72
diff --git a/data/items/consumables/dwarf_weed_potion_unf.yaml b/data/items/consumables/dwarf_weed_potion_unf.yaml
index 64f7faa..44f2eab 100644
--- a/data/items/consumables/dwarf_weed_potion_unf.yaml
+++ b/data/items/consumables/dwarf_weed_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: dwarf_weed_potion_unf
-name: "dwarf weed potion (unf)"
 color: "48"
-description: "An unfinished potion with dwarf weed floating in water."
-value: 88
+craft:
+    type: combine
+    consume:
+        - items:
+            - dwarf_weed
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with dwarf weed floating in water.
+id: dwarf_weed_potion_unf
+name: dwarf weed potion (unf)
 stackable: false
-made_from:
-  - items: [dwarf_weed]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 88
diff --git a/data/items/consumables/full_restore.yaml b/data/items/consumables/full_restore.yaml
index 96f6036..28204e8 100644
--- a/data/items/consumables/full_restore.yaml
+++ b/data/items/consumables/full_restore.yaml
@@ -1,9 +1,23 @@
-id: full_restore
-name: "full restore"
 color: "208"
-description: "A powerful orange potion that completely restores health."
-value: 200
-stackable: false
-potion_effect: "heal"
+craft:
+    consume:
+        - items:
+            - snapdragon_potion_unf
+          quantity: 1
+        - items:
+            - arachnid_enzyme
+          quantity: 1
+    level: 63
+    message: You mix a full restore.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 143
+description: A powerful orange potion that completely restores health.
+id: full_restore
+name: full restore
 potion_bonus: 500
 potion_duration: 0
+potion_effect: heal
+stackable: false
+value: 200
diff --git a/data/items/consumables/guam_potion_unf.yaml b/data/items/consumables/guam_potion_unf.yaml
index ba81e93..caddd74 100644
--- a/data/items/consumables/guam_potion_unf.yaml
+++ b/data/items/consumables/guam_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: guam_potion_unf
-name: "guam potion (unf)"
 color: "48"
-description: "An unfinished potion with guam floating in water."
-value: 5
+craft:
+    type: combine
+    consume:
+        - items:
+            - guam
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with guam floating in water.
+id: guam_potion_unf
+name: guam potion (unf)
 stackable: false
-made_from:
-  - items: [guam]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 5
diff --git a/data/items/consumables/harralander_potion_unf.yaml b/data/items/consumables/harralander_potion_unf.yaml
index 522f8ea..22a7611 100644
--- a/data/items/consumables/harralander_potion_unf.yaml
+++ b/data/items/consumables/harralander_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: harralander_potion_unf
-name: "harralander potion (unf)"
 color: "48"
-description: "An unfinished potion with harralander floating in water."
-value: 18
+craft:
+    type: combine
+    consume:
+        - items:
+            - harralander
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with harralander floating in water.
+id: harralander_potion_unf
+name: harralander potion (unf)
 stackable: false
-made_from:
-  - items: [harralander]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 18
diff --git a/data/items/consumables/herring.yaml b/data/items/consumables/herring.yaml
index adbbd95..1e20697 100644
--- a/data/items/consumables/herring.yaml
+++ b/data/items/consumables/herring.yaml
@@ -1,8 +1,24 @@
+color: "209"
+craft:
+    consume:
+        - items:
+            - raw_herring
+          quantity: 1
+    fail: burnt_fish
+    fail_message: You accidentally burn the herring.
+    level: 5
+    message: Cooked to perfection. It looks great!
+    skill: cooking
+    station:
+        - fire
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 50
+description: A nicely cooked herring.
+eat_message: You eat the herring.
+heal_value: 5
 id: herring
 name: herring
-color: "209"
-description: "A nicely cooked herring."
-value: 7
 stackable: false
-heal_value: 5
-eat_message: "You eat the herring."
+value: 7
diff --git a/data/items/consumables/irit_potion_unf.yaml b/data/items/consumables/irit_potion_unf.yaml
index 76a8577..841487e 100644
--- a/data/items/consumables/irit_potion_unf.yaml
+++ b/data/items/consumables/irit_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: irit_potion_unf
-name: "irit potion (unf)"
 color: "48"
-description: "An unfinished potion with irit floating in water."
-value: 42
+craft:
+    type: combine
+    consume:
+        - items:
+            - irit
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with irit floating in water.
+id: irit_potion_unf
+name: irit potion (unf)
 stackable: false
-made_from:
-  - items: [irit]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 42
diff --git a/data/items/consumables/kwuarm_potion_unf.yaml b/data/items/consumables/kwuarm_potion_unf.yaml
index 0448145..9ab2f67 100644
--- a/data/items/consumables/kwuarm_potion_unf.yaml
+++ b/data/items/consumables/kwuarm_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: kwuarm_potion_unf
-name: "kwuarm potion (unf)"
 color: "48"
-description: "An unfinished potion with kwuarm floating in water."
-value: 56
+craft:
+    type: combine
+    consume:
+        - items:
+            - kwuarm
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with kwuarm floating in water.
+id: kwuarm_potion_unf
+name: kwuarm potion (unf)
 stackable: false
-made_from:
-  - items: [kwuarm]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 56
diff --git a/data/items/consumables/lantadyme_potion_unf.yaml b/data/items/consumables/lantadyme_potion_unf.yaml
index 3460a18..52ff04f 100644
--- a/data/items/consumables/lantadyme_potion_unf.yaml
+++ b/data/items/consumables/lantadyme_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: lantadyme_potion_unf
-name: "lantadyme potion (unf)"
 color: "48"
-description: "An unfinished potion with lantadyme floating in water."
-value: 80
+craft:
+    type: combine
+    consume:
+        - items:
+            - lantadyme
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with lantadyme floating in water.
+id: lantadyme_potion_unf
+name: lantadyme potion (unf)
 stackable: false
-made_from:
-  - items: [lantadyme]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 80
diff --git a/data/items/consumables/marrentill_potion_unf.yaml b/data/items/consumables/marrentill_potion_unf.yaml
index 4424e5e..8a01b4a 100644
--- a/data/items/consumables/marrentill_potion_unf.yaml
+++ b/data/items/consumables/marrentill_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: marrentill_potion_unf
-name: "marrentill potion (unf)"
 color: "48"
-description: "An unfinished potion with marrentill floating in water."
-value: 8
+craft:
+    type: combine
+    consume:
+        - items:
+            - marrentill
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with marrentill floating in water.
+id: marrentill_potion_unf
+name: marrentill potion (unf)
 stackable: false
-made_from:
-  - items: [marrentill]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 8
diff --git a/data/items/consumables/nano_restore.yaml b/data/items/consumables/nano_restore.yaml
index e430b49..dc55b1b 100644
--- a/data/items/consumables/nano_restore.yaml
+++ b/data/items/consumables/nano_restore.yaml
@@ -1,9 +1,23 @@
-id: nano_restore
-name: "nano restore"
 color: "208"
-description: "An orange potion containing nanobots that restore diminished attributes."
-value: 70
-stackable: false
-potion_effect: "heal"
+craft:
+    consume:
+        - items:
+            - harralander_potion_unf
+          quantity: 1
+        - items:
+            - arachnid_enzyme
+          quantity: 1
+    level: 22
+    message: You mix a nano restore.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 63
+description: An orange potion containing nanobots that restore diminished attributes.
+id: nano_restore
+name: nano restore
 potion_bonus: 100
 potion_duration: 0
+potion_effect: heal
+stackable: false
+value: 70
diff --git a/data/items/consumables/pastry_dough.yaml b/data/items/consumables/pastry_dough.yaml
index b607c83..0bacf84 100644
--- a/data/items/consumables/pastry_dough.yaml
+++ b/data/items/consumables/pastry_dough.yaml
@@ -1,11 +1,16 @@
+color: "222"
+craft:
+    type: combine
+    consume:
+        - items:
+            - pot_of_flour
+          quantity: 1
+        - items:
+            - bucket_of_water
+          quantity: 1
+    wait: 2
+description: A ball of uncooked pastry dough. It needs to be baked.
 id: pastry_dough
 name: pastry dough
-color: "222"
-description: "A ball of uncooked pastry dough. It needs to be baked."
-value: 3
 stackable: false
-made_from:
-  - items: [pot_of_flour]
-    quantity: 1
-  - items: [bucket_of_water]
-    quantity: 1
+value: 3
diff --git a/data/items/consumables/pie_dish.yaml b/data/items/consumables/pie_dish.yaml
index bd6100b..a562b9e 100644
--- a/data/items/consumables/pie_dish.yaml
+++ b/data/items/consumables/pie_dish.yaml
@@ -1,5 +1,23 @@
+color: "130"
+craft:
+    consume:
+        - items:
+            - unfired_pie_dish
+          quantity: 1
+    fail_message: The pie dish cracks in the oven and is ruined.
+    level: 7
+    message: You fire the pie dish in the oven successfully.
+    skill: crafting
+    station:
+        - pottery_oven
+    success:
+        base: 0.4
+        cap: 0.95
+        per_level: 0.02
+    type: crafting
+    wait: 4
+    xp: 10
+description: A clay pie dish for baking pies.
 id: pie_dish
 name: pie dish
-color: "130"
-description: "A clay pie dish for baking pies."
 value: 5
diff --git a/data/items/consumables/pizza_dough.yaml b/data/items/consumables/pizza_dough.yaml
index 12d8b14..bb69aca 100644
--- a/data/items/consumables/pizza_dough.yaml
+++ b/data/items/consumables/pizza_dough.yaml
@@ -1,11 +1,16 @@
+color: "222"
+craft:
+    type: combine
+    consume:
+        - items:
+            - pot_of_flour
+          quantity: 1
+        - items:
+            - bucket_of_water
+          quantity: 1
+    wait: 2
+description: A ball of uncooked pizza dough. It needs to be baked.
 id: pizza_dough
 name: pizza dough
-color: "222"
-description: "A ball of uncooked pizza dough. It needs to be baked."
-value: 3
 stackable: false
-made_from:
-  - items: [pot_of_flour]
-    quantity: 1
-  - items: [bucket_of_water]
-    quantity: 1
+value: 3
diff --git a/data/items/consumables/ranarr_potion_unf.yaml b/data/items/consumables/ranarr_potion_unf.yaml
index d2c475d..941f5da 100644
--- a/data/items/consumables/ranarr_potion_unf.yaml
+++ b/data/items/consumables/ranarr_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: ranarr_potion_unf
-name: "ranarr potion (unf)"
 color: "48"
-description: "An unfinished potion with ranarr floating in water."
-value: 38
+craft:
+    type: combine
+    consume:
+        - items:
+            - ranarr
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with ranarr floating in water.
+id: ranarr_potion_unf
+name: ranarr potion (unf)
 stackable: false
-made_from:
-  - items: [ranarr]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 38
diff --git a/data/items/consumables/restoration_compound.yaml b/data/items/consumables/restoration_compound.yaml
index 913153f..1bb2a14 100644
--- a/data/items/consumables/restoration_compound.yaml
+++ b/data/items/consumables/restoration_compound.yaml
@@ -1,9 +1,23 @@
-id: restoration_compound
-name: "restoration compound"
 color: "51"
-description: "A teal compound that enhances all combat capabilities."
-value: 250
-stackable: false
-potion_effect: "all_combat"
+craft:
+    consume:
+        - items:
+            - toadflax_potion_unf
+          quantity: 1
+        - items:
+            - crushed_nest
+          quantity: 1
+    level: 81
+    message: You mix a restoration compound.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 180
+description: A teal compound that enhances all combat capabilities.
+id: restoration_compound
+name: restoration compound
 potion_bonus: 15
 potion_duration: 150
+potion_effect: all_combat
+stackable: false
+value: 250
diff --git a/data/items/consumables/salmon.yaml b/data/items/consumables/salmon.yaml
index 59b8237..e7988ed 100644
--- a/data/items/consumables/salmon.yaml
+++ b/data/items/consumables/salmon.yaml
@@ -1,8 +1,24 @@
+color: "209"
+craft:
+    consume:
+        - items:
+            - raw_salmon
+          quantity: 1
+    fail: burnt_fish
+    fail_message: You accidentally burn the salmon.
+    level: 25
+    message: Cooked to perfection. It looks great!
+    skill: cooking
+    station:
+        - fire
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 90
+description: A nicely cooked salmon.
+eat_message: You eat the salmon. Savory and satisfying!
+heal_value: 9
 id: salmon
 name: salmon
-color: "209"
-description: "A nicely cooked salmon."
-value: 10
 stackable: false
-heal_value: 9
-eat_message: "You eat the salmon. Savory and satisfying!"
+value: 10
diff --git a/data/items/consumables/sardine.yaml b/data/items/consumables/sardine.yaml
index c11b42b..c094185 100644
--- a/data/items/consumables/sardine.yaml
+++ b/data/items/consumables/sardine.yaml
@@ -1,8 +1,24 @@
+color: "209"
+craft:
+    consume:
+        - items:
+            - raw_sardine
+          quantity: 1
+    fail: burnt_fish
+    fail_message: You accidentally burn the sardine.
+    level: 1
+    message: Cooked to perfection. It looks great!
+    skill: cooking
+    station:
+        - fire
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 40
+description: A nicely cooked sardine.
+eat_message: You eat the sardine.
+heal_value: 4
 id: sardine
 name: sardine
-color: "209"
-description: "A nicely cooked sardine."
-value: 5
 stackable: false
-heal_value: 4
-eat_message: "You eat the sardine."
+value: 5
diff --git a/data/items/consumables/science_serum.yaml b/data/items/consumables/science_serum.yaml
index e78f915..b77cf58 100644
--- a/data/items/consumables/science_serum.yaml
+++ b/data/items/consumables/science_serum.yaml
@@ -1,9 +1,23 @@
-id: science_serum
-name: "science serum"
 color: "141"
-description: "A violet serum that heightens scientific cognition."
-value: 200
-stackable: false
-potion_effect: "science"
+craft:
+    consume:
+        - items:
+            - lantadyme_potion_unf
+          quantity: 1
+        - items:
+            - potato_cactus
+          quantity: 1
+    level: 76
+    message: You mix a science serum.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 173
+description: A violet serum that heightens scientific cognition.
+id: science_serum
+name: science serum
 potion_bonus: 10
 potion_duration: 200
+potion_effect: science
+stackable: false
+value: 200
diff --git a/data/items/consumables/shield_potion.yaml b/data/items/consumables/shield_potion.yaml
index 4cd91e8..a0b65c2 100644
--- a/data/items/consumables/shield_potion.yaml
+++ b/data/items/consumables/shield_potion.yaml
@@ -1,9 +1,23 @@
-id: shield_potion
-name: "shield potion"
 color: "21"
-description: "A deep blue potion that reinforces defensive capability."
-value: 85
-stackable: false
-potion_effect: "defense"
+craft:
+    consume:
+        - items:
+            - ranarr_potion_unf
+          quantity: 1
+        - items:
+            - white_berries
+          quantity: 1
+    level: 30
+    message: You mix a shield potion.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 75
+description: A deep blue potion that reinforces defensive capability.
+id: shield_potion
+name: shield potion
 potion_bonus: 10
 potion_duration: 200
+potion_effect: defense
+stackable: false
+value: 85
diff --git a/data/items/consumables/shrimps.yaml b/data/items/consumables/shrimps.yaml
index 9c280c8..03a7edb 100644
--- a/data/items/consumables/shrimps.yaml
+++ b/data/items/consumables/shrimps.yaml
@@ -1,8 +1,24 @@
+color: "209"
+craft:
+    consume:
+        - items:
+            - raw_shrimps
+          quantity: 1
+    fail: burnt_fish
+    fail_message: You accidentally burn the shrimps.
+    level: 1
+    message: Cooked to perfection. It looks great!
+    skill: cooking
+    station:
+        - fire
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 30
+description: Some nicely cooked shrimps.
+eat_message: You eat the shrimps. Tasty!
+heal_value: 3
 id: shrimps
 name: shrimps
-color: "209"
-description: "Some nicely cooked shrimps."
-value: 5
 stackable: false
-heal_value: 3
-eat_message: "You eat the shrimps. Tasty!"
+value: 5
diff --git a/data/items/consumables/snapdragon_potion_unf.yaml b/data/items/consumables/snapdragon_potion_unf.yaml
index ee8e366..fc91a84 100644
--- a/data/items/consumables/snapdragon_potion_unf.yaml
+++ b/data/items/consumables/snapdragon_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: snapdragon_potion_unf
-name: "snapdragon potion (unf)"
 color: "48"
-description: "An unfinished potion with snapdragon floating in water."
-value: 68
+craft:
+    type: combine
+    consume:
+        - items:
+            - snapdragon
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with snapdragon floating in water.
+id: snapdragon_potion_unf
+name: snapdragon potion (unf)
 stackable: false
-made_from:
-  - items: [snapdragon]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 68
diff --git a/data/items/consumables/stim_potion.yaml b/data/items/consumables/stim_potion.yaml
index de51291..e9ac25f 100644
--- a/data/items/consumables/stim_potion.yaml
+++ b/data/items/consumables/stim_potion.yaml
@@ -1,9 +1,23 @@
-id: stim_potion
-name: "stim potion"
 color: "196"
-description: "A bubbling red potion that temporarily boosts attack capability."
-value: 30
-stackable: false
-potion_effect: "attack"
+craft:
+    consume:
+        - items:
+            - guam_potion_unf
+          quantity: 1
+        - items:
+            - eye_of_newt
+          quantity: 1
+    level: 1
+    message: You mix a stim potion.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 25
+description: A bubbling red potion that temporarily boosts attack capability.
+id: stim_potion
+name: stim potion
 potion_bonus: 10
 potion_duration: 200
+potion_effect: attack
+stackable: false
+value: 30
diff --git a/data/items/consumables/super_amp.yaml b/data/items/consumables/super_amp.yaml
index 3bea59b..361c99b 100644
--- a/data/items/consumables/super_amp.yaml
+++ b/data/items/consumables/super_amp.yaml
@@ -1,9 +1,23 @@
-id: super_amp
-name: "super amp"
 color: "220"
-description: "A concentrated gold potion that significantly amplifies physical strength."
-value: 155
-stackable: false
-potion_effect: "strength"
+craft:
+    consume:
+        - items:
+            - kwuarm_potion_unf
+          quantity: 1
+        - items:
+            - limpwurt_root
+          quantity: 1
+    level: 55
+    message: You mix a super amp.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 125
+description: A concentrated gold potion that significantly amplifies physical strength.
+id: super_amp
+name: super amp
 potion_bonus: 20
 potion_duration: 200
+potion_effect: strength
+stackable: false
+value: 155
diff --git a/data/items/consumables/super_bio_serum.yaml b/data/items/consumables/super_bio_serum.yaml
index fbc5ebe..9f5796e 100644
--- a/data/items/consumables/super_bio_serum.yaml
+++ b/data/items/consumables/super_bio_serum.yaml
@@ -1,9 +1,23 @@
-id: super_bio_serum
-name: "super bio serum"
 color: "48"
-description: "A concentrated green serum that powerfully restores health."
-value: 130
-stackable: false
-potion_effect: "heal"
+craft:
+    consume:
+        - items:
+            - irit_potion_unf
+          quantity: 1
+        - items:
+            - antitoxin_powder
+          quantity: 1
+    level: 48
+    message: You mix a super bio serum.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 106
+description: A concentrated green serum that powerfully restores health.
+id: super_bio_serum
+name: super bio serum
 potion_bonus: 120
 potion_duration: 0
+potion_effect: heal
+stackable: false
+value: 130
diff --git a/data/items/consumables/super_shield.yaml b/data/items/consumables/super_shield.yaml
index 7545b2e..9dc6430 100644
--- a/data/items/consumables/super_shield.yaml
+++ b/data/items/consumables/super_shield.yaml
@@ -1,9 +1,23 @@
-id: super_shield
-name: "super shield"
 color: "21"
-description: "A concentrated blue potion that provides significant defensive enhancement."
-value: 175
-stackable: false
-potion_effect: "defense"
+craft:
+    consume:
+        - items:
+            - cadantine_potion_unf
+          quantity: 1
+        - items:
+            - white_berries
+          quantity: 1
+    level: 66
+    message: You mix a super shield.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 150
+description: A concentrated blue potion that provides significant defensive enhancement.
+id: super_shield
+name: super shield
 potion_bonus: 20
 potion_duration: 200
+potion_effect: defense
+stackable: false
+value: 175
diff --git a/data/items/consumables/super_stim.yaml b/data/items/consumables/super_stim.yaml
index c290c5f..38275ac 100644
--- a/data/items/consumables/super_stim.yaml
+++ b/data/items/consumables/super_stim.yaml
@@ -1,9 +1,23 @@
-id: super_stim
-name: "super stim"
 color: "196"
-description: "A potent red potion that dramatically boosts attack capability."
-value: 120
-stackable: false
-potion_effect: "attack"
+craft:
+    consume:
+        - items:
+            - irit_potion_unf
+          quantity: 1
+        - items:
+            - eye_of_newt
+          quantity: 1
+    level: 45
+    message: You mix a super stim.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 100
+description: A potent red potion that dramatically boosts attack capability.
+id: super_stim
+name: super stim
 potion_bonus: 20
 potion_duration: 200
+potion_effect: attack
+stackable: false
+value: 120
diff --git a/data/items/consumables/super_stim_cell.yaml b/data/items/consumables/super_stim_cell.yaml
index 1f25597..3fb5761 100644
--- a/data/items/consumables/super_stim_cell.yaml
+++ b/data/items/consumables/super_stim_cell.yaml
@@ -1,9 +1,23 @@
-id: super_stim_cell
-name: "super stim cell"
 color: "226"
-description: "A concentrated yellow energy supplement that fully restores stamina."
-value: 140
-stackable: false
-potion_effect: "battery"
+craft:
+    consume:
+        - items:
+            - avantoe_potion_unf
+          quantity: 1
+        - items:
+            - blight_spore
+          quantity: 1
+    level: 52
+    message: You mix a super stim cell.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 118
+description: A concentrated yellow energy supplement that fully restores stamina.
+id: super_stim_cell
+name: super stim cell
 potion_bonus: 50
 potion_duration: 0
+potion_effect: battery
+stackable: false
+value: 140
diff --git a/data/items/consumables/targeting_serum.yaml b/data/items/consumables/targeting_serum.yaml
index b10ebc5..5c94040 100644
--- a/data/items/consumables/targeting_serum.yaml
+++ b/data/items/consumables/targeting_serum.yaml
@@ -1,9 +1,23 @@
-id: targeting_serum
-name: "targeting serum"
 color: "202"
-description: "A pink serum that sharpens ranged targeting."
-value: 190
-stackable: false
-potion_effect: "ranged"
+craft:
+    consume:
+        - items:
+            - dwarf_weed_potion_unf
+          quantity: 1
+        - items:
+            - catalyst_wine
+          quantity: 1
+    level: 72
+    message: You mix a targeting serum.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 163
+description: A pink serum that sharpens ranged targeting.
+id: targeting_serum
+name: targeting serum
 potion_bonus: 10
 potion_duration: 200
+potion_effect: ranged
+stackable: false
+value: 190
diff --git a/data/items/consumables/tarromin_potion_unf.yaml b/data/items/consumables/tarromin_potion_unf.yaml
index abc6438..c7d7dd3 100644
--- a/data/items/consumables/tarromin_potion_unf.yaml
+++ b/data/items/consumables/tarromin_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: tarromin_potion_unf
-name: "tarromin potion (unf)"
 color: "48"
-description: "An unfinished potion with tarromin floating in water."
-value: 12
+craft:
+    type: combine
+    consume:
+        - items:
+            - tarromin
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with tarromin floating in water.
+id: tarromin_potion_unf
+name: tarromin potion (unf)
 stackable: false
-made_from:
-  - items: [tarromin]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 12
diff --git a/data/items/consumables/tech_serum.yaml b/data/items/consumables/tech_serum.yaml
index aac3fdc..c763216 100644
--- a/data/items/consumables/tech_serum.yaml
+++ b/data/items/consumables/tech_serum.yaml
@@ -1,9 +1,23 @@
-id: tech_serum
-name: "tech serum"
 color: "75"
-description: "A cyan serum that enhances technology interface."
-value: 100
-stackable: false
-potion_effect: "technology"
+craft:
+    consume:
+        - items:
+            - ranarr_potion_unf
+          quantity: 1
+        - items:
+            - snape_grass
+          quantity: 1
+    level: 38
+    message: You mix a tech serum.
+    skill: pharmacy
+    type: pharmacy
+    wait: 4
+    xp: 88
+description: A cyan serum that enhances technology interface.
+id: tech_serum
+name: tech serum
 potion_bonus: 10
 potion_duration: 200
+potion_effect: technology
+stackable: false
+value: 100
diff --git a/data/items/consumables/toadflax_potion_unf.yaml b/data/items/consumables/toadflax_potion_unf.yaml
index f05b406..305807d 100644
--- a/data/items/consumables/toadflax_potion_unf.yaml
+++ b/data/items/consumables/toadflax_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: toadflax_potion_unf
-name: "toadflax potion (unf)"
 color: "48"
-description: "An unfinished potion with toadflax floating in water."
-value: 28
+craft:
+    type: combine
+    consume:
+        - items:
+            - toadflax
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with toadflax floating in water.
+id: toadflax_potion_unf
+name: toadflax potion (unf)
 stackable: false
-made_from:
-  - items: [toadflax]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 28
diff --git a/data/items/consumables/torstol_potion_unf.yaml b/data/items/consumables/torstol_potion_unf.yaml
index cf551df..a25fdee 100644
--- a/data/items/consumables/torstol_potion_unf.yaml
+++ b/data/items/consumables/torstol_potion_unf.yaml
@@ -1,12 +1,16 @@
-id: torstol_potion_unf
-name: "torstol potion (unf)"
 color: "48"
-description: "An unfinished potion with torstol floating in water."
-value: 102
+craft:
+    type: combine
+    consume:
+        - items:
+            - torstol
+          quantity: 1
+        - items:
+            - vial_of_water
+          quantity: 1
+    wait: 0
+description: An unfinished potion with torstol floating in water.
+id: torstol_potion_unf
+name: torstol potion (unf)
 stackable: false
-made_from:
-  - items: [torstol]
-    quantity: 1
-  - items: [vial_of_water]
-    quantity: 1
-ticks: 0
+value: 102
diff --git a/data/items/consumables/trout.yaml b/data/items/consumables/trout.yaml
index df6cdcc..bb2b69c 100644
--- a/data/items/consumables/trout.yaml
+++ b/data/items/consumables/trout.yaml
@@ -1,8 +1,24 @@
+color: "209"
+craft:
+    consume:
+        - items:
+            - raw_trout
+          quantity: 1
+    fail: burnt_fish
+    fail_message: You accidentally burn the trout.
+    level: 15
+    message: Cooked to perfection. It looks great!
+    skill: cooking
+    station:
+        - fire
+        - cooking_range
+    type: cooking
+    wait: 6
+    xp: 70
+description: A nicely cooked trout.
+eat_message: You eat the trout. Delicious!
+heal_value: 7
 id: trout
 name: trout
-color: "209"
-description: "A nicely cooked trout."
-value: 8
 stackable: false
-heal_value: 7
-eat_message: "You eat the trout. Delicious!"
+value: 8