21 files changed, 77 insertions, 42 deletions

diff --git a/data/items/000_test_item.yaml b/data/items/000_test_item.yaml
deleted file mode 100644
index 591708f..0000000
--- a/data/items/000_test_item.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-color: "6C"
-craft:
-  - end_message: ""
-    fail: ""
-    ingredients:
-      - items:
-          - headless_arrow
-        quantity: 15
-      - items:
-          - adamant_arrowtips
-        quantity: 15
-    level: 60
-    output_qty: 15
-    start_message: ""
-    station: []
-    subtype: ""
-    success_message: ""
-    ticks_per_cycle: 2
-    tool: pickaxe
-    type: fletching
-    xp: 10
-description: An adamant-tipped arrow.
-equipment:
-  other:
-    ranged_strength: 31
-  slot: ammo
-  type: ammo
-farm_harvest_xp: 0
-farm_level: 0
-farm_max_yield: 0
-farm_min_yield: 0
-farm_patch_type: herb
-farm_plant_xp: 0
-farm_stages: 0
-id: 000_test_item
-max_quality: 0
-name: adamant arrow
-recoverable: true
-stackable: true
-value: 20
diff --git a/data/items/consumables/anchovies.yaml b/data/items/consumables/anchovies.yaml
index 3ddb2cb..5c05086 100644
--- a/data/items/consumables/anchovies.yaml
+++ b/data/items/consumables/anchovies.yaml
@@ -10,6 +10,10 @@ craft:
     station:
       - fire
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 30
diff --git a/data/items/consumables/bread.yaml b/data/items/consumables/bread.yaml
index 4b85409..92b2794 100644
--- a/data/items/consumables/bread.yaml
+++ b/data/items/consumables/bread.yaml
@@ -10,6 +10,10 @@ craft:
     success_message: "You bake the dough into a %n."
     station:
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 40
diff --git a/data/items/consumables/herring.yaml b/data/items/consumables/herring.yaml
index ce68ec3..3cd6cd5 100644
--- a/data/items/consumables/herring.yaml
+++ b/data/items/consumables/herring.yaml
@@ -10,6 +10,10 @@ craft:
     station:
       - fire
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 50
diff --git a/data/items/consumables/pastry_dough.yaml b/data/items/consumables/pastry_dough.yaml
index 719581d..c784a92 100644
--- a/data/items/consumables/pastry_dough.yaml
+++ b/data/items/consumables/pastry_dough.yaml
@@ -5,9 +5,13 @@ craft:
       - items:
           - pot_of_flour
         quantity: 1
+        byproducts:
+          - empty_pot
       - items:
           - bucket_of_water
         quantity: 1
+        byproducts:
+          - empty_bucket
     ticks_per_cycle: 2
 description: A ball of uncooked pastry dough. It needs to be baked.
 name: pastry dough
diff --git a/data/items/consumables/pie_dish.yaml b/data/items/consumables/pie_dish.yaml
index 50b4717..9cad088 100644
--- a/data/items/consumables/pie_dish.yaml
+++ b/data/items/consumables/pie_dish.yaml
@@ -4,6 +4,7 @@ craft:
       - items:
           - unfired_pie_dish
         quantity: 1
+    fail: unfired_pie_dish
     fail_message: The pie dish cracks in the oven and is ruined.
     level: 7
     success_message: "You fire the %i1 in the oven."
diff --git a/data/items/consumables/pizza_dough.yaml b/data/items/consumables/pizza_dough.yaml
index 3c3ea13..db69e27 100644
--- a/data/items/consumables/pizza_dough.yaml
+++ b/data/items/consumables/pizza_dough.yaml
@@ -5,9 +5,13 @@ craft:
       - items:
           - pot_of_flour
         quantity: 1
+        byproducts:
+          - empty_pot
       - items:
           - bucket_of_water
         quantity: 1
+        byproducts:
+          - empty_bucket
     ticks_per_cycle: 2
 description: A ball of uncooked pizza dough. It needs to be baked.
 name: pizza dough
diff --git a/data/items/consumables/salmon.yaml b/data/items/consumables/salmon.yaml
index bd77f40..793e1d4 100644
--- a/data/items/consumables/salmon.yaml
+++ b/data/items/consumables/salmon.yaml
@@ -10,6 +10,10 @@ craft:
     station:
       - fire
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 90
diff --git a/data/items/consumables/sardine.yaml b/data/items/consumables/sardine.yaml
index e4ae3b8..bb8b00c 100644
--- a/data/items/consumables/sardine.yaml
+++ b/data/items/consumables/sardine.yaml
@@ -10,6 +10,10 @@ craft:
     station:
       - fire
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 40
diff --git a/data/items/consumables/shrimps.yaml b/data/items/consumables/shrimps.yaml
index 6e842e8..c52955c 100644
--- a/data/items/consumables/shrimps.yaml
+++ b/data/items/consumables/shrimps.yaml
@@ -10,6 +10,10 @@ craft:
     station:
       - fire
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 30
diff --git a/data/items/consumables/trout.yaml b/data/items/consumables/trout.yaml
index f598fb2..06ea15a 100644
--- a/data/items/consumables/trout.yaml
+++ b/data/items/consumables/trout.yaml
@@ -10,6 +10,10 @@ craft:
     station:
       - fire
       - cooking_range
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: cooking
     ticks_per_cycle: 6
     xp: 70
diff --git a/data/items/materials/adamantite_bar.yaml b/data/items/materials/adamantite_bar.yaml
index f5a5010..47fbf97 100644
--- a/data/items/materials/adamantite_bar.yaml
+++ b/data/items/materials/adamantite_bar.yaml
@@ -7,11 +7,16 @@ craft:
       - items:
           - coal
         quantity: 6
+    fail: adamantite_ore
     fail_message: You fail to smelt a usable bar.
     level: 65
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 37
diff --git a/data/items/materials/bronze_bar.yaml b/data/items/materials/bronze_bar.yaml
index 0f40878..3e75269 100644
--- a/data/items/materials/bronze_bar.yaml
+++ b/data/items/materials/bronze_bar.yaml
@@ -7,11 +7,16 @@ craft:
       - items:
           - tin_ore
         quantity: 1
+    fail: copper_ore
     fail_message: You fail to smelt a usable bar.
     level: 1
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 6
diff --git a/data/items/materials/gold_bar.yaml b/data/items/materials/gold_bar.yaml
index 8115fbd..1d4e28d 100644
--- a/data/items/materials/gold_bar.yaml
+++ b/data/items/materials/gold_bar.yaml
@@ -4,11 +4,16 @@ craft:
       - items:
           - gold_ore
         quantity: 1
+    fail: gold_ore
     fail_message: You fail to smelt a usable bar.
     level: 45
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 22
diff --git a/data/items/materials/iron_bar.yaml b/data/items/materials/iron_bar.yaml
index 9f0ac58..1b0ea27 100644
--- a/data/items/materials/iron_bar.yaml
+++ b/data/items/materials/iron_bar.yaml
@@ -4,6 +4,7 @@ craft:
       - items:
           - iron_ore
         quantity: 1
+    fail: iron_ore
     fail_message: The iron is too impure to make a workable bar.
     level: 20
     subtype: smelting
@@ -11,8 +12,8 @@ craft:
       - furnace
     success:
       base: 0.5
-      cap: 0.5
-      per_level: 0
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 12
diff --git a/data/items/materials/mithril_bar.yaml b/data/items/materials/mithril_bar.yaml
index b19cbda..b93e4d9 100644
--- a/data/items/materials/mithril_bar.yaml
+++ b/data/items/materials/mithril_bar.yaml
@@ -7,11 +7,16 @@ craft:
       - items:
           - coal
         quantity: 4
+    fail: mithril_ore
     fail_message: You fail to smelt a usable bar.
     level: 50
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 30
diff --git a/data/items/materials/runite_bar.yaml b/data/items/materials/runite_bar.yaml
index 24945ea..d03417b 100644
--- a/data/items/materials/runite_bar.yaml
+++ b/data/items/materials/runite_bar.yaml
@@ -7,11 +7,16 @@ craft:
       - items:
           - coal
         quantity: 8
+    fail: runite_ore
     fail_message: You fail to smelt a usable bar.
     level: 80
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 50
diff --git a/data/items/materials/silver_bar.yaml b/data/items/materials/silver_bar.yaml
index 7561ba0..03feecb 100644
--- a/data/items/materials/silver_bar.yaml
+++ b/data/items/materials/silver_bar.yaml
@@ -4,11 +4,16 @@ craft:
       - items:
           - silver_ore
         quantity: 1
+    fail: silver_ore
     fail_message: You fail to smelt a usable bar.
     level: 25
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 14
diff --git a/data/items/materials/steel_bar.yaml b/data/items/materials/steel_bar.yaml
index 563c887..39e0689 100644
--- a/data/items/materials/steel_bar.yaml
+++ b/data/items/materials/steel_bar.yaml
@@ -7,11 +7,16 @@ craft:
       - items:
           - coal
         quantity: 2
+    fail: iron_ore
     fail_message: You fail to smelt a usable bar.
     level: 40
     subtype: smelting
     station:
       - furnace
+    success:
+      base: 0.5
+      cap: 0.95
+      per_level: 0.02
     type: smithing
     ticks_per_cycle: 4
     xp: 17
diff --git a/data/items/tools/empty_pot.yaml b/data/items/tools/empty_pot.yaml
index 01609c6..ea3016b 100644
--- a/data/items/tools/empty_pot.yaml
+++ b/data/items/tools/empty_pot.yaml
@@ -4,6 +4,7 @@ craft:
       - items:
           - unfired_pot
         quantity: 1
+    fail: unfired_pot
     fail_message: The pot cracks in the oven and is ruined.
     level: 1
     success_message: "You fire the %i1 in the oven."
diff --git a/data/items/tools/plant_pot.yaml b/data/items/tools/plant_pot.yaml
index 440a65d..17d7466 100644
--- a/data/items/tools/plant_pot.yaml
+++ b/data/items/tools/plant_pot.yaml
@@ -4,6 +4,7 @@ craft:
       - items:
           - unfired_plant_pot
         quantity: 1
+    fail: unfired_plant_pot
     fail_message: The plant pot cracks in the oven and is ruined.
     level: 19
     success_message: "You fire the %i1 in the oven."