diff options
Diffstat (limited to 'data/items')
287 files changed, 2581 insertions, 2450 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 diff --git a/data/items/consumables/amp_potion.yaml b/data/items/consumables/amp_potion.yaml index 8afe6a8..22f9dd7 100644 --- a/data/items/consumables/amp_potion.yaml +++ b/data/items/consumables/amp_potion.yaml @@ -1,6 +1,6 @@ color: "DC" craft: - consume: + ingredients: - items: - tarromin_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - limpwurt_root quantity: 1 level: 12 - skill: pharmacy type: pharmacy wait: 4 xp: 50 diff --git a/data/items/consumables/anchovies.yaml b/data/items/consumables/anchovies.yaml index 51a2e99..1d1dfdd 100644 --- a/data/items/consumables/anchovies.yaml +++ b/data/items/consumables/anchovies.yaml @@ -1,13 +1,12 @@ color: "D1" craft: - consume: + ingredients: - items: - raw_anchovies quantity: 1 fail: burnt_fish fail_message: You accidentally burn the anchovies. level: 1 - skill: cooking station: - fire - cooking_range diff --git a/data/items/consumables/avantoe_potion_unf.yaml b/data/items/consumables/avantoe_potion_unf.yaml index 49c8122..8cee682 100644 --- a/data/items/consumables/avantoe_potion_unf.yaml +++ b/data/items/consumables/avantoe_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - avantoe quantity: 1 diff --git a/data/items/consumables/bio_serum.yaml b/data/items/consumables/bio_serum.yaml index ba7a7f5..68147b1 100644 --- a/data/items/consumables/bio_serum.yaml +++ b/data/items/consumables/bio_serum.yaml @@ -1,6 +1,6 @@ color: "30" craft: - consume: + ingredients: - items: - marrentill_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - antitoxin_powder quantity: 1 level: 5 - skill: pharmacy type: pharmacy wait: 4 xp: 38 diff --git a/data/items/consumables/bread.yaml b/data/items/consumables/bread.yaml index bde89dd..1f8a996 100644 --- a/data/items/consumables/bread.yaml +++ b/data/items/consumables/bread.yaml @@ -1,6 +1,6 @@ color: "DE" craft: - consume: + ingredients: - items: - bread_dough quantity: 1 @@ -8,7 +8,6 @@ craft: fail_message: You burn the bread to a crisp. level: 1 message: "You bake the dough into a %n." - skill: cooking station: - cooking_range type: cooking diff --git a/data/items/consumables/bread_dough.yaml b/data/items/consumables/bread_dough.yaml index 2df433f..48fa986 100644 --- a/data/items/consumables/bread_dough.yaml +++ b/data/items/consumables/bread_dough.yaml @@ -1,21 +1,34 @@ -color: "DE" +color: DE craft: + - ingredients: + - byproducts: + - empty_pot + items: + - pot_of_flour + quantity: 1 + - byproducts: + - empty_bucket + - empty_jug + items: + - bucket_of_water + - jug_of_water + quantity: 1 + end_message: testend + fail: "" + level: 0 + message: testmsg + output_qty: 0 + start_message: teststart + station: [] + subtype: "" + tool: "" 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 + xp: 0 description: A ball of uncooked bread dough. It needs to be baked. +id: bread_dough +max_quality: 0 name: bread dough +quality: 0 stackable: false value: 3 diff --git a/data/items/consumables/cadantine_potion_unf.yaml b/data/items/consumables/cadantine_potion_unf.yaml index 5198f36..d222ed4 100644 --- a/data/items/consumables/cadantine_potion_unf.yaml +++ b/data/items/consumables/cadantine_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - cadantine quantity: 1 diff --git a/data/items/consumables/dwarf_weed_potion_unf.yaml b/data/items/consumables/dwarf_weed_potion_unf.yaml index c5b814c..084a434 100644 --- a/data/items/consumables/dwarf_weed_potion_unf.yaml +++ b/data/items/consumables/dwarf_weed_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - dwarf_weed quantity: 1 diff --git a/data/items/consumables/full_restore.yaml b/data/items/consumables/full_restore.yaml index b817bc5..178914e 100644 --- a/data/items/consumables/full_restore.yaml +++ b/data/items/consumables/full_restore.yaml @@ -1,6 +1,6 @@ color: "D0" craft: - consume: + ingredients: - items: - snapdragon_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - arachnid_enzyme quantity: 1 level: 63 - skill: pharmacy type: pharmacy wait: 4 xp: 143 diff --git a/data/items/consumables/guam_potion_unf.yaml b/data/items/consumables/guam_potion_unf.yaml index 298c578..dc963ed 100644 --- a/data/items/consumables/guam_potion_unf.yaml +++ b/data/items/consumables/guam_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - guam quantity: 1 diff --git a/data/items/consumables/harralander_potion_unf.yaml b/data/items/consumables/harralander_potion_unf.yaml index 29999ac..cf4873f 100644 --- a/data/items/consumables/harralander_potion_unf.yaml +++ b/data/items/consumables/harralander_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - harralander quantity: 1 diff --git a/data/items/consumables/herring.yaml b/data/items/consumables/herring.yaml index 4ff4e19..165802b 100644 --- a/data/items/consumables/herring.yaml +++ b/data/items/consumables/herring.yaml @@ -1,13 +1,12 @@ color: "D1" craft: - consume: + ingredients: - items: - raw_herring quantity: 1 fail: burnt_fish fail_message: You accidentally burn the herring. level: 5 - skill: cooking station: - fire - cooking_range diff --git a/data/items/consumables/irit_potion_unf.yaml b/data/items/consumables/irit_potion_unf.yaml index 1c24007..b358c07 100644 --- a/data/items/consumables/irit_potion_unf.yaml +++ b/data/items/consumables/irit_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - irit quantity: 1 diff --git a/data/items/consumables/kwuarm_potion_unf.yaml b/data/items/consumables/kwuarm_potion_unf.yaml index 9a54ac3..801d301 100644 --- a/data/items/consumables/kwuarm_potion_unf.yaml +++ b/data/items/consumables/kwuarm_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - kwuarm quantity: 1 diff --git a/data/items/consumables/lantadyme_potion_unf.yaml b/data/items/consumables/lantadyme_potion_unf.yaml index d084ac1..069cf22 100644 --- a/data/items/consumables/lantadyme_potion_unf.yaml +++ b/data/items/consumables/lantadyme_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - lantadyme quantity: 1 diff --git a/data/items/consumables/marrentill_potion_unf.yaml b/data/items/consumables/marrentill_potion_unf.yaml index 3a6d6d0..f39094e 100644 --- a/data/items/consumables/marrentill_potion_unf.yaml +++ b/data/items/consumables/marrentill_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - marrentill quantity: 1 diff --git a/data/items/consumables/nano_restore.yaml b/data/items/consumables/nano_restore.yaml index 3afbe16..ddb355a 100644 --- a/data/items/consumables/nano_restore.yaml +++ b/data/items/consumables/nano_restore.yaml @@ -1,6 +1,6 @@ color: "D0" craft: - consume: + ingredients: - items: - harralander_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - arachnid_enzyme quantity: 1 level: 22 - skill: pharmacy type: pharmacy wait: 4 xp: 63 diff --git a/data/items/consumables/pastry_dough.yaml b/data/items/consumables/pastry_dough.yaml index a72c6c3..8c106e0 100644 --- a/data/items/consumables/pastry_dough.yaml +++ b/data/items/consumables/pastry_dough.yaml @@ -1,7 +1,7 @@ color: "DE" craft: type: combine - consume: + ingredients: - items: - pot_of_flour quantity: 1 diff --git a/data/items/consumables/pie_dish.yaml b/data/items/consumables/pie_dish.yaml index b95a291..89d82e4 100644 --- a/data/items/consumables/pie_dish.yaml +++ b/data/items/consumables/pie_dish.yaml @@ -1,13 +1,12 @@ color: "82" craft: - consume: + ingredients: - items: - unfired_pie_dish quantity: 1 fail_message: The pie dish cracks in the oven and is ruined. level: 7 message: "You fire the %i1 in the oven." - skill: crafting station: - pottery_oven success: diff --git a/data/items/consumables/pizza_dough.yaml b/data/items/consumables/pizza_dough.yaml index 5223d9b..c8e29dc 100644 --- a/data/items/consumables/pizza_dough.yaml +++ b/data/items/consumables/pizza_dough.yaml @@ -1,7 +1,7 @@ color: "DE" craft: type: combine - consume: + ingredients: - items: - pot_of_flour quantity: 1 diff --git a/data/items/consumables/ranarr_potion_unf.yaml b/data/items/consumables/ranarr_potion_unf.yaml index 08a2857..3adfbf7 100644 --- a/data/items/consumables/ranarr_potion_unf.yaml +++ b/data/items/consumables/ranarr_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - ranarr quantity: 1 diff --git a/data/items/consumables/restoration_compound.yaml b/data/items/consumables/restoration_compound.yaml index b9c36cd..79eac7a 100644 --- a/data/items/consumables/restoration_compound.yaml +++ b/data/items/consumables/restoration_compound.yaml @@ -1,6 +1,6 @@ color: "33" craft: - consume: + ingredients: - items: - toadflax_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - crushed_nest quantity: 1 level: 81 - skill: pharmacy type: pharmacy wait: 4 xp: 180 diff --git a/data/items/consumables/salmon.yaml b/data/items/consumables/salmon.yaml index dc9a956..b29f935 100644 --- a/data/items/consumables/salmon.yaml +++ b/data/items/consumables/salmon.yaml @@ -1,13 +1,12 @@ color: "D1" craft: - consume: + ingredients: - items: - raw_salmon quantity: 1 fail: burnt_fish fail_message: You accidentally burn the salmon. level: 25 - skill: cooking station: - fire - cooking_range diff --git a/data/items/consumables/sardine.yaml b/data/items/consumables/sardine.yaml index ac33a49..0c4f53e 100644 --- a/data/items/consumables/sardine.yaml +++ b/data/items/consumables/sardine.yaml @@ -1,13 +1,12 @@ color: "D1" craft: - consume: + ingredients: - items: - raw_sardine quantity: 1 fail: burnt_fish fail_message: You accidentally burn the sardine. level: 1 - skill: cooking station: - fire - cooking_range diff --git a/data/items/consumables/science_serum.yaml b/data/items/consumables/science_serum.yaml index 39ab495..4915ea8 100644 --- a/data/items/consumables/science_serum.yaml +++ b/data/items/consumables/science_serum.yaml @@ -1,6 +1,6 @@ color: "8D" craft: - consume: + ingredients: - items: - lantadyme_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - potato_cactus quantity: 1 level: 76 - skill: pharmacy type: pharmacy wait: 4 xp: 173 diff --git a/data/items/consumables/shield_potion.yaml b/data/items/consumables/shield_potion.yaml index 92f4980..88d1967 100644 --- a/data/items/consumables/shield_potion.yaml +++ b/data/items/consumables/shield_potion.yaml @@ -1,6 +1,6 @@ color: "15" craft: - consume: + ingredients: - items: - ranarr_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - white_berries quantity: 1 level: 30 - skill: pharmacy type: pharmacy wait: 4 xp: 75 diff --git a/data/items/consumables/shrimps.yaml b/data/items/consumables/shrimps.yaml index 536c3f5..be11251 100644 --- a/data/items/consumables/shrimps.yaml +++ b/data/items/consumables/shrimps.yaml @@ -1,13 +1,12 @@ color: "D1" craft: - consume: + ingredients: - items: - raw_shrimps quantity: 1 fail: burnt_fish fail_message: You accidentally burn the shrimps. level: 1 - skill: cooking station: - fire - cooking_range diff --git a/data/items/consumables/snapdragon_potion_unf.yaml b/data/items/consumables/snapdragon_potion_unf.yaml index 5bc76b3..d3e8a9e 100644 --- a/data/items/consumables/snapdragon_potion_unf.yaml +++ b/data/items/consumables/snapdragon_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - snapdragon quantity: 1 diff --git a/data/items/consumables/stim_potion.yaml b/data/items/consumables/stim_potion.yaml index a19d611..c61e4fb 100644 --- a/data/items/consumables/stim_potion.yaml +++ b/data/items/consumables/stim_potion.yaml @@ -1,6 +1,6 @@ color: "C4" craft: - consume: + ingredients: - items: - guam_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - eye_of_newt quantity: 1 level: 1 - skill: pharmacy type: pharmacy wait: 4 xp: 25 diff --git a/data/items/consumables/super_amp.yaml b/data/items/consumables/super_amp.yaml index 7f851c6..f8fd85c 100644 --- a/data/items/consumables/super_amp.yaml +++ b/data/items/consumables/super_amp.yaml @@ -1,6 +1,6 @@ color: "DC" craft: - consume: + ingredients: - items: - kwuarm_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - limpwurt_root quantity: 1 level: 55 - skill: pharmacy type: pharmacy wait: 4 xp: 125 diff --git a/data/items/consumables/super_bio_serum.yaml b/data/items/consumables/super_bio_serum.yaml index 08154d2..d4003a4 100644 --- a/data/items/consumables/super_bio_serum.yaml +++ b/data/items/consumables/super_bio_serum.yaml @@ -1,6 +1,6 @@ color: "30" craft: - consume: + ingredients: - items: - irit_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - antitoxin_powder quantity: 1 level: 48 - skill: pharmacy type: pharmacy wait: 4 xp: 106 diff --git a/data/items/consumables/super_shield.yaml b/data/items/consumables/super_shield.yaml index 570af87..90389d6 100644 --- a/data/items/consumables/super_shield.yaml +++ b/data/items/consumables/super_shield.yaml @@ -1,6 +1,6 @@ color: "15" craft: - consume: + ingredients: - items: - cadantine_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - white_berries quantity: 1 level: 66 - skill: pharmacy type: pharmacy wait: 4 xp: 150 diff --git a/data/items/consumables/super_stim.yaml b/data/items/consumables/super_stim.yaml index 2b35d62..27662a5 100644 --- a/data/items/consumables/super_stim.yaml +++ b/data/items/consumables/super_stim.yaml @@ -1,6 +1,6 @@ color: "C4" craft: - consume: + ingredients: - items: - irit_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - eye_of_newt quantity: 1 level: 45 - skill: pharmacy type: pharmacy wait: 4 xp: 100 diff --git a/data/items/consumables/super_stim_cell.yaml b/data/items/consumables/super_stim_cell.yaml index 45dca94..37c4af2 100644 --- a/data/items/consumables/super_stim_cell.yaml +++ b/data/items/consumables/super_stim_cell.yaml @@ -1,6 +1,6 @@ color: "E2" craft: - consume: + ingredients: - items: - avantoe_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - blight_spore quantity: 1 level: 52 - skill: pharmacy type: pharmacy wait: 4 xp: 118 diff --git a/data/items/consumables/targeting_serum.yaml b/data/items/consumables/targeting_serum.yaml index e8b8864..74b3e73 100644 --- a/data/items/consumables/targeting_serum.yaml +++ b/data/items/consumables/targeting_serum.yaml @@ -1,6 +1,6 @@ color: "CA" craft: - consume: + ingredients: - items: - dwarf_weed_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - catalyst_wine quantity: 1 level: 72 - skill: pharmacy type: pharmacy wait: 4 xp: 163 diff --git a/data/items/consumables/tarromin_potion_unf.yaml b/data/items/consumables/tarromin_potion_unf.yaml index 1db2c0a..c8798f6 100644 --- a/data/items/consumables/tarromin_potion_unf.yaml +++ b/data/items/consumables/tarromin_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - tarromin quantity: 1 diff --git a/data/items/consumables/tech_serum.yaml b/data/items/consumables/tech_serum.yaml index 79224ad..01ad080 100644 --- a/data/items/consumables/tech_serum.yaml +++ b/data/items/consumables/tech_serum.yaml @@ -1,6 +1,6 @@ color: "4B" craft: - consume: + ingredients: - items: - ranarr_potion_unf quantity: 1 @@ -8,7 +8,6 @@ craft: - snape_grass quantity: 1 level: 38 - skill: pharmacy type: pharmacy wait: 4 xp: 88 diff --git a/data/items/consumables/toadflax_potion_unf.yaml b/data/items/consumables/toadflax_potion_unf.yaml index ff9bf79..aa56ef7 100644 --- a/data/items/consumables/toadflax_potion_unf.yaml +++ b/data/items/consumables/toadflax_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - toadflax quantity: 1 diff --git a/data/items/consumables/torstol_potion_unf.yaml b/data/items/consumables/torstol_potion_unf.yaml index 1008463..89e8f8c 100644 --- a/data/items/consumables/torstol_potion_unf.yaml +++ b/data/items/consumables/torstol_potion_unf.yaml @@ -1,7 +1,7 @@ color: "30" craft: type: pharmacy - consume: + ingredients: - items: - torstol quantity: 1 diff --git a/data/items/consumables/trout.yaml b/data/items/consumables/trout.yaml index 4c5a2e1..91933d6 100644 --- a/data/items/consumables/trout.yaml +++ b/data/items/consumables/trout.yaml @@ -1,13 +1,12 @@ color: "D1" craft: - consume: + ingredients: - items: - raw_trout quantity: 1 fail: burnt_fish fail_message: You accidentally burn the trout. level: 15 - skill: cooking station: - fire - cooking_range diff --git a/data/items/decks/advanced_bio_deck.yaml b/data/items/decks/advanced_bio_deck.yaml index 6eb1559..dffbbe0 100644 --- a/data/items/decks/advanced_bio_deck.yaml +++ b/data/items/decks/advanced_bio_deck.yaml @@ -1,10 +1,11 @@ +color: C4 bold +description: A high-powered bio deck with enhanced circuitry. Provides unlimited biojunk and removes the scrap requirement. +equipment: + attack: + science: 20 + junk: biojunk + slot: main_hand + speed: 5 + type: tech_weapon name: advanced bio deck -color: "C4 bold" -description: "A high-powered bio deck with enhanced circuitry. Provides unlimited biojunk and removes the scrap requirement." value: 15000 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 20 -provides_junk: biojunk diff --git a/data/items/decks/advanced_eco_deck.yaml b/data/items/decks/advanced_eco_deck.yaml index 9c4d58a..419e157 100644 --- a/data/items/decks/advanced_eco_deck.yaml +++ b/data/items/decks/advanced_eco_deck.yaml @@ -1,10 +1,11 @@ +color: 22 bold +description: A high-powered eco deck with enhanced circuitry. Provides unlimited ecojunk and removes the scrap requirement. +equipment: + attack: + science: 20 + junk: ecojunk + slot: main_hand + speed: 5 + type: tech_weapon name: advanced eco deck -color: "22 bold" -description: "A high-powered eco deck with enhanced circuitry. Provides unlimited ecojunk and removes the scrap requirement." value: 15000 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 20 -provides_junk: ecojunk diff --git a/data/items/decks/advanced_hydro_deck.yaml b/data/items/decks/advanced_hydro_deck.yaml index bf165b8..e1c7181 100644 --- a/data/items/decks/advanced_hydro_deck.yaml +++ b/data/items/decks/advanced_hydro_deck.yaml @@ -1,10 +1,11 @@ +color: 27 bold +description: A high-powered hydro deck with enhanced circuitry. Provides unlimited hydrojunk and removes the scrap requirement. +equipment: + attack: + science: 20 + junk: hydrojunk + slot: main_hand + speed: 5 + type: tech_weapon name: advanced hydro deck -color: "27 bold" -description: "A high-powered hydro deck with enhanced circuitry. Provides unlimited hydrojunk and removes the scrap requirement." value: 15000 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 20 -provides_junk: hydrojunk diff --git a/data/items/decks/advanced_solar_deck.yaml b/data/items/decks/advanced_solar_deck.yaml index 98d4e76..25ce3d5 100644 --- a/data/items/decks/advanced_solar_deck.yaml +++ b/data/items/decks/advanced_solar_deck.yaml @@ -1,10 +1,11 @@ +color: DC bold +description: A high-powered solar deck with enhanced circuitry. Provides unlimited solarjunk and removes the scrap requirement. +equipment: + attack: + science: 20 + junk: solarjunk + slot: main_hand + speed: 5 + type: tech_weapon name: advanced solar deck -color: "DC bold" -description: "A high-powered solar deck with enhanced circuitry. Provides unlimited solarjunk and removes the scrap requirement." value: 15000 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 20 -provides_junk: solarjunk diff --git a/data/items/decks/basic_deck.yaml b/data/items/decks/basic_deck.yaml index da478b0..52bcea7 100644 --- a/data/items/decks/basic_deck.yaml +++ b/data/items/decks/basic_deck.yaml @@ -1,9 +1,10 @@ +color: F5 +description: A simple programmable deck. Removes the scrap requirement for triggering mods, but provides no elemental junk. +equipment: + attack: + science: 5 + slot: main_hand + speed: 5 + type: tech_weapon name: basic deck -color: "F5" -description: "A simple programmable deck. Removes the scrap requirement for triggering mods, but provides no elemental junk." value: 500 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 5 diff --git a/data/items/decks/bio_deck.yaml b/data/items/decks/bio_deck.yaml index 7211ddc..373202c 100644 --- a/data/items/decks/bio_deck.yaml +++ b/data/items/decks/bio_deck.yaml @@ -1,10 +1,11 @@ +color: C4 +description: A programmable deck infused with bio-synthetic membranes. Provides unlimited biojunk and removes the scrap requirement. +equipment: + attack: + science: 10 + junk: biojunk + slot: main_hand + speed: 5 + type: tech_weapon name: bio deck -color: "C4" -description: "A programmable deck infused with bio-synthetic membranes. Provides unlimited biojunk and removes the scrap requirement." value: 1500 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 10 -provides_junk: biojunk diff --git a/data/items/decks/eco_deck.yaml b/data/items/decks/eco_deck.yaml index b922eea..9d679de 100644 --- a/data/items/decks/eco_deck.yaml +++ b/data/items/decks/eco_deck.yaml @@ -1,10 +1,11 @@ -name: eco deck color: "22" -description: "A programmable deck threaded with eco-organic circuits. Provides unlimited ecojunk and removes the scrap requirement." +description: A programmable deck threaded with eco-organic circuits. Provides unlimited ecojunk and removes the scrap requirement. +equipment: + attack: + science: 10 + junk: ecojunk + slot: main_hand + speed: 5 + type: tech_weapon +name: eco deck value: 1500 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 10 -provides_junk: ecojunk diff --git a/data/items/decks/hydro_deck.yaml b/data/items/decks/hydro_deck.yaml index 51e23e3..e49cedd 100644 --- a/data/items/decks/hydro_deck.yaml +++ b/data/items/decks/hydro_deck.yaml @@ -1,10 +1,11 @@ -name: hydro deck color: "27" -description: "A programmable deck infused with hydro circuitry. Provides unlimited hydrojunk and removes the scrap requirement." +description: A programmable deck infused with hydro circuitry. Provides unlimited hydrojunk and removes the scrap requirement. +equipment: + attack: + science: 10 + junk: hydrojunk + slot: main_hand + speed: 5 + type: tech_weapon +name: hydro deck value: 1500 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 10 -provides_junk: hydrojunk diff --git a/data/items/decks/solar_deck.yaml b/data/items/decks/solar_deck.yaml index c597ac6..e7816a1 100644 --- a/data/items/decks/solar_deck.yaml +++ b/data/items/decks/solar_deck.yaml @@ -1,10 +1,11 @@ +color: DC +description: A programmable deck pulsing with solar energy. Provides unlimited solarjunk and removes the scrap requirement. +equipment: + attack: + science: 10 + junk: solarjunk + slot: main_hand + speed: 5 + type: tech_weapon name: solar deck -color: "DC" -description: "A programmable deck pulsing with solar energy. Provides unlimited solarjunk and removes the scrap requirement." value: 1500 -equip_slot: main_hand -weapon_type: science -speed: 5 -stats: - science_attack: 10 -provides_junk: solarjunk diff --git a/data/items/equipment/abyssal_bracelet.yaml b/data/items/equipment/abyssal_bracelet.yaml index df10e72..f20c1c4 100644 --- a/data/items/equipment/abyssal_bracelet.yaml +++ b/data/items/equipment/abyssal_bracelet.yaml @@ -1,5 +1,7 @@ +color: FF +description: An enchanted diamond bracelet that increases scavenging output. +equipment: + slot: hands + type: armor name: abyssal bracelet -color: "FF" -description: "An enchanted diamond bracelet that increases scavenging output." value: 6000 -equip_slot: hands diff --git a/data/items/equipment/adamant_dagger.yaml b/data/items/equipment/adamant_dagger.yaml index 3f8263c..7a4a832 100644 --- a/data/items/equipment/adamant_dagger.yaml +++ b/data/items/equipment/adamant_dagger.yaml @@ -1,28 +1,29 @@ -attack_type: stab color: "78" craft: - consume: - - items: - - adamantite_bar - quantity: 1 - level: 70 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 62 + ingredients: + - items: + - adamantite_bar + quantity: 1 + level: 70 + station: + - anvil + type: smithing + wait: 4 + xp: 62 description: A small adamant dagger. -equip_slot: main_hand +equipment: + attack: + crush: -1 + slash: 14 + stab: 23 + attack_type: stab + other: + strength: 19 + slot: main_hand + speed: 3 + type: melee_weapon name: adamant dagger requirements: - accuracy: 30 -speed: 3 + accuracy: 30 stackable: false -stats: - crush_attack: -1 - slash_attack: 14 - stab_attack: 23 - strength_bonus: 19 value: 400 -weapon_type: melee diff --git a/data/items/equipment/adamant_full_helm.yaml b/data/items/equipment/adamant_full_helm.yaml index 9a8e2a2..5d4bd24 100644 --- a/data/items/equipment/adamant_full_helm.yaml +++ b/data/items/equipment/adamant_full_helm.yaml @@ -1,26 +1,27 @@ color: "78" craft: - consume: - - items: - - adamantite_bar - quantity: 2 - level: 77 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 125 + ingredients: + - items: + - adamantite_bar + quantity: 2 + level: 77 + station: + - anvil + type: smithing + wait: 4 + xp: 125 description: An adamant full helmet. -equip_slot: head +equipment: + defense: + crush: 16 + ranged: 22 + science: -8 + slash: 24 + stab: 22 + slot: head + type: armor name: adamant full helm requirements: - defense: 30 + defense: 30 stackable: false -stats: - crush_defense: 16 - ranged_defense: 22 - science_defense: -8 - slash_defense: 24 - stab_defense: 22 value: 1000 diff --git a/data/items/equipment/adamant_med_helm.yaml b/data/items/equipment/adamant_med_helm.yaml index baa3cf3..3b06767 100644 --- a/data/items/equipment/adamant_med_helm.yaml +++ b/data/items/equipment/adamant_med_helm.yaml @@ -1,26 +1,27 @@ color: "78" craft: - consume: - - items: - - adamantite_bar - quantity: 1 - level: 73 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 62 + ingredients: + - items: + - adamantite_bar + quantity: 1 + level: 73 + station: + - anvil + type: smithing + wait: 4 + xp: 62 description: An adamant medium helmet. -equip_slot: head +equipment: + defense: + crush: 10 + ranged: 14 + science: -3 + slash: 16 + stab: 14 + slot: head + type: armor name: adamant med helm requirements: - defense: 30 + defense: 30 stackable: false -stats: - crush_defense: 10 - ranged_defense: 14 - science_defense: -3 - slash_defense: 16 - stab_defense: 14 value: 400 diff --git a/data/items/equipment/adamant_platebody.yaml b/data/items/equipment/adamant_platebody.yaml index a80f375..144bf78 100644 --- a/data/items/equipment/adamant_platebody.yaml +++ b/data/items/equipment/adamant_platebody.yaml @@ -1,26 +1,27 @@ color: "78" craft: - consume: - - items: - - adamantite_bar - quantity: 5 - level: 88 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 312 + ingredients: + - items: + - adamantite_bar + quantity: 5 + level: 88 + station: + - anvil + type: smithing + wait: 4 + xp: 312 description: An adamant platebody. -equip_slot: torso +equipment: + defense: + crush: 40 + ranged: 49 + science: -25 + slash: 55 + stab: 49 + slot: torso + type: armor name: adamant platebody requirements: - defense: 30 + defense: 30 stackable: false -stats: - crush_defense: 40 - ranged_defense: 49 - science_defense: -25 - slash_defense: 55 - stab_defense: 49 value: 5000 diff --git a/data/items/equipment/adamant_sword.yaml b/data/items/equipment/adamant_sword.yaml index 0033f76..052d501 100644 --- a/data/items/equipment/adamant_sword.yaml +++ b/data/items/equipment/adamant_sword.yaml @@ -1,28 +1,29 @@ -attack_type: slash color: "78" craft: - consume: - - items: - - adamantite_bar - quantity: 1 - level: 74 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 62 + ingredients: + - items: + - adamantite_bar + quantity: 1 + level: 74 + station: + - anvil + type: smithing + wait: 4 + xp: 62 description: An adamant sword. -equip_slot: main_hand +equipment: + attack: + crush: -2 + slash: 40 + stab: 20 + attack_type: slash + other: + strength: 27 + slot: main_hand + speed: 4 + type: melee_weapon name: adamant sword requirements: - accuracy: 30 -speed: 4 + accuracy: 30 stackable: false -stats: - crush_attack: -2 - slash_attack: 40 - stab_attack: 20 - strength_bonus: 27 value: 700 -weapon_type: melee diff --git a/data/items/equipment/binding_necklace.yaml b/data/items/equipment/binding_necklace.yaml index 6518ce7..879271e 100644 --- a/data/items/equipment/binding_necklace.yaml +++ b/data/items/equipment/binding_necklace.yaml @@ -1,5 +1,7 @@ -name: binding necklace color: "22" -description: "An enchanted emerald necklace. Provides a 100 percent success rate when identifying junk at altars." +description: An enchanted emerald necklace. Provides a 100 percent success rate when identifying junk at altars. +equipment: + slot: neck + type: armor +name: binding necklace value: 1200 -equip_slot: neck diff --git a/data/items/equipment/black_axe.yaml b/data/items/equipment/black_axe.yaml index ffff723..e0bbad2 100644 --- a/data/items/equipment/black_axe.yaml +++ b/data/items/equipment/black_axe.yaml @@ -1,18 +1,21 @@ +color: F0 +description: A black axe, good for woodcutting. +equipment: + attack: + crush: 14 + slash: 18 + stab: -2 + attack_type: slash + other: + strength: 14 + slot: main_hand + speed: 5 + type: melee_weapon name: black axe -color: "F0" -description: "A black axe, good for woodcutting." -value: 150 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 18 - crush_attack: 14 - strength_bonus: 14 -speed: 5 -tool_type: axe -tool_speed: 2.5 requirements: - accuracy: 10 + accuracy: 10 +stackable: false +tool: + speed: 2.5 + type: axe +value: 150 diff --git a/data/items/equipment/bracelet_of_clay.yaml b/data/items/equipment/bracelet_of_clay.yaml index ed9f92f..297538c 100644 --- a/data/items/equipment/bracelet_of_clay.yaml +++ b/data/items/equipment/bracelet_of_clay.yaml @@ -1,5 +1,7 @@ -name: bracelet of clay color: "27" -description: "An enchanted sapphire bracelet. Softens clay for easier crafting." +description: An enchanted sapphire bracelet. Softens clay for easier crafting. +equipment: + slot: hands + type: armor +name: bracelet of clay value: 500 -equip_slot: hands diff --git a/data/items/equipment/bracelet_of_slaughter.yaml b/data/items/equipment/bracelet_of_slaughter.yaml index 785a379..4ce08c9 100644 --- a/data/items/equipment/bracelet_of_slaughter.yaml +++ b/data/items/equipment/bracelet_of_slaughter.yaml @@ -1,5 +1,7 @@ -name: bracelet of slaughter color: "22" -description: "An enchanted emerald bracelet that provides bonus XP on kills." +description: An enchanted emerald bracelet that provides bonus XP on kills. +equipment: + slot: hands + type: armor +name: bracelet of slaughter value: 1200 -equip_slot: hands diff --git a/data/items/equipment/bronze_dagger.yaml b/data/items/equipment/bronze_dagger.yaml index d74276e..a1fa416 100644 --- a/data/items/equipment/bronze_dagger.yaml +++ b/data/items/equipment/bronze_dagger.yaml @@ -1,26 +1,27 @@ -attack_type: stab -color: "B2" +color: B2 craft: - consume: - - items: - - bronze_bar - quantity: 1 - level: 1 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 12 + ingredients: + - items: + - bronze_bar + quantity: 1 + level: 1 + station: + - anvil + type: smithing + wait: 4 + xp: 12 description: A small bronze dagger. -equip_slot: main_hand +equipment: + attack: + crush: -1 + slash: 3 + stab: 5 + attack_type: stab + other: + strength: 4 + slot: main_hand + speed: 3 + type: melee_weapon name: bronze dagger -speed: 3 stackable: false -stats: - crush_attack: -1 - slash_attack: 3 - stab_attack: 5 - strength_bonus: 4 value: 8 -weapon_type: melee diff --git a/data/items/equipment/bronze_full_helm.yaml b/data/items/equipment/bronze_full_helm.yaml index 07db7f4..1d61b36 100644 --- a/data/items/equipment/bronze_full_helm.yaml +++ b/data/items/equipment/bronze_full_helm.yaml @@ -1,24 +1,25 @@ -color: "B2" +color: B2 craft: - consume: - - items: - - bronze_bar - quantity: 2 - level: 7 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 25 + ingredients: + - items: + - bronze_bar + quantity: 2 + level: 7 + station: + - anvil + type: smithing + wait: 4 + xp: 25 description: A bronze full helmet. -equip_slot: head +equipment: + defense: + crush: 4 + ranged: 5 + science: -3 + slash: 6 + stab: 5 + slot: head + type: armor name: bronze full helm stackable: false -stats: - crush_defense: 4 - ranged_defense: 5 - science_defense: -3 - slash_defense: 6 - stab_defense: 5 value: 20 diff --git a/data/items/equipment/bronze_med_helm.yaml b/data/items/equipment/bronze_med_helm.yaml index d6a31ad..4832b3d 100644 --- a/data/items/equipment/bronze_med_helm.yaml +++ b/data/items/equipment/bronze_med_helm.yaml @@ -1,24 +1,25 @@ -color: "B2" +color: B2 craft: - consume: - - items: - - bronze_bar - quantity: 1 - level: 3 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 12 + ingredients: + - items: + - bronze_bar + quantity: 1 + level: 3 + station: + - anvil + type: smithing + wait: 4 + xp: 12 description: A bronze medium helmet. -equip_slot: head +equipment: + defense: + crush: 2 + ranged: 3 + science: -1 + slash: 4 + stab: 3 + slot: head + type: armor name: bronze med helm stackable: false -stats: - crush_defense: 2 - ranged_defense: 3 - science_defense: -1 - slash_defense: 4 - stab_defense: 3 value: 8 diff --git a/data/items/equipment/bronze_platebody.yaml b/data/items/equipment/bronze_platebody.yaml index d6954a2..a642f14 100644 --- a/data/items/equipment/bronze_platebody.yaml +++ b/data/items/equipment/bronze_platebody.yaml @@ -1,24 +1,25 @@ -color: "B2" +color: B2 craft: - consume: - - items: - - bronze_bar - quantity: 5 - level: 18 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 62 + ingredients: + - items: + - bronze_bar + quantity: 5 + level: 18 + station: + - anvil + type: smithing + wait: 4 + xp: 62 description: A bronze platebody. -equip_slot: torso +equipment: + defense: + crush: 10 + ranged: 12 + science: -10 + slash: 15 + stab: 12 + slot: torso + type: armor name: bronze platebody stackable: false -stats: - crush_defense: 10 - ranged_defense: 12 - science_defense: -10 - slash_defense: 15 - stab_defense: 12 value: 60 diff --git a/data/items/equipment/bronze_sword.yaml b/data/items/equipment/bronze_sword.yaml index 7a93c4c..56160f4 100644 --- a/data/items/equipment/bronze_sword.yaml +++ b/data/items/equipment/bronze_sword.yaml @@ -1,26 +1,27 @@ -attack_type: slash -color: "B2" +color: B2 craft: - consume: - - items: - - bronze_bar - quantity: 1 - level: 4 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 12 + ingredients: + - items: + - bronze_bar + quantity: 1 + level: 4 + station: + - anvil + type: smithing + wait: 4 + xp: 12 description: A basic bronze sword. -equip_slot: main_hand +equipment: + attack: + crush: -2 + slash: 10 + stab: 4 + attack_type: slash + other: + strength: 7 + slot: main_hand + speed: 4 + type: melee_weapon name: bronze sword -speed: 4 stackable: false -stats: - crush_attack: -2 - slash_attack: 10 - stab_attack: 4 - strength_bonus: 7 value: 12 -weapon_type: melee diff --git a/data/items/equipment/capacitor_gloves.yaml b/data/items/equipment/capacitor_gloves.yaml index 85cccc0..4b30983 100644 --- a/data/items/equipment/capacitor_gloves.yaml +++ b/data/items/equipment/capacitor_gloves.yaml @@ -1,10 +1,13 @@ +color: FA +description: Gloves woven with superconducting filaments. +equipment: + defense: + crush: 2 + slash: 2 + stab: 2 + other: + technology: 2 + slot: hands + type: armor name: Capacitor Gloves -description: "Gloves woven with superconducting filaments." -color: "FA" value: 300 -equip_slot: hands -stats: - stab_defense: 2 - slash_defense: 2 - crush_defense: 2 - technology_bonus: 2 diff --git a/data/items/equipment/cape_of_agility.yaml b/data/items/equipment/cape_of_agility.yaml index 62b8635..a64be10 100644 --- a/data/items/equipment/cape_of_agility.yaml +++ b/data/items/equipment/cape_of_agility.yaml @@ -1,5 +1,7 @@ +color: g:DF,E7,DF +description: A lightweight cape that allows the wearer to move with extraordinary speed. +equipment: + slot: back + type: armor name: cape of agility -color: "g:DF,E7,DF" -description: "A lightweight cape that allows the wearer to move with extraordinary speed." value: 500 -equip_slot: back diff --git a/data/items/equipment/coif.yaml b/data/items/equipment/coif.yaml index ea02d92..7aeab1b 100644 --- a/data/items/equipment/coif.yaml +++ b/data/items/equipment/coif.yaml @@ -1,29 +1,31 @@ -color: "5E" +color: 5E craft: - consume: - - items: - - hard_leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 38 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 37 + ingredients: + - items: + - hard_leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 38 + tool: needle + type: crafting + wait: 4 + xp: 37 description: A hard leather coif. -equip_slot: head +equipment: + attack: + ranged: 2 + defense: + crush: 2 + ranged: 6 + science: 4 + slash: 4 + stab: 2 + slot: head + type: armor name: coif requirements: - defense: 20 - ranged: 20 -stats: - crush_defense: 2 - ranged_attack: 2 - ranged_defense: 6 - science_defense: 4 - slash_defense: 4 - stab_defense: 2 + defense: 20 + ranged: 20 value: 45 diff --git a/data/items/equipment/diamond_amulet_u.yaml b/data/items/equipment/diamond_amulet_u.yaml index 2959aac..e8be864 100644 --- a/data/items/equipment/diamond_amulet_u.yaml +++ b/data/items/equipment/diamond_amulet_u.yaml @@ -1,6 +1,6 @@ color: "FF" craft: - consume: + ingredients: - items: - gold_bar quantity: 1 @@ -13,7 +13,6 @@ craft: - amulet_mould quantity: 1 level: 70 - skill: crafting station: - furnace type: crafting diff --git a/data/items/equipment/diamond_bracelet.yaml b/data/items/equipment/diamond_bracelet.yaml index 13acc98..090f4f5 100644 --- a/data/items/equipment/diamond_bracelet.yaml +++ b/data/items/equipment/diamond_bracelet.yaml @@ -1,25 +1,26 @@ -color: "FF" +color: FF craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - diamond - quantity: 1 - - byproducts: - - bracelet_mould - items: - - bracelet_mould - quantity: 1 - level: 58 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 95 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - diamond + quantity: 1 + - byproducts: + - bracelet_mould + items: + - bracelet_mould + quantity: 1 + level: 58 + station: + - furnace + type: crafting + wait: 4 + xp: 95 description: A bracelet set with a diamond. Can be enchanted. -equip_slot: hands +equipment: + slot: hands + type: armor name: diamond bracelet value: 1500 diff --git a/data/items/equipment/diamond_necklace.yaml b/data/items/equipment/diamond_necklace.yaml index 19d485a..1c3510d 100644 --- a/data/items/equipment/diamond_necklace.yaml +++ b/data/items/equipment/diamond_necklace.yaml @@ -1,25 +1,26 @@ -color: "FF" +color: FF craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - diamond - quantity: 1 - - byproducts: - - necklace_mould - items: - - necklace_mould - quantity: 1 - level: 56 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 90 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - diamond + quantity: 1 + - byproducts: + - necklace_mould + items: + - necklace_mould + quantity: 1 + level: 56 + station: + - furnace + type: crafting + wait: 4 + xp: 90 description: A necklace set with a diamond. Can be enchanted. -equip_slot: neck +equipment: + slot: neck + type: armor name: diamond necklace value: 1600 diff --git a/data/items/equipment/diamond_ring.yaml b/data/items/equipment/diamond_ring.yaml index f8fc583..a8f8017 100644 --- a/data/items/equipment/diamond_ring.yaml +++ b/data/items/equipment/diamond_ring.yaml @@ -1,25 +1,26 @@ -color: "FF" +color: FF craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - diamond - quantity: 1 - - byproducts: - - ring_mould - items: - - ring_mould - quantity: 1 - level: 43 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 85 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - diamond + quantity: 1 + - byproducts: + - ring_mould + items: + - ring_mould + quantity: 1 + level: 43 + station: + - furnace + type: crafting + wait: 4 + xp: 85 description: A ring set with a diamond. Can be enchanted. -equip_slot: ring +equipment: + slot: ring + type: armor name: diamond ring value: 1500 diff --git a/data/items/equipment/digsite_pendant.yaml b/data/items/equipment/digsite_pendant.yaml index b8a2985..49942f1 100644 --- a/data/items/equipment/digsite_pendant.yaml +++ b/data/items/equipment/digsite_pendant.yaml @@ -1,5 +1,7 @@ +color: C4 +description: An enchanted ruby necklace that can teleport you to dig sites. +equipment: + slot: neck + type: armor name: digsite pendant -color: "C4" -description: "An enchanted ruby necklace that can teleport you to dig sites." value: 2500 -equip_slot: neck diff --git a/data/items/equipment/dragon_axe.yaml b/data/items/equipment/dragon_axe.yaml index 127b343..81f7c48 100644 --- a/data/items/equipment/dragon_axe.yaml +++ b/data/items/equipment/dragon_axe.yaml @@ -1,18 +1,21 @@ +color: C4 +description: A powerful dragon axe. +equipment: + attack: + crush: 32 + slash: 43 + stab: -2 + attack_type: slash + other: + strength: 36 + slot: main_hand + speed: 5 + type: melee_weapon name: dragon axe -color: "C4" -description: "A powerful dragon axe." -value: 50000 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 43 - crush_attack: 32 - strength_bonus: 36 -speed: 5 -tool_type: axe -tool_speed: 1 requirements: accuracy: 60 +stackable: false +tool: + speed: 1 + type: axe +value: 50000 diff --git a/data/items/equipment/emerald_amulet_u.yaml b/data/items/equipment/emerald_amulet_u.yaml index 27421f2..0e0ac26 100644 --- a/data/items/equipment/emerald_amulet_u.yaml +++ b/data/items/equipment/emerald_amulet_u.yaml @@ -1,6 +1,6 @@ color: "53" craft: - consume: + ingredients: - items: - gold_bar quantity: 1 @@ -13,7 +13,6 @@ craft: - amulet_mould quantity: 1 level: 31 - skill: crafting station: - furnace type: crafting diff --git a/data/items/equipment/emerald_bracelet.yaml b/data/items/equipment/emerald_bracelet.yaml index 55ad471..990a7eb 100644 --- a/data/items/equipment/emerald_bracelet.yaml +++ b/data/items/equipment/emerald_bracelet.yaml @@ -1,25 +1,26 @@ color: "22" craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - emerald - quantity: 1 - - byproducts: - - bracelet_mould - items: - - bracelet_mould - quantity: 1 - level: 30 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 65 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - emerald + quantity: 1 + - byproducts: + - bracelet_mould + items: + - bracelet_mould + quantity: 1 + level: 30 + station: + - furnace + type: crafting + wait: 4 + xp: 65 description: A bracelet set with an emerald. Can be enchanted. -equip_slot: hands +equipment: + slot: hands + type: armor name: emerald bracelet value: 400 diff --git a/data/items/equipment/emerald_necklace.yaml b/data/items/equipment/emerald_necklace.yaml index a0a8b95..99f1af2 100644 --- a/data/items/equipment/emerald_necklace.yaml +++ b/data/items/equipment/emerald_necklace.yaml @@ -1,25 +1,26 @@ color: "22" craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - emerald - quantity: 1 - - byproducts: - - necklace_mould - items: - - necklace_mould - quantity: 1 - level: 29 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 60 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - emerald + quantity: 1 + - byproducts: + - necklace_mould + items: + - necklace_mould + quantity: 1 + level: 29 + station: + - furnace + type: crafting + wait: 4 + xp: 60 description: A necklace set with an emerald. Can be enchanted. -equip_slot: neck +equipment: + slot: neck + type: armor name: emerald necklace value: 450 diff --git a/data/items/equipment/emerald_ring.yaml b/data/items/equipment/emerald_ring.yaml index c51f9ea..401ac71 100644 --- a/data/items/equipment/emerald_ring.yaml +++ b/data/items/equipment/emerald_ring.yaml @@ -1,25 +1,26 @@ color: "22" craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - emerald - quantity: 1 - - byproducts: - - ring_mould - items: - - ring_mould - quantity: 1 - level: 27 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 55 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - emerald + quantity: 1 + - byproducts: + - ring_mould + items: + - ring_mould + quantity: 1 + level: 27 + station: + - furnace + type: crafting + wait: 4 + xp: 55 description: A ring set with an emerald. Can be enchanted. -equip_slot: ring +equipment: + slot: ring + type: armor name: emerald ring value: 400 diff --git a/data/items/equipment/gold_amulet_u.yaml b/data/items/equipment/gold_amulet_u.yaml index 705042d..bc8041c 100644 --- a/data/items/equipment/gold_amulet_u.yaml +++ b/data/items/equipment/gold_amulet_u.yaml @@ -1,6 +1,6 @@ color: "DC" craft: - consume: + ingredients: - items: - gold_bar quantity: 1 @@ -10,7 +10,6 @@ craft: - amulet_mould quantity: 1 level: 8 - skill: crafting station: - furnace type: crafting diff --git a/data/items/equipment/gold_bracelet.yaml b/data/items/equipment/gold_bracelet.yaml index 874441a..56882c2 100644 --- a/data/items/equipment/gold_bracelet.yaml +++ b/data/items/equipment/gold_bracelet.yaml @@ -1,22 +1,23 @@ -color: "DC" +color: DC craft: - consume: - - items: - - gold_bar - quantity: 1 - - byproducts: - - bracelet_mould - items: - - bracelet_mould - quantity: 1 - level: 7 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 25 + ingredients: + - items: + - gold_bar + quantity: 1 + - byproducts: + - bracelet_mould + items: + - bracelet_mould + quantity: 1 + level: 7 + station: + - furnace + type: crafting + wait: 4 + xp: 25 description: A gold bracelet. -equip_slot: hands +equipment: + slot: hands + type: armor name: gold bracelet value: 65 diff --git a/data/items/equipment/gold_necklace.yaml b/data/items/equipment/gold_necklace.yaml index 2366bd8..dc8d439 100644 --- a/data/items/equipment/gold_necklace.yaml +++ b/data/items/equipment/gold_necklace.yaml @@ -1,22 +1,23 @@ -color: "DC" +color: DC craft: - consume: - - items: - - gold_bar - quantity: 1 - - byproducts: - - necklace_mould - items: - - necklace_mould - quantity: 1 - level: 6 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 20 + ingredients: + - items: + - gold_bar + quantity: 1 + - byproducts: + - necklace_mould + items: + - necklace_mould + quantity: 1 + level: 6 + station: + - furnace + type: crafting + wait: 4 + xp: 20 description: A gold necklace. -equip_slot: neck +equipment: + slot: neck + type: armor name: gold necklace value: 60 diff --git a/data/items/equipment/gold_ring.yaml b/data/items/equipment/gold_ring.yaml index 8b6dc9d..f9106ce 100644 --- a/data/items/equipment/gold_ring.yaml +++ b/data/items/equipment/gold_ring.yaml @@ -1,22 +1,23 @@ -color: "DC" +color: DC craft: - consume: - - items: - - gold_bar - quantity: 1 - - byproducts: - - ring_mould - items: - - ring_mould - quantity: 1 - level: 5 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 15 + ingredients: + - items: + - gold_bar + quantity: 1 + - byproducts: + - ring_mould + items: + - ring_mould + quantity: 1 + level: 5 + station: + - furnace + type: crafting + wait: 4 + xp: 15 description: A simple gold ring. -equip_slot: ring +equipment: + slot: ring + type: armor name: gold ring value: 50 diff --git a/data/items/equipment/graceful_boots.yaml b/data/items/equipment/graceful_boots.yaml index 52c0e9a..c300bc6 100644 --- a/data/items/equipment/graceful_boots.yaml +++ b/data/items/equipment/graceful_boots.yaml @@ -1,5 +1,7 @@ +color: E6 +description: Lightweight boots. Part of the graceful set. +equipment: + slot: feet + type: armor name: graceful boots -color: "E6" -description: "Lightweight boots. Part of the graceful set." value: 80 -equip_slot: feet diff --git a/data/items/equipment/graceful_cape.yaml b/data/items/equipment/graceful_cape.yaml index 88ebd9d..433be48 100644 --- a/data/items/equipment/graceful_cape.yaml +++ b/data/items/equipment/graceful_cape.yaml @@ -1,5 +1,7 @@ +color: E6 +description: A lightweight cape. Part of the graceful set. +equipment: + slot: back + type: armor name: graceful cape -color: "E6" -description: "A lightweight cape. Part of the graceful set." value: 100 -equip_slot: back diff --git a/data/items/equipment/graceful_gloves.yaml b/data/items/equipment/graceful_gloves.yaml index c55d41b..265b321 100644 --- a/data/items/equipment/graceful_gloves.yaml +++ b/data/items/equipment/graceful_gloves.yaml @@ -1,5 +1,7 @@ +color: E6 +description: Lightweight gloves. Part of the graceful set. +equipment: + slot: hands + type: armor name: graceful gloves -color: "E6" -description: "Lightweight gloves. Part of the graceful set." value: 80 -equip_slot: hands diff --git a/data/items/equipment/graceful_hat.yaml b/data/items/equipment/graceful_hat.yaml index 3c7a211..a0a524a 100644 --- a/data/items/equipment/graceful_hat.yaml +++ b/data/items/equipment/graceful_hat.yaml @@ -1,5 +1,7 @@ +color: E6 +description: A lightweight hat. Part of the graceful set. +equipment: + slot: head + type: armor name: graceful hat -color: "E6" -description: "A lightweight hat. Part of the graceful set." value: 100 -equip_slot: head diff --git a/data/items/equipment/graceful_legs.yaml b/data/items/equipment/graceful_legs.yaml index 5b7eb44..5142692 100644 --- a/data/items/equipment/graceful_legs.yaml +++ b/data/items/equipment/graceful_legs.yaml @@ -1,5 +1,7 @@ +color: E6 +description: Lightweight leg armour. Part of the graceful set. +equipment: + slot: legs + type: armor name: graceful legs -color: "E6" -description: "Lightweight leg armour. Part of the graceful set." value: 150 -equip_slot: legs diff --git a/data/items/equipment/graceful_torso.yaml b/data/items/equipment/graceful_torso.yaml index 656918a..502573e 100644 --- a/data/items/equipment/graceful_torso.yaml +++ b/data/items/equipment/graceful_torso.yaml @@ -1,5 +1,7 @@ +color: E6 +description: A lightweight top. Part of the graceful set. +equipment: + slot: torso + type: armor name: graceful torso -color: "E6" -description: "A lightweight top. Part of the graceful set." value: 150 -equip_slot: torso diff --git a/data/items/equipment/hard_leather_body.yaml b/data/items/equipment/hard_leather_body.yaml index 8951f1d..f621852 100644 --- a/data/items/equipment/hard_leather_body.yaml +++ b/data/items/equipment/hard_leather_body.yaml @@ -1,27 +1,28 @@ -color: "5E" +color: 5E craft: - consume: - - items: - - hard_leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 28 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 35 + ingredients: + - items: + - hard_leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 28 + tool: needle + type: crafting + wait: 4 + xp: 35 description: A hardened leather body armour. -equip_slot: torso +equipment: + defense: + crush: 8 + ranged: 14 + science: 6 + slash: 12 + stab: 8 + slot: torso + type: armor name: hard leather body requirements: - defense: 10 -stats: - crush_defense: 8 - ranged_defense: 14 - science_defense: 6 - slash_defense: 12 - stab_defense: 8 + defense: 10 value: 60 diff --git a/data/items/equipment/hard_leather_shield.yaml b/data/items/equipment/hard_leather_shield.yaml index 7ea33cb..5d4a0d8 100644 --- a/data/items/equipment/hard_leather_shield.yaml +++ b/data/items/equipment/hard_leather_shield.yaml @@ -1,27 +1,28 @@ -color: "5E" +color: 5E craft: - consume: - - items: - - hard_leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 41 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 40 + ingredients: + - items: + - hard_leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 41 + tool: needle + type: crafting + wait: 4 + xp: 40 description: A shield made of hardened leather. -equip_slot: off_hand +equipment: + defense: + crush: 5 + ranged: 8 + science: 4 + slash: 7 + stab: 5 + slot: off_hand + type: armor name: hard leather shield requirements: - defense: 10 -stats: - crush_defense: 5 - ranged_defense: 8 - science_defense: 4 - slash_defense: 7 - stab_defense: 5 + defense: 10 value: 55 diff --git a/data/items/equipment/inoculation_bracelet.yaml b/data/items/equipment/inoculation_bracelet.yaml index ce55652..2029a71 100644 --- a/data/items/equipment/inoculation_bracelet.yaml +++ b/data/items/equipment/inoculation_bracelet.yaml @@ -1,5 +1,7 @@ +color: C4 +description: An enchanted ruby bracelet that provides resistance to poison. +equipment: + slot: hands + type: armor name: inoculation bracelet -color: "C4" -description: "An enchanted ruby bracelet that provides resistance to poison." value: 2500 -equip_slot: hands diff --git a/data/items/equipment/insulated_gloves.yaml b/data/items/equipment/insulated_gloves.yaml index 3c50755..08740ce 100644 --- a/data/items/equipment/insulated_gloves.yaml +++ b/data/items/equipment/insulated_gloves.yaml @@ -1,8 +1,8 @@ +color: D6 +description: Heavy rubber gloves that protect against electrical attacks. Essential when fighting drones. +equipment: + slot: hands + type: armor name: insulated gloves -color: "D6" -description: "Heavy rubber gloves that protect against electrical attacks. Essential when fighting drones." -value: 50 stackable: false -equip_slot: hands -stats: - defense_bonus: 1 +value: 50 diff --git a/data/items/equipment/iron_dagger.yaml b/data/items/equipment/iron_dagger.yaml index 80c0382..024e4e1 100644 --- a/data/items/equipment/iron_dagger.yaml +++ b/data/items/equipment/iron_dagger.yaml @@ -1,26 +1,27 @@ -attack_type: stab -color: "FA" +color: FA craft: - consume: - - items: - - iron_bar - quantity: 1 - level: 20 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 25 + ingredients: + - items: + - iron_bar + quantity: 1 + level: 20 + station: + - anvil + type: smithing + wait: 4 + xp: 25 description: A small iron dagger. -equip_slot: main_hand +equipment: + attack: + crush: -1 + slash: 5 + stab: 8 + attack_type: stab + other: + strength: 7 + slot: main_hand + speed: 3 + type: melee_weapon name: iron dagger -speed: 3 stackable: false -stats: - crush_attack: -1 - slash_attack: 5 - stab_attack: 8 - strength_bonus: 7 value: 20 -weapon_type: melee diff --git a/data/items/equipment/iron_full_helm.yaml b/data/items/equipment/iron_full_helm.yaml index 5e9e500..d828b95 100644 --- a/data/items/equipment/iron_full_helm.yaml +++ b/data/items/equipment/iron_full_helm.yaml @@ -1,24 +1,25 @@ -color: "FA" +color: FA craft: - consume: - - items: - - iron_bar - quantity: 2 - level: 27 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 50 + ingredients: + - items: + - iron_bar + quantity: 2 + level: 27 + station: + - anvil + type: smithing + wait: 4 + xp: 50 description: An iron full helmet. -equip_slot: head +equipment: + defense: + crush: 6 + ranged: 8 + science: -3 + slash: 9 + stab: 8 + slot: head + type: armor name: iron full helm stackable: false -stats: - crush_defense: 6 - ranged_defense: 8 - science_defense: -3 - slash_defense: 9 - stab_defense: 8 value: 50 diff --git a/data/items/equipment/iron_med_helm.yaml b/data/items/equipment/iron_med_helm.yaml index 6fea4b8..250327d 100644 --- a/data/items/equipment/iron_med_helm.yaml +++ b/data/items/equipment/iron_med_helm.yaml @@ -1,24 +1,25 @@ -color: "FA" +color: FA craft: - consume: - - items: - - iron_bar - quantity: 1 - level: 22 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 25 + ingredients: + - items: + - iron_bar + quantity: 1 + level: 22 + station: + - anvil + type: smithing + wait: 4 + xp: 25 description: An iron medium helmet. -equip_slot: head +equipment: + defense: + crush: 3 + ranged: 5 + science: -1 + slash: 6 + stab: 5 + slot: head + type: armor name: iron med helm stackable: false -stats: - crush_defense: 3 - ranged_defense: 5 - science_defense: -1 - slash_defense: 6 - stab_defense: 5 value: 20 diff --git a/data/items/equipment/iron_platebody.yaml b/data/items/equipment/iron_platebody.yaml index e7bfa17..73c40f1 100644 --- a/data/items/equipment/iron_platebody.yaml +++ b/data/items/equipment/iron_platebody.yaml @@ -1,24 +1,25 @@ -color: "FA" +color: FA craft: - consume: - - items: - - iron_bar - quantity: 5 - level: 33 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 125 + ingredients: + - items: + - iron_bar + quantity: 5 + level: 33 + station: + - anvil + type: smithing + wait: 4 + xp: 125 description: An iron platebody. -equip_slot: torso +equipment: + defense: + crush: 14 + ranged: 18 + science: -10 + slash: 22 + stab: 18 + slot: torso + type: armor name: iron platebody stackable: false -stats: - crush_defense: 14 - ranged_defense: 18 - science_defense: -10 - slash_defense: 22 - stab_defense: 18 value: 150 diff --git a/data/items/equipment/iron_sword.yaml b/data/items/equipment/iron_sword.yaml index cdc6017..392fe53 100644 --- a/data/items/equipment/iron_sword.yaml +++ b/data/items/equipment/iron_sword.yaml @@ -1,26 +1,27 @@ -attack_type: slash -color: "FA" +color: FA craft: - consume: - - items: - - iron_bar - quantity: 1 - level: 24 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 25 + ingredients: + - items: + - iron_bar + quantity: 1 + level: 24 + station: + - anvil + type: smithing + wait: 4 + xp: 25 description: An iron sword. -equip_slot: main_hand +equipment: + attack: + crush: -2 + slash: 15 + stab: 7 + attack_type: slash + other: + strength: 10 + slot: main_hand + speed: 4 + type: melee_weapon name: iron sword -speed: 4 stackable: false -stats: - crush_attack: -2 - slash_attack: 15 - stab_attack: 7 - strength_bonus: 10 value: 30 -weapon_type: melee diff --git a/data/items/equipment/leather_body.yaml b/data/items/equipment/leather_body.yaml index e201f10..6611ce2 100644 --- a/data/items/equipment/leather_body.yaml +++ b/data/items/equipment/leather_body.yaml @@ -1,25 +1,26 @@ color: "82" craft: - consume: - - items: - - leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 14 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 25 + ingredients: + - items: + - leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 14 + tool: needle + type: crafting + wait: 4 + xp: 25 description: A leather body armour. -equip_slot: torso +equipment: + defense: + crush: 5 + ranged: 10 + science: 4 + slash: 7 + stab: 4 + slot: torso + type: armor name: leather body -stats: - crush_defense: 5 - ranged_defense: 10 - science_defense: 4 - slash_defense: 7 - stab_defense: 4 value: 25 diff --git a/data/items/equipment/leather_boots.yaml b/data/items/equipment/leather_boots.yaml index a917637..2d8d280 100644 --- a/data/items/equipment/leather_boots.yaml +++ b/data/items/equipment/leather_boots.yaml @@ -1,25 +1,26 @@ color: "82" craft: - consume: - - items: - - leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 7 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 16 + ingredients: + - items: + - leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 7 + tool: needle + type: crafting + wait: 4 + xp: 16 description: A pair of leather boots. -equip_slot: feet +equipment: + defense: + crush: 1 + ranged: 2 + science: 1 + slash: 1 + stab: 1 + slot: feet + type: armor name: leather boots -stats: - crush_defense: 1 - ranged_defense: 2 - science_defense: 1 - slash_defense: 1 - stab_defense: 1 value: 12 diff --git a/data/items/equipment/leather_chaps.yaml b/data/items/equipment/leather_chaps.yaml index 8917732..8246c8a 100644 --- a/data/items/equipment/leather_chaps.yaml +++ b/data/items/equipment/leather_chaps.yaml @@ -1,25 +1,26 @@ color: "82" craft: - consume: - - items: - - leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 18 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 27 + ingredients: + - items: + - leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 18 + tool: needle + type: crafting + wait: 4 + xp: 27 description: A pair of leather chaps. -equip_slot: legs +equipment: + defense: + crush: 3 + ranged: 6 + science: 3 + slash: 4 + stab: 2 + slot: legs + type: armor name: leather chaps -stats: - crush_defense: 3 - ranged_defense: 6 - science_defense: 3 - slash_defense: 4 - stab_defense: 2 value: 20 diff --git a/data/items/equipment/leather_cowl.yaml b/data/items/equipment/leather_cowl.yaml index b48ba23..c918ef0 100644 --- a/data/items/equipment/leather_cowl.yaml +++ b/data/items/equipment/leather_cowl.yaml @@ -1,25 +1,26 @@ color: "82" craft: - consume: - - items: - - leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 9 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 19 + ingredients: + - items: + - leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 9 + tool: needle + type: crafting + wait: 4 + xp: 19 description: A leather cowl. -equip_slot: head +equipment: + defense: + crush: 1 + ranged: 4 + science: 2 + slash: 2 + stab: 1 + slot: head + type: armor name: leather cowl -stats: - crush_defense: 1 - ranged_defense: 4 - science_defense: 2 - slash_defense: 2 - stab_defense: 1 value: 15 diff --git a/data/items/equipment/leather_gloves.yaml b/data/items/equipment/leather_gloves.yaml index 04efee9..65a0168 100644 --- a/data/items/equipment/leather_gloves.yaml +++ b/data/items/equipment/leather_gloves.yaml @@ -1,25 +1,26 @@ color: "82" craft: - consume: - - items: - - leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 1 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 14 + ingredients: + - items: + - leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 1 + tool: needle + type: crafting + wait: 4 + xp: 14 description: A pair of leather gloves. -equip_slot: hands +equipment: + defense: + crush: 1 + ranged: 2 + science: 1 + slash: 1 + stab: 1 + slot: hands + type: armor name: leather gloves -stats: - crush_defense: 1 - ranged_defense: 2 - science_defense: 1 - slash_defense: 1 - stab_defense: 1 value: 10 diff --git a/data/items/equipment/leather_vambraces.yaml b/data/items/equipment/leather_vambraces.yaml index 7b8022d..26b0dea 100644 --- a/data/items/equipment/leather_vambraces.yaml +++ b/data/items/equipment/leather_vambraces.yaml @@ -1,26 +1,28 @@ color: "82" craft: - consume: - - items: - - leather - quantity: 1 - - items: - - thread - quantity: 1 - level: 11 - skill: crafting - tool: needle - type: crafting - wait: 4 - xp: 22 + ingredients: + - items: + - leather + quantity: 1 + - items: + - thread + quantity: 1 + level: 11 + tool: needle + type: crafting + wait: 4 + xp: 22 description: A pair of leather vambraces. -equip_slot: hands +equipment: + attack: + ranged: 4 + defense: + crush: 2 + ranged: 4 + science: 2 + slash: 2 + stab: 2 + slot: hands + type: armor name: leather vambraces -stats: - crush_defense: 2 - ranged_attack: 4 - ranged_defense: 4 - science_defense: 2 - slash_defense: 2 - stab_defense: 2 value: 18 diff --git a/data/items/equipment/longbow.yaml b/data/items/equipment/longbow.yaml index 8c2aac5..5529c1c 100644 --- a/data/items/equipment/longbow.yaml +++ b/data/items/equipment/longbow.yaml @@ -1,23 +1,23 @@ -attack_type: ranged color: "89" craft: - consume: - - items: - - longbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 10 - skill: fletching - type: fletching - wait: 2 - xp: 10 + ingredients: + - items: + - longbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 10 + type: fletching + wait: 2 + xp: 10 description: A longbow. -equip_slot: main_hand +equipment: + attack: + ranged: 8 + attack_type: ranged + slot: main_hand + speed: 6 + type: ranged_weapon name: longbow -speed: 6 -stats: - ranged_attack: 8 value: 20 -weapon_type: ranged diff --git a/data/items/equipment/longbow_u.yaml b/data/items/equipment/longbow_u.yaml index b6f2c44..9597919 100644 --- a/data/items/equipment/longbow_u.yaml +++ b/data/items/equipment/longbow_u.yaml @@ -1,11 +1,10 @@ color: "89" craft: - consume: + ingredients: - items: - logs quantity: 1 level: 10 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/magic_longbow.yaml b/data/items/equipment/magic_longbow.yaml index becbf99..fd39e94 100644 --- a/data/items/equipment/magic_longbow.yaml +++ b/data/items/equipment/magic_longbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "3F" +color: 3F craft: - consume: - - items: - - magic_longbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 85 - skill: fletching - type: fletching - wait: 2 - xp: 91 + ingredients: + - items: + - magic_longbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 85 + type: fletching + wait: 2 + xp: 91 description: A magic longbow. -equip_slot: main_hand +equipment: + attack: + ranged: 69 + attack_type: ranged + slot: main_hand + speed: 6 + type: ranged_weapon name: magic longbow requirements: - ranged: 50 -speed: 6 -stats: - ranged_attack: 69 + ranged: 50 value: 6000 -weapon_type: ranged diff --git a/data/items/equipment/magic_longbow_u.yaml b/data/items/equipment/magic_longbow_u.yaml index ac81260..fae49b7 100644 --- a/data/items/equipment/magic_longbow_u.yaml +++ b/data/items/equipment/magic_longbow_u.yaml @@ -1,11 +1,10 @@ color: "3F" craft: - consume: + ingredients: - items: - magic_logs quantity: 1 level: 85 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/magic_shortbow.yaml b/data/items/equipment/magic_shortbow.yaml index 210dffe..424a504 100644 --- a/data/items/equipment/magic_shortbow.yaml +++ b/data/items/equipment/magic_shortbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "3F" +color: 3F craft: - consume: - - items: - - magic_shortbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 80 - skill: fletching - type: fletching - wait: 2 - xp: 83 + ingredients: + - items: + - magic_shortbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 80 + type: fletching + wait: 2 + xp: 83 description: A magic shortbow. -equip_slot: main_hand +equipment: + attack: + ranged: 69 + attack_type: ranged + slot: main_hand + speed: 4 + type: ranged_weapon name: magic shortbow requirements: - ranged: 50 -speed: 4 -stats: - ranged_attack: 69 + ranged: 50 value: 4000 -weapon_type: ranged diff --git a/data/items/equipment/magic_shortbow_u.yaml b/data/items/equipment/magic_shortbow_u.yaml index aa9e455..4ba09d6 100644 --- a/data/items/equipment/magic_shortbow_u.yaml +++ b/data/items/equipment/magic_shortbow_u.yaml @@ -1,11 +1,10 @@ color: "3F" craft: - consume: + ingredients: - items: - magic_logs quantity: 1 level: 80 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/maple_longbow.yaml b/data/items/equipment/maple_longbow.yaml index 66ee5a0..994a60e 100644 --- a/data/items/equipment/maple_longbow.yaml +++ b/data/items/equipment/maple_longbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "AC" +color: AC craft: - consume: - - items: - - maple_longbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 55 - skill: fletching - type: fletching - wait: 2 - xp: 58 + ingredients: + - items: + - maple_longbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 55 + type: fletching + wait: 2 + xp: 58 description: A maple longbow. -equip_slot: main_hand +equipment: + attack: + ranged: 29 + attack_type: ranged + slot: main_hand + speed: 6 + type: ranged_weapon name: maple longbow requirements: - ranged: 30 -speed: 6 -stats: - ranged_attack: 29 + ranged: 30 value: 1280 -weapon_type: ranged diff --git a/data/items/equipment/maple_longbow_u.yaml b/data/items/equipment/maple_longbow_u.yaml index b26bae6..85d558a 100644 --- a/data/items/equipment/maple_longbow_u.yaml +++ b/data/items/equipment/maple_longbow_u.yaml @@ -1,11 +1,10 @@ color: "AC" craft: - consume: + ingredients: - items: - maple_logs quantity: 1 level: 55 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/maple_shortbow.yaml b/data/items/equipment/maple_shortbow.yaml index 385cbd0..cd3a02c 100644 --- a/data/items/equipment/maple_shortbow.yaml +++ b/data/items/equipment/maple_shortbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "AC" +color: AC craft: - consume: - - items: - - maple_shortbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 50 - skill: fletching - type: fletching - wait: 2 - xp: 50 + ingredients: + - items: + - maple_shortbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 50 + type: fletching + wait: 2 + xp: 50 description: A maple shortbow. -equip_slot: main_hand +equipment: + attack: + ranged: 29 + attack_type: ranged + slot: main_hand + speed: 4 + type: ranged_weapon name: maple shortbow requirements: - ranged: 30 -speed: 4 -stats: - ranged_attack: 29 + ranged: 30 value: 640 -weapon_type: ranged diff --git a/data/items/equipment/maple_shortbow_u.yaml b/data/items/equipment/maple_shortbow_u.yaml index 5c58cbf..93e7d6c 100644 --- a/data/items/equipment/maple_shortbow_u.yaml +++ b/data/items/equipment/maple_shortbow_u.yaml @@ -1,11 +1,10 @@ color: "AC" craft: - consume: + ingredients: - items: - maple_logs quantity: 1 level: 50 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/mithril_dagger.yaml b/data/items/equipment/mithril_dagger.yaml index 3b258cf..0f717e7 100644 --- a/data/items/equipment/mithril_dagger.yaml +++ b/data/items/equipment/mithril_dagger.yaml @@ -1,28 +1,29 @@ -attack_type: stab -color: "4B" +color: 4B craft: - consume: - - items: - - mithril_bar - quantity: 1 - level: 50 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 50 + ingredients: + - items: + - mithril_bar + quantity: 1 + level: 50 + station: + - anvil + type: smithing + wait: 4 + xp: 50 description: A small mithril dagger. -equip_slot: main_hand +equipment: + attack: + crush: -1 + slash: 10 + stab: 17 + attack_type: stab + other: + strength: 14 + slot: main_hand + speed: 3 + type: melee_weapon name: mithril dagger requirements: - accuracy: 20 -speed: 3 + accuracy: 20 stackable: false -stats: - crush_attack: -1 - slash_attack: 10 - stab_attack: 17 - strength_bonus: 14 value: 150 -weapon_type: melee diff --git a/data/items/equipment/mithril_full_helm.yaml b/data/items/equipment/mithril_full_helm.yaml index 9b0787b..6d40856 100644 --- a/data/items/equipment/mithril_full_helm.yaml +++ b/data/items/equipment/mithril_full_helm.yaml @@ -1,26 +1,27 @@ -color: "4B" +color: 4B craft: - consume: - - items: - - mithril_bar - quantity: 2 - level: 57 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 100 + ingredients: + - items: + - mithril_bar + quantity: 2 + level: 57 + station: + - anvil + type: smithing + wait: 4 + xp: 100 description: A mithril full helmet. -equip_slot: head +equipment: + defense: + crush: 12 + ranged: 16 + science: -6 + slash: 18 + stab: 16 + slot: head + type: armor name: mithril full helm requirements: - defense: 20 + defense: 20 stackable: false -stats: - crush_defense: 12 - ranged_defense: 16 - science_defense: -6 - slash_defense: 18 - stab_defense: 16 value: 400 diff --git a/data/items/equipment/mithril_med_helm.yaml b/data/items/equipment/mithril_med_helm.yaml index 0c5c936..8bf7ac1 100644 --- a/data/items/equipment/mithril_med_helm.yaml +++ b/data/items/equipment/mithril_med_helm.yaml @@ -1,26 +1,27 @@ -color: "4B" +color: 4B craft: - consume: - - items: - - mithril_bar - quantity: 1 - level: 53 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 50 + ingredients: + - items: + - mithril_bar + quantity: 1 + level: 53 + station: + - anvil + type: smithing + wait: 4 + xp: 50 description: A mithril medium helmet. -equip_slot: head +equipment: + defense: + crush: 7 + ranged: 10 + science: -3 + slash: 12 + stab: 10 + slot: head + type: armor name: mithril med helm requirements: - defense: 20 + defense: 20 stackable: false -stats: - crush_defense: 7 - ranged_defense: 10 - science_defense: -3 - slash_defense: 12 - stab_defense: 10 value: 150 diff --git a/data/items/equipment/mithril_platebody.yaml b/data/items/equipment/mithril_platebody.yaml index 4683a50..04ca44e 100644 --- a/data/items/equipment/mithril_platebody.yaml +++ b/data/items/equipment/mithril_platebody.yaml @@ -1,26 +1,27 @@ -color: "4B" +color: 4B craft: - consume: - - items: - - mithril_bar - quantity: 5 - level: 68 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 250 + ingredients: + - items: + - mithril_bar + quantity: 5 + level: 68 + station: + - anvil + type: smithing + wait: 4 + xp: 250 description: A mithril platebody. -equip_slot: torso +equipment: + defense: + crush: 30 + ranged: 36 + science: -20 + slash: 42 + stab: 36 + slot: torso + type: armor name: mithril platebody requirements: - defense: 20 + defense: 20 stackable: false -stats: - crush_defense: 30 - ranged_defense: 36 - science_defense: -20 - slash_defense: 42 - stab_defense: 36 value: 1500 diff --git a/data/items/equipment/mithril_sword.yaml b/data/items/equipment/mithril_sword.yaml index aee233a..fa87e56 100644 --- a/data/items/equipment/mithril_sword.yaml +++ b/data/items/equipment/mithril_sword.yaml @@ -1,28 +1,29 @@ -attack_type: slash -color: "4B" +color: 4B craft: - consume: - - items: - - mithril_bar - quantity: 1 - level: 54 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 50 + ingredients: + - items: + - mithril_bar + quantity: 1 + level: 54 + station: + - anvil + type: smithing + wait: 4 + xp: 50 description: A mithril sword. -equip_slot: main_hand +equipment: + attack: + crush: -2 + slash: 30 + stab: 14 + attack_type: slash + other: + strength: 20 + slot: main_hand + speed: 4 + type: melee_weapon name: mithril sword requirements: - accuracy: 20 -speed: 4 + accuracy: 20 stackable: false -stats: - crush_attack: -2 - slash_attack: 30 - stab_attack: 14 - strength_bonus: 20 value: 250 -weapon_type: melee diff --git a/data/items/equipment/necklace_of_passage.yaml b/data/items/equipment/necklace_of_passage.yaml index 6fefd6b..b6ebe71 100644 --- a/data/items/equipment/necklace_of_passage.yaml +++ b/data/items/equipment/necklace_of_passage.yaml @@ -1,5 +1,7 @@ -name: necklace of passage color: "27" -description: "An enchanted sapphire necklace that can teleport the wearer to various locations." +description: An enchanted sapphire necklace that can teleport the wearer to various locations. +equipment: + slot: neck + type: armor +name: necklace of passage value: 750 -equip_slot: neck diff --git a/data/items/equipment/neural_headband.yaml b/data/items/equipment/neural_headband.yaml index aede26e..14a1a34 100644 --- a/data/items/equipment/neural_headband.yaml +++ b/data/items/equipment/neural_headband.yaml @@ -1,10 +1,13 @@ -name: Neural Headband -description: "A thin band of circuitry that amplifies neural signals, reducing battery drain." color: "27" +description: A thin band of circuitry that amplifies neural signals, reducing battery drain. +equipment: + defense: + crush: 1 + slash: 1 + stab: 1 + other: + technology: 4 + slot: head + type: armor +name: Neural Headband value: 500 -equip_slot: head -stats: - stab_defense: 1 - slash_defense: 1 - crush_defense: 1 - technology_bonus: 4 diff --git a/data/items/equipment/oak_longbow.yaml b/data/items/equipment/oak_longbow.yaml index bf2c259..45ef2fc 100644 --- a/data/items/equipment/oak_longbow.yaml +++ b/data/items/equipment/oak_longbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged color: "88" craft: - consume: - - items: - - oak_longbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 25 - skill: fletching - type: fletching - wait: 2 - xp: 25 + ingredients: + - items: + - oak_longbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 25 + type: fletching + wait: 2 + xp: 25 description: An oak longbow. -equip_slot: main_hand +equipment: + attack: + ranged: 14 + attack_type: ranged + slot: main_hand + speed: 6 + type: ranged_weapon name: oak longbow requirements: - ranged: 5 -speed: 6 -stats: - ranged_attack: 14 + ranged: 5 value: 80 -weapon_type: ranged diff --git a/data/items/equipment/oak_longbow_u.yaml b/data/items/equipment/oak_longbow_u.yaml index 89e7aa7..9d3cf68 100644 --- a/data/items/equipment/oak_longbow_u.yaml +++ b/data/items/equipment/oak_longbow_u.yaml @@ -1,11 +1,10 @@ color: "88" craft: - consume: + ingredients: - items: - oak_logs quantity: 1 level: 25 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/oak_shortbow.yaml b/data/items/equipment/oak_shortbow.yaml index 879dead..767bb43 100644 --- a/data/items/equipment/oak_shortbow.yaml +++ b/data/items/equipment/oak_shortbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged color: "88" craft: - consume: - - items: - - oak_shortbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 20 - skill: fletching - type: fletching - wait: 2 - xp: 16 + ingredients: + - items: + - oak_shortbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 20 + type: fletching + wait: 2 + xp: 16 description: An oak shortbow. -equip_slot: main_hand +equipment: + attack: + ranged: 14 + attack_type: ranged + slot: main_hand + speed: 4 + type: ranged_weapon name: oak shortbow requirements: - ranged: 5 -speed: 4 -stats: - ranged_attack: 14 + ranged: 5 value: 40 -weapon_type: ranged diff --git a/data/items/equipment/oak_shortbow_u.yaml b/data/items/equipment/oak_shortbow_u.yaml index 553b9bd..0b567c2 100644 --- a/data/items/equipment/oak_shortbow_u.yaml +++ b/data/items/equipment/oak_shortbow_u.yaml @@ -1,11 +1,10 @@ color: "88" craft: - consume: + ingredients: - items: - oak_logs quantity: 1 level: 20 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/party_hat_blue.yaml b/data/items/equipment/party_hat_blue.yaml index 87fe732..0d2f33e 100644 --- a/data/items/equipment/party_hat_blue.yaml +++ b/data/items/equipment/party_hat_blue.yaml @@ -1,6 +1,8 @@ -name: blue party hat color: "45" -description: "A festive blue party hat." -value: 2 -equip_slot: head +description: A festive blue party hat. +equipment: + slot: head + type: armor +name: blue party hat stackable: false +value: 2 diff --git a/data/items/equipment/party_hat_green.yaml b/data/items/equipment/party_hat_green.yaml index 39efc53..e8b6349 100644 --- a/data/items/equipment/party_hat_green.yaml +++ b/data/items/equipment/party_hat_green.yaml @@ -1,6 +1,8 @@ -name: green party hat color: "53" -description: "A festive green party hat." -value: 2 -equip_slot: head +description: A festive green party hat. +equipment: + slot: head + type: armor +name: green party hat stackable: false +value: 2 diff --git a/data/items/equipment/party_hat_pink.yaml b/data/items/equipment/party_hat_pink.yaml index 37473d5..da52fb7 100644 --- a/data/items/equipment/party_hat_pink.yaml +++ b/data/items/equipment/party_hat_pink.yaml @@ -1,6 +1,8 @@ +color: D5 +description: A festive pink party hat. +equipment: + slot: head + type: armor name: pink party hat -color: "D5" -description: "A festive pink party hat." -value: 2 -equip_slot: head stackable: false +value: 2 diff --git a/data/items/equipment/party_hat_red.yaml b/data/items/equipment/party_hat_red.yaml index a26b690..322c008 100644 --- a/data/items/equipment/party_hat_red.yaml +++ b/data/items/equipment/party_hat_red.yaml @@ -1,6 +1,8 @@ +color: C4 +description: A festive red party hat. +equipment: + slot: head + type: armor name: red party hat -color: "C4" -description: "A festive red party hat." -value: 2 -equip_slot: head stackable: false +value: 2 diff --git a/data/items/equipment/party_hat_white.yaml b/data/items/equipment/party_hat_white.yaml index f1e748c..138a1ab 100644 --- a/data/items/equipment/party_hat_white.yaml +++ b/data/items/equipment/party_hat_white.yaml @@ -1,6 +1,8 @@ +color: FF +description: A festive white party hat. +equipment: + slot: head + type: armor name: white party hat -color: "FF" -description: "A festive white party hat." -value: 2 -equip_slot: head stackable: false +value: 2 diff --git a/data/items/equipment/party_hat_yellow.yaml b/data/items/equipment/party_hat_yellow.yaml index eda601b..3ec9303 100644 --- a/data/items/equipment/party_hat_yellow.yaml +++ b/data/items/equipment/party_hat_yellow.yaml @@ -1,6 +1,8 @@ +color: E2 +description: A festive yellow party hat. +equipment: + slot: head + type: armor name: yellow party hat -color: "E2" -description: "A festive yellow party hat." -value: 2 -equip_slot: head stackable: false +value: 2 diff --git a/data/items/equipment/phoenix_necklace.yaml b/data/items/equipment/phoenix_necklace.yaml index 8db7ed8..c163b1f 100644 --- a/data/items/equipment/phoenix_necklace.yaml +++ b/data/items/equipment/phoenix_necklace.yaml @@ -1,5 +1,7 @@ +color: FF +description: An enchanted diamond necklace that restores HP when you drop below 20 percent health. +equipment: + slot: neck + type: armor name: phoenix necklace -color: "FF" -description: "An enchanted diamond necklace that restores HP when you drop below 20 percent health." value: 5500 -equip_slot: neck diff --git a/data/items/equipment/power_amulet.yaml b/data/items/equipment/power_amulet.yaml index 6039d03..c32063c 100644 --- a/data/items/equipment/power_amulet.yaml +++ b/data/items/equipment/power_amulet.yaml @@ -1,7 +1,9 @@ +color: DC +description: A pendant containing a miniature power cell that augments tech efficiency. +equipment: + other: + technology: 3 + slot: neck + type: armor name: Power Amulet -description: "A pendant containing a miniature power cell that augments tech efficiency." -color: "DC" value: 800 -equip_slot: neck -stats: - technology_bonus: 3 diff --git a/data/items/equipment/ring_of_dueling.yaml b/data/items/equipment/ring_of_dueling.yaml index 7b2f5a1..206d088 100644 --- a/data/items/equipment/ring_of_dueling.yaml +++ b/data/items/equipment/ring_of_dueling.yaml @@ -1,5 +1,7 @@ -name: ring of dueling color: "22" -description: "An enchanted emerald ring used for teleporting to dueling arenas." +description: An enchanted emerald ring used for teleporting to dueling arenas. +equipment: + slot: ring + type: armor +name: ring of dueling value: 1000 -equip_slot: ring diff --git a/data/items/equipment/ring_of_forging.yaml b/data/items/equipment/ring_of_forging.yaml index 0b76249..41770db 100644 --- a/data/items/equipment/ring_of_forging.yaml +++ b/data/items/equipment/ring_of_forging.yaml @@ -1,5 +1,7 @@ +color: C4 +description: An enchanted ruby ring that prevents ore from failing to smelt. +equipment: + slot: ring + type: armor name: ring of forging -color: "C4" -description: "An enchanted ruby ring that prevents ore from failing to smelt." value: 2000 -equip_slot: ring diff --git a/data/items/equipment/ring_of_life.yaml b/data/items/equipment/ring_of_life.yaml index fa831e4..5304578 100644 --- a/data/items/equipment/ring_of_life.yaml +++ b/data/items/equipment/ring_of_life.yaml @@ -1,5 +1,7 @@ +color: FF +description: An enchanted diamond ring that teleports you to safety when your HP drops critically low. +equipment: + slot: ring + type: armor name: ring of life -color: "FF" -description: "An enchanted diamond ring that teleports you to safety when your HP drops critically low." value: 5000 -equip_slot: ring diff --git a/data/items/equipment/ring_of_recoil.yaml b/data/items/equipment/ring_of_recoil.yaml index 337d4cd..b7d08ec 100644 --- a/data/items/equipment/ring_of_recoil.yaml +++ b/data/items/equipment/ring_of_recoil.yaml @@ -1,5 +1,7 @@ -name: ring of recoil color: "27" -description: "An enchanted sapphire ring that reflects a portion of melee damage back to the attacker." +description: An enchanted sapphire ring that reflects a portion of melee damage back to the attacker. +equipment: + slot: ring + type: armor +name: ring of recoil value: 500 -equip_slot: ring diff --git a/data/items/equipment/ruby_amulet_u.yaml b/data/items/equipment/ruby_amulet_u.yaml index 79cb716..261d2e9 100644 --- a/data/items/equipment/ruby_amulet_u.yaml +++ b/data/items/equipment/ruby_amulet_u.yaml @@ -1,6 +1,6 @@ color: "C4" craft: - consume: + ingredients: - items: - gold_bar quantity: 1 @@ -13,7 +13,6 @@ craft: - amulet_mould quantity: 1 level: 50 - skill: crafting station: - furnace type: crafting diff --git a/data/items/equipment/ruby_bracelet.yaml b/data/items/equipment/ruby_bracelet.yaml index 5964aa6..cc7a99a 100644 --- a/data/items/equipment/ruby_bracelet.yaml +++ b/data/items/equipment/ruby_bracelet.yaml @@ -1,25 +1,26 @@ -color: "C4" +color: C4 craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - ruby - quantity: 1 - - byproducts: - - bracelet_mould - items: - - bracelet_mould - quantity: 1 - level: 42 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 80 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - ruby + quantity: 1 + - byproducts: + - bracelet_mould + items: + - bracelet_mould + quantity: 1 + level: 42 + station: + - furnace + type: crafting + wait: 4 + xp: 80 description: A bracelet set with a ruby. Can be enchanted. -equip_slot: hands +equipment: + slot: hands + type: armor name: ruby bracelet value: 800 diff --git a/data/items/equipment/ruby_necklace.yaml b/data/items/equipment/ruby_necklace.yaml index ec7250e..b4e6cfb 100644 --- a/data/items/equipment/ruby_necklace.yaml +++ b/data/items/equipment/ruby_necklace.yaml @@ -1,25 +1,26 @@ -color: "C4" +color: C4 craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - ruby - quantity: 1 - - byproducts: - - necklace_mould - items: - - necklace_mould - quantity: 1 - level: 40 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 75 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - ruby + quantity: 1 + - byproducts: + - necklace_mould + items: + - necklace_mould + quantity: 1 + level: 40 + station: + - furnace + type: crafting + wait: 4 + xp: 75 description: A necklace set with a ruby. Can be enchanted. -equip_slot: neck +equipment: + slot: neck + type: armor name: ruby necklace value: 850 diff --git a/data/items/equipment/ruby_ring.yaml b/data/items/equipment/ruby_ring.yaml index a7159c8..812a969 100644 --- a/data/items/equipment/ruby_ring.yaml +++ b/data/items/equipment/ruby_ring.yaml @@ -1,25 +1,26 @@ -color: "C4" +color: C4 craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - ruby - quantity: 1 - - byproducts: - - ring_mould - items: - - ring_mould - quantity: 1 - level: 63 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 70 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - ruby + quantity: 1 + - byproducts: + - ring_mould + items: + - ring_mould + quantity: 1 + level: 63 + station: + - furnace + type: crafting + wait: 4 + xp: 70 description: A ring set with a ruby. Can be enchanted. -equip_slot: ring +equipment: + slot: ring + type: armor name: ruby ring value: 800 diff --git a/data/items/equipment/rune_dagger.yaml b/data/items/equipment/rune_dagger.yaml index d96e2d2..005fdc2 100644 --- a/data/items/equipment/rune_dagger.yaml +++ b/data/items/equipment/rune_dagger.yaml @@ -1,28 +1,29 @@ -attack_type: stab color: "57" craft: - consume: - - items: - - runite_bar - quantity: 1 - level: 85 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 75 + ingredients: + - items: + - runite_bar + quantity: 1 + level: 85 + station: + - anvil + type: smithing + wait: 4 + xp: 75 description: A small rune dagger. -equip_slot: main_hand +equipment: + attack: + crush: -1 + slash: 18 + stab: 30 + attack_type: stab + other: + strength: 24 + slot: main_hand + speed: 3 + type: melee_weapon name: rune dagger requirements: - accuracy: 40 -speed: 3 + accuracy: 40 stackable: false -stats: - crush_attack: -1 - slash_attack: 18 - stab_attack: 30 - strength_bonus: 24 value: 5000 -weapon_type: melee diff --git a/data/items/equipment/rune_full_helm.yaml b/data/items/equipment/rune_full_helm.yaml index e25f22e..92fe0d5 100644 --- a/data/items/equipment/rune_full_helm.yaml +++ b/data/items/equipment/rune_full_helm.yaml @@ -1,26 +1,27 @@ color: "57" craft: - consume: - - items: - - runite_bar - quantity: 2 - level: 92 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 150 + ingredients: + - items: + - runite_bar + quantity: 2 + level: 92 + station: + - anvil + type: smithing + wait: 4 + xp: 150 description: A rune full helmet. -equip_slot: head +equipment: + defense: + crush: 22 + ranged: 30 + science: -11 + slash: 33 + stab: 30 + slot: head + type: armor name: rune full helm requirements: - defense: 40 + defense: 40 stackable: false -stats: - crush_defense: 22 - ranged_defense: 30 - science_defense: -11 - slash_defense: 33 - stab_defense: 30 value: 12000 diff --git a/data/items/equipment/rune_med_helm.yaml b/data/items/equipment/rune_med_helm.yaml index 0823947..24a8992 100644 --- a/data/items/equipment/rune_med_helm.yaml +++ b/data/items/equipment/rune_med_helm.yaml @@ -1,26 +1,27 @@ color: "57" craft: - consume: - - items: - - runite_bar - quantity: 1 - level: 88 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 75 + ingredients: + - items: + - runite_bar + quantity: 1 + level: 88 + station: + - anvil + type: smithing + wait: 4 + xp: 75 description: A rune medium helmet. -equip_slot: head +equipment: + defense: + crush: 13 + ranged: 19 + science: -4 + slash: 22 + stab: 19 + slot: head + type: armor name: rune med helm requirements: - defense: 40 + defense: 40 stackable: false -stats: - crush_defense: 13 - ranged_defense: 19 - science_defense: -4 - slash_defense: 22 - stab_defense: 19 value: 5000 diff --git a/data/items/equipment/rune_platebody.yaml b/data/items/equipment/rune_platebody.yaml index 7702976..c5686d1 100644 --- a/data/items/equipment/rune_platebody.yaml +++ b/data/items/equipment/rune_platebody.yaml @@ -1,26 +1,27 @@ color: "57" craft: - consume: - - items: - - runite_bar - quantity: 5 - level: 99 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 375 + ingredients: + - items: + - runite_bar + quantity: 5 + level: 99 + station: + - anvil + type: smithing + wait: 4 + xp: 375 description: A rune platebody. -equip_slot: torso +equipment: + defense: + crush: 52 + ranged: 65 + science: -30 + slash: 72 + stab: 65 + slot: torso + type: armor name: rune platebody requirements: - defense: 40 + defense: 40 stackable: false -stats: - crush_defense: 52 - ranged_defense: 65 - science_defense: -30 - slash_defense: 72 - stab_defense: 65 value: 40000 diff --git a/data/items/equipment/rune_sword.yaml b/data/items/equipment/rune_sword.yaml index f1c9f14..d0adcdb 100644 --- a/data/items/equipment/rune_sword.yaml +++ b/data/items/equipment/rune_sword.yaml @@ -1,28 +1,29 @@ -attack_type: slash color: "57" craft: - consume: - - items: - - runite_bar - quantity: 1 - level: 89 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 75 + ingredients: + - items: + - runite_bar + quantity: 1 + level: 89 + station: + - anvil + type: smithing + wait: 4 + xp: 75 description: A rune sword. -equip_slot: main_hand +equipment: + attack: + crush: -2 + slash: 52 + stab: 27 + attack_type: slash + other: + strength: 36 + slot: main_hand + speed: 4 + type: melee_weapon name: rune sword requirements: - accuracy: 40 -speed: 4 + accuracy: 40 stackable: false -stats: - crush_attack: -2 - slash_attack: 52 - stab_attack: 27 - strength_bonus: 36 value: 10000 -weapon_type: melee diff --git a/data/items/equipment/sapphire_amulet_u.yaml b/data/items/equipment/sapphire_amulet_u.yaml index 20d7581..241d463 100644 --- a/data/items/equipment/sapphire_amulet_u.yaml +++ b/data/items/equipment/sapphire_amulet_u.yaml @@ -1,6 +1,6 @@ color: "45" craft: - consume: + ingredients: - items: - gold_bar quantity: 1 @@ -13,7 +13,6 @@ craft: - amulet_mould quantity: 1 level: 24 - skill: crafting station: - furnace type: crafting diff --git a/data/items/equipment/sapphire_bracelet.yaml b/data/items/equipment/sapphire_bracelet.yaml index e128639..f5cf3fb 100644 --- a/data/items/equipment/sapphire_bracelet.yaml +++ b/data/items/equipment/sapphire_bracelet.yaml @@ -1,25 +1,26 @@ color: "27" craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - sapphire - quantity: 1 - - byproducts: - - bracelet_mould - items: - - bracelet_mould - quantity: 1 - level: 23 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 60 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - sapphire + quantity: 1 + - byproducts: + - bracelet_mould + items: + - bracelet_mould + quantity: 1 + level: 23 + station: + - furnace + type: crafting + wait: 4 + xp: 60 description: A bracelet set with a sapphire. Can be enchanted. -equip_slot: hands +equipment: + slot: hands + type: armor name: sapphire bracelet value: 200 diff --git a/data/items/equipment/sapphire_necklace.yaml b/data/items/equipment/sapphire_necklace.yaml index 5d59df6..cd93467 100644 --- a/data/items/equipment/sapphire_necklace.yaml +++ b/data/items/equipment/sapphire_necklace.yaml @@ -1,25 +1,26 @@ color: "27" craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - sapphire - quantity: 1 - - byproducts: - - necklace_mould - items: - - necklace_mould - quantity: 1 - level: 22 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 55 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - sapphire + quantity: 1 + - byproducts: + - necklace_mould + items: + - necklace_mould + quantity: 1 + level: 22 + station: + - furnace + type: crafting + wait: 4 + xp: 55 description: A necklace set with a sapphire. Can be enchanted. -equip_slot: neck +equipment: + slot: neck + type: armor name: sapphire necklace value: 250 diff --git a/data/items/equipment/sapphire_ring.yaml b/data/items/equipment/sapphire_ring.yaml index aca01dc..da1cd43 100644 --- a/data/items/equipment/sapphire_ring.yaml +++ b/data/items/equipment/sapphire_ring.yaml @@ -1,25 +1,26 @@ color: "27" craft: - consume: - - items: - - gold_bar - quantity: 1 - - items: - - sapphire - quantity: 1 - - byproducts: - - ring_mould - items: - - ring_mould - quantity: 1 - level: 20 - skill: crafting - station: - - furnace - type: crafting - wait: 4 - xp: 40 + ingredients: + - items: + - gold_bar + quantity: 1 + - items: + - sapphire + quantity: 1 + - byproducts: + - ring_mould + items: + - ring_mould + quantity: 1 + level: 20 + station: + - furnace + type: crafting + wait: 4 + xp: 40 description: A ring set with a sapphire. Can be enchanted. -equip_slot: ring +equipment: + slot: ring + type: armor name: sapphire ring value: 200 diff --git a/data/items/equipment/shortbow.yaml b/data/items/equipment/shortbow.yaml index cec7661..cd79769 100644 --- a/data/items/equipment/shortbow.yaml +++ b/data/items/equipment/shortbow.yaml @@ -1,23 +1,23 @@ -attack_type: ranged color: "89" craft: - consume: - - items: - - shortbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 5 - skill: fletching - type: fletching - wait: 2 - xp: 5 + ingredients: + - items: + - shortbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 5 + type: fletching + wait: 2 + xp: 5 description: A shortbow. -equip_slot: main_hand +equipment: + attack: + ranged: 8 + attack_type: ranged + slot: main_hand + speed: 4 + type: ranged_weapon name: shortbow -speed: 4 -stats: - ranged_attack: 8 value: 10 -weapon_type: ranged diff --git a/data/items/equipment/shortbow_u.yaml b/data/items/equipment/shortbow_u.yaml index 07d5fb9..9715273 100644 --- a/data/items/equipment/shortbow_u.yaml +++ b/data/items/equipment/shortbow_u.yaml @@ -1,11 +1,10 @@ color: "89" craft: - consume: + ingredients: - items: - logs quantity: 1 level: 5 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/spectral_visor.yaml b/data/items/equipment/spectral_visor.yaml index e69a785..79bd829 100644 --- a/data/items/equipment/spectral_visor.yaml +++ b/data/items/equipment/spectral_visor.yaml @@ -1,8 +1,8 @@ +color: 8D +description: A visor fitted with spectral frequency filters. Dampens psychic attacks from phantoms. +equipment: + slot: head + type: armor name: spectral visor -color: "8D" -description: "A visor fitted with spectral frequency filters. Dampens psychic attacks from phantoms." -value: 75 stackable: false -equip_slot: head -stats: - defense_bonus: 2 +value: 75 diff --git a/data/items/equipment/steel_dagger.yaml b/data/items/equipment/steel_dagger.yaml index 66265e2..4a1cbc5 100644 --- a/data/items/equipment/steel_dagger.yaml +++ b/data/items/equipment/steel_dagger.yaml @@ -1,28 +1,29 @@ -attack_type: stab -color: "FD" +color: FD craft: - consume: - - items: - - steel_bar - quantity: 1 - level: 30 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 37 + ingredients: + - items: + - steel_bar + quantity: 1 + level: 30 + station: + - anvil + type: smithing + wait: 4 + xp: 37 description: A small steel dagger. -equip_slot: main_hand +equipment: + attack: + crush: -1 + slash: 7 + stab: 12 + attack_type: stab + other: + strength: 10 + slot: main_hand + speed: 3 + type: melee_weapon name: steel dagger requirements: - accuracy: 5 -speed: 3 + accuracy: 5 stackable: false -stats: - crush_attack: -1 - slash_attack: 7 - stab_attack: 12 - strength_bonus: 10 value: 60 -weapon_type: melee diff --git a/data/items/equipment/steel_full_helm.yaml b/data/items/equipment/steel_full_helm.yaml index 01c1e39..da282fa 100644 --- a/data/items/equipment/steel_full_helm.yaml +++ b/data/items/equipment/steel_full_helm.yaml @@ -1,26 +1,27 @@ -color: "FD" +color: FD craft: - consume: - - items: - - steel_bar - quantity: 2 - level: 37 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 75 + ingredients: + - items: + - steel_bar + quantity: 2 + level: 37 + station: + - anvil + type: smithing + wait: 4 + xp: 75 description: A steel full helmet. -equip_slot: head +equipment: + defense: + crush: 9 + ranged: 12 + science: -5 + slash: 13 + stab: 12 + slot: head + type: armor name: steel full helm requirements: - defense: 5 + defense: 5 stackable: false -stats: - crush_defense: 9 - ranged_defense: 12 - science_defense: -5 - slash_defense: 13 - stab_defense: 12 value: 150 diff --git a/data/items/equipment/steel_med_helm.yaml b/data/items/equipment/steel_med_helm.yaml index 0c4b666..99186d0 100644 --- a/data/items/equipment/steel_med_helm.yaml +++ b/data/items/equipment/steel_med_helm.yaml @@ -1,26 +1,27 @@ -color: "FD" +color: FD craft: - consume: - - items: - - steel_bar - quantity: 1 - level: 33 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 37 + ingredients: + - items: + - steel_bar + quantity: 1 + level: 33 + station: + - anvil + type: smithing + wait: 4 + xp: 37 description: A steel medium helmet. -equip_slot: head +equipment: + defense: + crush: 5 + ranged: 7 + science: -2 + slash: 9 + stab: 7 + slot: head + type: armor name: steel med helm requirements: - defense: 5 + defense: 5 stackable: false -stats: - crush_defense: 5 - ranged_defense: 7 - science_defense: -2 - slash_defense: 9 - stab_defense: 7 value: 60 diff --git a/data/items/equipment/steel_platebody.yaml b/data/items/equipment/steel_platebody.yaml index 6c6dfd2..cb80601 100644 --- a/data/items/equipment/steel_platebody.yaml +++ b/data/items/equipment/steel_platebody.yaml @@ -1,26 +1,27 @@ -color: "FD" +color: FD craft: - consume: - - items: - - steel_bar - quantity: 5 - level: 48 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 187 + ingredients: + - items: + - steel_bar + quantity: 5 + level: 48 + station: + - anvil + type: smithing + wait: 4 + xp: 187 description: A steel platebody. -equip_slot: torso +equipment: + defense: + crush: 22 + ranged: 27 + science: -15 + slash: 32 + stab: 27 + slot: torso + type: armor name: steel platebody requirements: - defense: 5 + defense: 5 stackable: false -stats: - crush_defense: 22 - ranged_defense: 27 - science_defense: -15 - slash_defense: 32 - stab_defense: 27 value: 500 diff --git a/data/items/equipment/steel_sword.yaml b/data/items/equipment/steel_sword.yaml index 01ceb5c..b590210 100644 --- a/data/items/equipment/steel_sword.yaml +++ b/data/items/equipment/steel_sword.yaml @@ -1,28 +1,29 @@ -attack_type: slash -color: "FD" +color: FD craft: - consume: - - items: - - steel_bar - quantity: 1 - level: 34 - skill: smithing - station: - - anvil - type: smithing - wait: 4 - xp: 37 + ingredients: + - items: + - steel_bar + quantity: 1 + level: 34 + station: + - anvil + type: smithing + wait: 4 + xp: 37 description: A steel sword. -equip_slot: main_hand +equipment: + attack: + crush: -2 + slash: 22 + stab: 10 + attack_type: slash + other: + strength: 14 + slot: main_hand + speed: 4 + type: melee_weapon name: steel sword requirements: - accuracy: 5 -speed: 4 + accuracy: 5 stackable: false -stats: - crush_attack: -2 - slash_attack: 22 - stab_attack: 10 - strength_bonus: 14 value: 100 -weapon_type: melee diff --git a/data/items/equipment/willow_longbow.yaml b/data/items/equipment/willow_longbow.yaml index 90f8ba6..f177552 100644 --- a/data/items/equipment/willow_longbow.yaml +++ b/data/items/equipment/willow_longbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "6B" +color: 6B craft: - consume: - - items: - - willow_longbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 40 - skill: fletching - type: fletching - wait: 2 - xp: 41 + ingredients: + - items: + - willow_longbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 40 + type: fletching + wait: 2 + xp: 41 description: A willow longbow. -equip_slot: main_hand +equipment: + attack: + ranged: 20 + attack_type: ranged + slot: main_hand + speed: 6 + type: ranged_weapon name: willow longbow requirements: - ranged: 20 -speed: 6 -stats: - ranged_attack: 20 + ranged: 20 value: 320 -weapon_type: ranged diff --git a/data/items/equipment/willow_longbow_u.yaml b/data/items/equipment/willow_longbow_u.yaml index 9d4db3d..25194d1 100644 --- a/data/items/equipment/willow_longbow_u.yaml +++ b/data/items/equipment/willow_longbow_u.yaml @@ -1,11 +1,10 @@ color: "6B" craft: - consume: + ingredients: - items: - willow_logs quantity: 1 level: 40 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/willow_shortbow.yaml b/data/items/equipment/willow_shortbow.yaml index a663353..f7028e4 100644 --- a/data/items/equipment/willow_shortbow.yaml +++ b/data/items/equipment/willow_shortbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "6B" +color: 6B craft: - consume: - - items: - - willow_shortbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 35 - skill: fletching - type: fletching - wait: 2 - xp: 33 + ingredients: + - items: + - willow_shortbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 35 + type: fletching + wait: 2 + xp: 33 description: A willow shortbow. -equip_slot: main_hand +equipment: + attack: + ranged: 20 + attack_type: ranged + slot: main_hand + speed: 4 + type: ranged_weapon name: willow shortbow requirements: - ranged: 20 -speed: 4 -stats: - ranged_attack: 20 + ranged: 20 value: 160 -weapon_type: ranged diff --git a/data/items/equipment/willow_shortbow_u.yaml b/data/items/equipment/willow_shortbow_u.yaml index e737292..534c50d 100644 --- a/data/items/equipment/willow_shortbow_u.yaml +++ b/data/items/equipment/willow_shortbow_u.yaml @@ -1,11 +1,10 @@ color: "6B" craft: - consume: + ingredients: - items: - willow_logs quantity: 1 level: 35 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/yew_longbow.yaml b/data/items/equipment/yew_longbow.yaml index ee365d3..1deab6d 100644 --- a/data/items/equipment/yew_longbow.yaml +++ b/data/items/equipment/yew_longbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "5E" +color: 5E craft: - consume: - - items: - - yew_longbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 65 - skill: fletching - type: fletching - wait: 2 - xp: 75 + ingredients: + - items: + - yew_longbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 65 + type: fletching + wait: 2 + xp: 75 description: A yew longbow. -equip_slot: main_hand +equipment: + attack: + ranged: 47 + attack_type: ranged + slot: main_hand + speed: 6 + type: ranged_weapon name: yew longbow requirements: - ranged: 40 -speed: 6 -stats: - ranged_attack: 47 + ranged: 40 value: 2000 -weapon_type: ranged diff --git a/data/items/equipment/yew_longbow_u.yaml b/data/items/equipment/yew_longbow_u.yaml index ff15392..61eeac4 100644 --- a/data/items/equipment/yew_longbow_u.yaml +++ b/data/items/equipment/yew_longbow_u.yaml @@ -1,11 +1,10 @@ color: "5E" craft: - consume: + ingredients: - items: - yew_logs quantity: 1 level: 65 - skill: fletching tool: knife type: fletching wait: 3 diff --git a/data/items/equipment/yew_shortbow.yaml b/data/items/equipment/yew_shortbow.yaml index a94b78f..b9f3eb5 100644 --- a/data/items/equipment/yew_shortbow.yaml +++ b/data/items/equipment/yew_shortbow.yaml @@ -1,25 +1,25 @@ -attack_type: ranged -color: "5E" +color: 5E craft: - consume: - - items: - - yew_shortbow_u - quantity: 1 - - items: - - bowstring - quantity: 1 - level: 60 - skill: fletching - type: fletching - wait: 2 - xp: 67 + ingredients: + - items: + - yew_shortbow_u + quantity: 1 + - items: + - bowstring + quantity: 1 + level: 60 + type: fletching + wait: 2 + xp: 67 description: A yew shortbow. -equip_slot: main_hand +equipment: + attack: + ranged: 47 + attack_type: ranged + slot: main_hand + speed: 4 + type: ranged_weapon name: yew shortbow requirements: - ranged: 40 -speed: 4 -stats: - ranged_attack: 47 + ranged: 40 value: 1600 -weapon_type: ranged diff --git a/data/items/equipment/yew_shortbow_u.yaml b/data/items/equipment/yew_shortbow_u.yaml index 77cb117..ee4ed7d 100644 --- a/data/items/equipment/yew_shortbow_u.yaml +++ b/data/items/equipment/yew_shortbow_u.yaml @@ -1,11 +1,10 @@ color: "5E" craft: - consume: + ingredients: - items: - yew_logs quantity: 1 level: 60 - skill: fletching tool: knife type: fletching wait: 3 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. diff --git a/data/items/misc/christmas_cracker.yaml b/data/items/misc/christmas_cracker.yaml index 21b63be..c3eeba3 100644 --- a/data/items/misc/christmas_cracker.yaml +++ b/data/items/misc/christmas_cracker.yaml @@ -4,6 +4,5 @@ description: "A festive party cracker. Pull it apart to see what's inside!" value: 10 stackable: true search_table: christmas_cracker_hat -search_misc_table: christmas_cracker_misc search_ticks: 3 search_message: "digging through the christmas cracker" diff --git a/data/items/misc/mahogany_table.yaml b/data/items/misc/mahogany_table.yaml index d5b23b8..aa31b1f 100644 --- a/data/items/misc/mahogany_table.yaml +++ b/data/items/misc/mahogany_table.yaml @@ -1,11 +1,10 @@ color: "60" craft: - consume: + ingredients: - items: - mahogany_planks quantity: 3 level: 52 - skill: construction station: - workbench type: construction diff --git a/data/items/misc/oak_shelf.yaml b/data/items/misc/oak_shelf.yaml index 422e2eb..94c9a7e 100644 --- a/data/items/misc/oak_shelf.yaml +++ b/data/items/misc/oak_shelf.yaml @@ -1,11 +1,10 @@ color: "5E" craft: - consume: + ingredients: - items: - oak_planks quantity: 2 level: 18 - skill: construction station: - workbench type: construction diff --git a/data/items/misc/oak_table.yaml b/data/items/misc/oak_table.yaml index d3c66b7..f096c3b 100644 --- a/data/items/misc/oak_table.yaml +++ b/data/items/misc/oak_table.yaml @@ -1,11 +1,10 @@ color: "5E" craft: - consume: + ingredients: - items: - oak_planks quantity: 3 level: 20 - skill: construction station: - workbench type: construction diff --git a/data/items/misc/teak_table.yaml b/data/items/misc/teak_table.yaml index e0dba33..b75f506 100644 --- a/data/items/misc/teak_table.yaml +++ b/data/items/misc/teak_table.yaml @@ -1,11 +1,10 @@ color: "64" craft: - consume: + ingredients: - items: - teak_planks quantity: 3 level: 38 - skill: construction station: - workbench type: construction diff --git a/data/items/misc/wooden_chair.yaml b/data/items/misc/wooden_chair.yaml index 128ab98..77de78d 100644 --- a/data/items/misc/wooden_chair.yaml +++ b/data/items/misc/wooden_chair.yaml @@ -1,11 +1,10 @@ color: "82" craft: - consume: + ingredients: - items: - planks quantity: 2 level: 8 - skill: construction station: - workbench type: construction diff --git a/data/items/misc/wooden_shelf.yaml b/data/items/misc/wooden_shelf.yaml index 5363790..bb04fc8 100644 --- a/data/items/misc/wooden_shelf.yaml +++ b/data/items/misc/wooden_shelf.yaml @@ -1,11 +1,10 @@ color: "82" craft: - consume: + ingredients: - items: - planks quantity: 2 level: 4 - skill: construction station: - workbench type: construction diff --git a/data/items/misc/wooden_table.yaml b/data/items/misc/wooden_table.yaml index f76deaa..88a996f 100644 --- a/data/items/misc/wooden_table.yaml +++ b/data/items/misc/wooden_table.yaml @@ -1,11 +1,10 @@ color: "82" craft: - consume: + ingredients: - items: - planks quantity: 3 level: 6 - skill: construction station: - workbench type: construction diff --git a/data/items/tools/adamant_axe.yaml b/data/items/tools/adamant_axe.yaml index 865bec0..78118be 100644 --- a/data/items/tools/adamant_axe.yaml +++ b/data/items/tools/adamant_axe.yaml @@ -1,18 +1,21 @@ -name: adamant axe color: "78" -description: "A sturdy adamant axe, good for woodcutting." -value: 500 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 29 - crush_attack: 22 - strength_bonus: 24 -speed: 5 -tool_type: axe -tool_speed: 2 +description: A sturdy adamant axe, good for woodcutting. +equipment: + attack: + crush: 22 + slash: 29 + stab: -2 + attack_type: slash + other: + strength: 24 + slot: main_hand + speed: 5 + type: melee_weapon +name: adamant axe requirements: accuracy: 30 +stackable: false +tool: + speed: 2 + type: axe +value: 500 diff --git a/data/items/tools/adamant_pickaxe.yaml b/data/items/tools/adamant_pickaxe.yaml index d2ea9bb..95ca1f5 100644 --- a/data/items/tools/adamant_pickaxe.yaml +++ b/data/items/tools/adamant_pickaxe.yaml @@ -1,18 +1,21 @@ -name: adamant pickaxe color: "78" -description: "A sturdy adamant pickaxe, good for mining." -value: 500 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 23 - slash_attack: -2 - crush_attack: 10 - strength_bonus: 16 -speed: 5 -tool_type: pickaxe -tool_speed: 0.75 +description: A sturdy adamant pickaxe, good for mining. +equipment: + attack: + crush: 10 + slash: -2 + stab: 23 + attack_type: stab + other: + strength: 16 + slot: main_hand + speed: 5 + type: melee_weapon +name: adamant pickaxe requirements: accuracy: 30 +stackable: false +tool: + speed: 0.75 + type: pickaxe +value: 500 diff --git a/data/items/tools/big_fishing_net.yaml b/data/items/tools/big_fishing_net.yaml index 4398587..10f3f57 100644 --- a/data/items/tools/big_fishing_net.yaml +++ b/data/items/tools/big_fishing_net.yaml @@ -1,14 +1,14 @@ +color: E6 +description: A larger fishing net for catching bigger fish. +equipment: + other: + strength: 0 + slot: main_hand + speed: 5 + type: melee_weapon name: big fishing net -color: "E6" -description: "A larger fishing net for catching bigger fish." -value: 20 stackable: false -equip_slot: main_hand -weapon_type: melee -stats: - attack_bonus: 0 - strength_bonus: 0 - defense_bonus: 0 -speed: 5 -tool_type: big_net -tool_speed: 1 +tool: + speed: 1 + type: big_net +value: 20 diff --git a/data/items/tools/black_pickaxe.yaml b/data/items/tools/black_pickaxe.yaml index 22d5363..5b06f32 100644 --- a/data/items/tools/black_pickaxe.yaml +++ b/data/items/tools/black_pickaxe.yaml @@ -1,18 +1,21 @@ +color: F0 +description: A black pickaxe, good for mining. +equipment: + attack: + crush: 6 + slash: -2 + stab: 14 + attack_type: stab + other: + strength: 9 + slot: main_hand + speed: 5 + type: melee_weapon name: black pickaxe -color: "F0" -description: "A black pickaxe, good for mining." -value: 150 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 14 - slash_attack: -2 - crush_attack: 6 - strength_bonus: 9 -speed: 5 -tool_type: pickaxe -tool_speed: 1 requirements: accuracy: 10 +stackable: false +tool: + speed: 1 + type: pickaxe +value: 150 diff --git a/data/items/tools/bronze_axe.yaml b/data/items/tools/bronze_axe.yaml index 863c34a..91c0b43 100644 --- a/data/items/tools/bronze_axe.yaml +++ b/data/items/tools/bronze_axe.yaml @@ -1,16 +1,19 @@ +color: B2 +description: A sturdy bronze axe, good for woodcutting. +equipment: + attack: + crush: 5 + slash: 7 + stab: -2 + attack_type: slash + other: + strength: 5 + slot: main_hand + speed: 5 + type: melee_weapon name: bronze axe -color: "B2" -description: "A sturdy bronze axe, good for woodcutting." -value: 10 stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 7 - crush_attack: 5 - strength_bonus: 5 -speed: 5 -tool_type: axe -tool_speed: 4 +tool: + speed: 4 + type: axe +value: 10 diff --git a/data/items/tools/bronze_pickaxe.yaml b/data/items/tools/bronze_pickaxe.yaml index e280020..807cadb 100644 --- a/data/items/tools/bronze_pickaxe.yaml +++ b/data/items/tools/bronze_pickaxe.yaml @@ -1,16 +1,19 @@ +color: B2 +description: A sturdy bronze pickaxe, good for mining. +equipment: + attack: + crush: 2 + slash: -2 + stab: 4 + attack_type: stab + other: + strength: 3 + slot: main_hand + speed: 5 + type: melee_weapon name: bronze pickaxe -color: "B2" -description: "A sturdy bronze pickaxe, good for mining." -value: 10 stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 4 - slash_attack: -2 - crush_attack: 2 - strength_bonus: 3 -speed: 5 -tool_type: pickaxe -tool_speed: 2 +tool: + speed: 2 + type: pickaxe +value: 10 diff --git a/data/items/tools/chisel.yaml b/data/items/tools/chisel.yaml index c4d67b7..c5b9ca6 100644 --- a/data/items/tools/chisel.yaml +++ b/data/items/tools/chisel.yaml @@ -1,5 +1,6 @@ +color: FA +description: A chisel used for cutting gems. name: chisel -color: "FA" -description: "A chisel used for cutting gems." +tool: + type: chisel value: 5 -tool_type: chisel diff --git a/data/items/tools/dragon_pickaxe.yaml b/data/items/tools/dragon_pickaxe.yaml index 0dd3cd4..25c5cce 100644 --- a/data/items/tools/dragon_pickaxe.yaml +++ b/data/items/tools/dragon_pickaxe.yaml @@ -1,18 +1,21 @@ +color: C4 +description: A powerful dragon pickaxe. +equipment: + attack: + crush: 16 + slash: -2 + stab: 34 + attack_type: stab + other: + strength: 26 + slot: main_hand + speed: 5 + type: melee_weapon name: dragon pickaxe -color: "C4" -description: "A powerful dragon pickaxe." -value: 50000 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 34 - slash_attack: -2 - crush_attack: 16 - strength_bonus: 26 -speed: 5 -tool_type: pickaxe -tool_speed: 0.25 requirements: accuracy: 60 +stackable: false +tool: + speed: 0.25 + type: pickaxe +value: 50000 diff --git a/data/items/tools/empty_pot.yaml b/data/items/tools/empty_pot.yaml index 93c9a04..371a783 100644 --- a/data/items/tools/empty_pot.yaml +++ b/data/items/tools/empty_pot.yaml @@ -1,13 +1,12 @@ color: "82" craft: - consume: + ingredients: - items: - unfired_pot quantity: 1 fail_message: The pot cracks in the oven and is ruined. level: 1 message: "You fire the %i1 in the oven." - skill: crafting station: - pottery_oven success: diff --git a/data/items/tools/firesteel.yaml b/data/items/tools/firesteel.yaml index bccd390..861e879 100644 --- a/data/items/tools/firesteel.yaml +++ b/data/items/tools/firesteel.yaml @@ -1,7 +1,8 @@ +color: FA +description: A rugged firesteel that never wears out. name: firesteel -color: "FA" -description: "A rugged firesteel that never wears out." -value: 20 stackable: false -tool_type: fire -tool_speed: 4 +tool: + speed: 4 + type: fire +value: 20 diff --git a/data/items/tools/fishing_rod.yaml b/data/items/tools/fishing_rod.yaml index e7e3023..b9e5610 100644 --- a/data/items/tools/fishing_rod.yaml +++ b/data/items/tools/fishing_rod.yaml @@ -1,14 +1,14 @@ +color: 6B +description: A simple fishing rod. Use with fishing bait. +equipment: + other: + strength: 0 + slot: main_hand + speed: 5 + type: melee_weapon name: fishing rod -color: "6B" -description: "A simple fishing rod. Use with fishing bait." -value: 5 stackable: false -equip_slot: main_hand -weapon_type: melee -stats: - attack_bonus: 0 - strength_bonus: 0 - defense_bonus: 0 -speed: 5 -tool_type: fishing_rod -tool_speed: 0 +tool: + speed: 0 + type: fishing_rod +value: 5 diff --git a/data/items/tools/fly_fishing_rod.yaml b/data/items/tools/fly_fishing_rod.yaml index a65b90c..fc4655d 100644 --- a/data/items/tools/fly_fishing_rod.yaml +++ b/data/items/tools/fly_fishing_rod.yaml @@ -1,14 +1,14 @@ +color: 6B +description: A flexible rod for fly fishing with artificial flies. +equipment: + other: + strength: 0 + slot: main_hand + speed: 5 + type: melee_weapon name: fly fishing rod -color: "6B" -description: "A flexible rod for fly fishing with artificial flies." -value: 20 stackable: false -equip_slot: main_hand -weapon_type: melee -stats: - attack_bonus: 0 - strength_bonus: 0 - defense_bonus: 0 -speed: 5 -tool_type: fly_rod -tool_speed: 1 +tool: + speed: 1 + type: fly_rod +value: 20 diff --git a/data/items/tools/hammer.yaml b/data/items/tools/hammer.yaml index a017160..3f156aa 100644 --- a/data/items/tools/hammer.yaml +++ b/data/items/tools/hammer.yaml @@ -1,6 +1,7 @@ +color: FA +description: A sturdy hammer for smithing metal on an anvil. name: hammer -color: "FA" -description: "A sturdy hammer for smithing metal on an anvil." -value: 10 stackable: false -tool_type: hammer +tool: + type: hammer +value: 10 diff --git a/data/items/tools/harpoon.yaml b/data/items/tools/harpoon.yaml index 639f978..51163f5 100644 --- a/data/items/tools/harpoon.yaml +++ b/data/items/tools/harpoon.yaml @@ -1,14 +1,14 @@ +color: FA +description: A barbed harpoon for spearing large fish. +equipment: + other: + strength: 0 + slot: main_hand + speed: 5 + type: melee_weapon name: harpoon -color: "FA" -description: "A barbed harpoon for spearing large fish." -value: 30 stackable: false -equip_slot: main_hand -weapon_type: melee -stats: - attack_bonus: 0 - strength_bonus: 0 - defense_bonus: 0 -speed: 5 -tool_type: harpoon -tool_speed: 0 +tool: + speed: 0 + type: harpoon +value: 30 diff --git a/data/items/tools/iron_axe.yaml b/data/items/tools/iron_axe.yaml index bac2530..bb633f5 100644 --- a/data/items/tools/iron_axe.yaml +++ b/data/items/tools/iron_axe.yaml @@ -1,16 +1,19 @@ +color: FA +description: A sturdy iron axe, good for woodcutting. +equipment: + attack: + crush: 7 + slash: 10 + stab: -2 + attack_type: slash + other: + strength: 8 + slot: main_hand + speed: 5 + type: melee_weapon name: iron axe -color: "FA" -description: "A sturdy iron axe, good for woodcutting." -value: 25 stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 10 - crush_attack: 7 - strength_bonus: 8 -speed: 5 -tool_type: axe -tool_speed: 3.5 +tool: + speed: 3.5 + type: axe +value: 25 diff --git a/data/items/tools/iron_pickaxe.yaml b/data/items/tools/iron_pickaxe.yaml index bdb4531..e003c93 100644 --- a/data/items/tools/iron_pickaxe.yaml +++ b/data/items/tools/iron_pickaxe.yaml @@ -1,16 +1,19 @@ +color: FA +description: A sturdy iron pickaxe, good for mining. +equipment: + attack: + crush: 3 + slash: -2 + stab: 7 + attack_type: stab + other: + strength: 5 + slot: main_hand + speed: 5 + type: melee_weapon name: iron pickaxe -color: "FA" -description: "A sturdy iron pickaxe, good for mining." -value: 25 stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 7 - slash_attack: -2 - crush_attack: 3 - strength_bonus: 5 -speed: 5 -tool_type: pickaxe -tool_speed: 1.5 +tool: + speed: 1.5 + type: pickaxe +value: 25 diff --git a/data/items/tools/knife.yaml b/data/items/tools/knife.yaml index ce27095..353d859 100644 --- a/data/items/tools/knife.yaml +++ b/data/items/tools/knife.yaml @@ -1,5 +1,6 @@ +color: FA +description: A small knife used for cutting wood and fletching. name: knife -color: "FA" -description: "A small knife used for cutting wood and fletching." +tool: + type: knife value: 5 -tool_type: knife diff --git a/data/items/tools/lighter.yaml b/data/items/tools/lighter.yaml index ff38aa4..9f47a45 100644 --- a/data/items/tools/lighter.yaml +++ b/data/items/tools/lighter.yaml @@ -1,10 +1,13 @@ -name: lighter color: "51" -description: "A reliable butane lighter." -value: 15 -stackable: false -equip_slot: main_hand -tool_type: fire -tool_speed: 4 -quality: 100 +description: A reliable butane lighter. +equipment: + slot: main_hand + type: tool max_quality: 100 +name: lighter +quality: 100 +stackable: false +tool: + speed: 4 + type: fire +value: 15 diff --git a/data/items/tools/lobster_pot.yaml b/data/items/tools/lobster_pot.yaml index 6e4a1d4..56760de 100644 --- a/data/items/tools/lobster_pot.yaml +++ b/data/items/tools/lobster_pot.yaml @@ -1,14 +1,14 @@ +color: FA +description: A wire cage for trapping lobsters. +equipment: + other: + strength: 0 + slot: main_hand + speed: 5 + type: melee_weapon name: lobster pot -color: "FA" -description: "A wire cage for trapping lobsters." -value: 20 stackable: false -equip_slot: main_hand -weapon_type: melee -stats: - attack_bonus: 0 - strength_bonus: 0 - defense_bonus: 0 -speed: 5 -tool_type: lobster_pot -tool_speed: 0 +tool: + speed: 0 + type: lobster_pot +value: 20 diff --git a/data/items/tools/matches.yaml b/data/items/tools/matches.yaml index c7cf9dd..75f8c1a 100644 --- a/data/items/tools/matches.yaml +++ b/data/items/tools/matches.yaml @@ -1,8 +1,11 @@ +color: C4 +description: A small box of matches for starting fires. +equipment: + slot: main_hand + type: tool name: matches -color: "C4" -description: "A small box of matches for starting fires." -value: 5 stackable: true -equip_slot: main_hand -tool_type: fire -tool_speed: 4 +tool: + speed: 4 + type: fire +value: 5 diff --git a/data/items/tools/mithril_axe.yaml b/data/items/tools/mithril_axe.yaml index f0976a9..31aef89 100644 --- a/data/items/tools/mithril_axe.yaml +++ b/data/items/tools/mithril_axe.yaml @@ -1,18 +1,21 @@ +color: 4B +description: A sturdy mithril axe, good for woodcutting. +equipment: + attack: + crush: 16 + slash: 21 + stab: -2 + attack_type: slash + other: + strength: 17 + slot: main_hand + speed: 5 + type: melee_weapon name: mithril axe -color: "4B" -description: "A sturdy mithril axe, good for woodcutting." -value: 200 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 21 - crush_attack: 16 - strength_bonus: 17 -speed: 5 -tool_type: axe -tool_speed: 2.5 requirements: accuracy: 20 +stackable: false +tool: + speed: 2.5 + type: axe +value: 200 diff --git a/data/items/tools/mithril_pickaxe.yaml b/data/items/tools/mithril_pickaxe.yaml index e525c21..ab2996d 100644 --- a/data/items/tools/mithril_pickaxe.yaml +++ b/data/items/tools/mithril_pickaxe.yaml @@ -1,18 +1,21 @@ +color: 4B +description: A sturdy mithril pickaxe, good for mining. +equipment: + attack: + crush: 8 + slash: -2 + stab: 17 + attack_type: stab + other: + strength: 12 + slot: main_hand + speed: 5 + type: melee_weapon name: mithril pickaxe -color: "4B" -description: "A sturdy mithril pickaxe, good for mining." -value: 200 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 17 - slash_attack: -2 - crush_attack: 8 - strength_bonus: 12 -speed: 5 -tool_type: pickaxe -tool_speed: 1 requirements: accuracy: 20 +stackable: false +tool: + speed: 1 + type: pickaxe +value: 200 diff --git a/data/items/tools/needle.yaml b/data/items/tools/needle.yaml index a5adf2a..bc12202 100644 --- a/data/items/tools/needle.yaml +++ b/data/items/tools/needle.yaml @@ -1,5 +1,6 @@ +color: FA +description: A needle for crafting leather goods. name: needle -color: "FA" -description: "A needle for crafting leather goods." +tool: + type: needle value: 5 -tool_type: needle diff --git a/data/items/tools/plant_pot.yaml b/data/items/tools/plant_pot.yaml index ede859c..e758167 100644 --- a/data/items/tools/plant_pot.yaml +++ b/data/items/tools/plant_pot.yaml @@ -1,13 +1,12 @@ color: "82" craft: - consume: + ingredients: - items: - unfired_plant_pot quantity: 1 fail_message: The plant pot cracks in the oven and is ruined. level: 19 message: "You fire the %i1 in the oven." - skill: crafting station: - pottery_oven success: diff --git a/data/items/tools/rake.yaml b/data/items/tools/rake.yaml index 3848104..ca5e44b 100644 --- a/data/items/tools/rake.yaml +++ b/data/items/tools/rake.yaml @@ -1,6 +1,7 @@ +color: 5E +description: A sturdy rake for clearing weeds and dead plants from farming patches. name: rake -color: "5E" -description: "A sturdy rake for clearing weeds and dead plants from farming patches." -value: 8 stackable: false -tool_type: rake +tool: + type: rake +value: 8 diff --git a/data/items/tools/rune_axe.yaml b/data/items/tools/rune_axe.yaml index e239a0a..46cc948 100644 --- a/data/items/tools/rune_axe.yaml +++ b/data/items/tools/rune_axe.yaml @@ -1,18 +1,21 @@ -name: rune axe color: "57" -description: "A sturdy rune axe, good for woodcutting." -value: 5000 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 38 - crush_attack: 29 - strength_bonus: 32 -speed: 5 -tool_type: axe -tool_speed: 1.5 +description: A sturdy rune axe, good for woodcutting. +equipment: + attack: + crush: 29 + slash: 38 + stab: -2 + attack_type: slash + other: + strength: 32 + slot: main_hand + speed: 5 + type: melee_weapon +name: rune axe requirements: accuracy: 40 +stackable: false +tool: + speed: 1.5 + type: axe +value: 5000 diff --git a/data/items/tools/rune_pickaxe.yaml b/data/items/tools/rune_pickaxe.yaml index b4e9ac1..d580df5 100644 --- a/data/items/tools/rune_pickaxe.yaml +++ b/data/items/tools/rune_pickaxe.yaml @@ -1,18 +1,21 @@ -name: rune pickaxe color: "57" -description: "A sturdy rune pickaxe, good for mining." -value: 5000 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 30 - slash_attack: -2 - crush_attack: 14 - strength_bonus: 22 -speed: 5 -tool_type: pickaxe -tool_speed: 0.5 +description: A sturdy rune pickaxe, good for mining. +equipment: + attack: + crush: 14 + slash: -2 + stab: 30 + attack_type: stab + other: + strength: 22 + slot: main_hand + speed: 5 + type: melee_weapon +name: rune pickaxe requirements: accuracy: 40 +stackable: false +tool: + speed: 0.5 + type: pickaxe +value: 5000 diff --git a/data/items/tools/saw.yaml b/data/items/tools/saw.yaml index d671923..8f6a287 100644 --- a/data/items/tools/saw.yaml +++ b/data/items/tools/saw.yaml @@ -1,6 +1,7 @@ -name: saw -tool_type: saw color: "98" -description: "A sharp-toothed saw for cutting planks from logs at a workbench." -value: 30 +description: A sharp-toothed saw for cutting planks from logs at a workbench. +name: saw stackable: false +tool: + type: saw +value: 30 diff --git a/data/items/tools/shears.yaml b/data/items/tools/shears.yaml index 0fbbafb..c9739f4 100644 --- a/data/items/tools/shears.yaml +++ b/data/items/tools/shears.yaml @@ -1,5 +1,6 @@ +color: FA +description: A pair of shears for shearing sheep. name: shears -color: "FA" -description: "A pair of shears for shearing sheep." +tool: + type: shears value: 5 -tool_type: shears diff --git a/data/items/tools/small_fishing_net.yaml b/data/items/tools/small_fishing_net.yaml index 2d3c6bd..9b127b6 100644 --- a/data/items/tools/small_fishing_net.yaml +++ b/data/items/tools/small_fishing_net.yaml @@ -1,14 +1,14 @@ +color: E6 +description: A small hand-held fishing net. +equipment: + other: + strength: 0 + slot: main_hand + speed: 5 + type: melee_weapon name: small fishing net -color: "E6" -description: "A small hand-held fishing net." -value: 5 stackable: false -equip_slot: main_hand -weapon_type: melee -stats: - attack_bonus: 0 - strength_bonus: 0 - defense_bonus: 0 -speed: 5 -tool_type: small_net -tool_speed: 0 +tool: + speed: 0 + type: small_net +value: 5 diff --git a/data/items/tools/spade.yaml b/data/items/tools/spade.yaml index aab5ee8..e755981 100644 --- a/data/items/tools/spade.yaml +++ b/data/items/tools/spade.yaml @@ -1,6 +1,7 @@ +color: F1 +description: A metal spade used for planting seeds and harvesting crops. name: spade -color: "F1" -description: "A metal spade used for planting seeds and harvesting crops." -value: 8 stackable: false -tool_type: spade +tool: + type: spade +value: 8 diff --git a/data/items/tools/steel_axe.yaml b/data/items/tools/steel_axe.yaml index 929bc9e..c0f5a7f 100644 --- a/data/items/tools/steel_axe.yaml +++ b/data/items/tools/steel_axe.yaml @@ -1,18 +1,21 @@ +color: FD +description: A sturdy steel axe, good for woodcutting. +equipment: + attack: + crush: 11 + slash: 15 + stab: -2 + attack_type: slash + other: + strength: 12 + slot: main_hand + speed: 5 + type: melee_weapon name: steel axe -color: "FD" -description: "A sturdy steel axe, good for woodcutting." -value: 75 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: slash -stats: - stab_attack: -2 - slash_attack: 15 - crush_attack: 11 - strength_bonus: 12 -speed: 5 -tool_type: axe -tool_speed: 3 requirements: accuracy: 5 +stackable: false +tool: + speed: 3 + type: axe +value: 75 diff --git a/data/items/tools/steel_pickaxe.yaml b/data/items/tools/steel_pickaxe.yaml index 2acd5e5..7560612 100644 --- a/data/items/tools/steel_pickaxe.yaml +++ b/data/items/tools/steel_pickaxe.yaml @@ -1,18 +1,21 @@ +color: FD +description: A sturdy steel pickaxe, good for mining. +equipment: + attack: + crush: 4 + slash: -2 + stab: 10 + attack_type: stab + other: + strength: 7 + slot: main_hand + speed: 5 + type: melee_weapon name: steel pickaxe -color: "FD" -description: "A sturdy steel pickaxe, good for mining." -value: 75 -stackable: false -equip_slot: main_hand -weapon_type: melee -attack_type: stab -stats: - stab_attack: 10 - slash_attack: -2 - crush_attack: 4 - strength_bonus: 7 -speed: 5 -tool_type: pickaxe -tool_speed: 1.25 requirements: accuracy: 5 +stackable: false +tool: + speed: 1.25 + type: pickaxe +value: 75 diff --git a/data/items/tools/unfired_pie_dish.yaml b/data/items/tools/unfired_pie_dish.yaml index eb5d2b6..bc0c5a5 100644 --- a/data/items/tools/unfired_pie_dish.yaml +++ b/data/items/tools/unfired_pie_dish.yaml @@ -1,12 +1,11 @@ color: "AD" craft: - consume: + ingredients: - items: - soft_clay quantity: 1 level: 7 message: "You shape the clay into a %n." - skill: crafting station: - pottery_wheel type: crafting diff --git a/data/items/tools/unfired_plant_pot.yaml b/data/items/tools/unfired_plant_pot.yaml index 3c6c28f..30ccd83 100644 --- a/data/items/tools/unfired_plant_pot.yaml +++ b/data/items/tools/unfired_plant_pot.yaml @@ -1,12 +1,11 @@ color: "AD" craft: - consume: + ingredients: - items: - soft_clay quantity: 1 level: 19 message: "You shape the clay into a %n." - skill: crafting station: - pottery_wheel type: crafting diff --git a/data/items/tools/unfired_pot.yaml b/data/items/tools/unfired_pot.yaml index 26e8771..9dc2406 100644 --- a/data/items/tools/unfired_pot.yaml +++ b/data/items/tools/unfired_pot.yaml @@ -1,12 +1,11 @@ color: "AD" craft: - consume: + ingredients: - items: - soft_clay quantity: 1 level: 1 message: "You shape the clay into a %n." - skill: crafting station: - pottery_wheel type: crafting diff --git a/data/items/tools/watering_can.yaml b/data/items/tools/watering_can.yaml index eab9b0d..4d747a6 100644 --- a/data/items/tools/watering_can.yaml +++ b/data/items/tools/watering_can.yaml @@ -1,6 +1,7 @@ -name: watering can color: "27" -description: "A watering can for hydrating farming patches. Watering eliminates disease risk." -value: 12 +description: A watering can for hydrating farming patches. Watering eliminates disease risk. +name: watering can stackable: false -tool_type: watering_can +tool: + type: watering_can +value: 12 |