aboutsummaryrefslogtreecommitdiff
path: root/data/items
diff options
context:
space:
mode:
Diffstat (limited to 'data/items')
-rw-r--r--data/items/adamant_arrow.yaml2
-rw-r--r--data/items/adamant_axe.yaml14
-rw-r--r--data/items/adamant_bolts.yaml2
-rw-r--r--data/items/adamant_dagger.yaml7
-rw-r--r--data/items/adamant_full_helm.yaml6
-rw-r--r--data/items/adamant_med_helm.yaml6
-rw-r--r--data/items/adamant_pickaxe.yaml14
-rw-r--r--data/items/adamant_platebody.yaml6
-rw-r--r--data/items/adamant_sword.yaml7
-rw-r--r--data/items/amp_potion.yaml6
-rw-r--r--data/items/antitoxin_powder.yaml6
-rw-r--r--data/items/arachnid_enzyme.yaml6
-rw-r--r--data/items/avantoe.yaml6
-rw-r--r--data/items/avantoe_potion_unf.yaml12
-rw-r--r--data/items/bio_serum.yaml6
-rw-r--r--data/items/black_axe.yaml14
-rw-r--r--data/items/black_pickaxe.yaml14
-rw-r--r--data/items/blight_spore.yaml6
-rw-r--r--data/items/bronze_arrow.yaml2
-rw-r--r--data/items/bronze_axe.yaml8
-rw-r--r--data/items/bronze_bolts.yaml2
-rw-r--r--data/items/bronze_dagger.yaml7
-rw-r--r--data/items/bronze_full_helm.yaml6
-rw-r--r--data/items/bronze_med_helm.yaml6
-rw-r--r--data/items/bronze_pickaxe.yaml8
-rw-r--r--data/items/bronze_platebody.yaml6
-rw-r--r--data/items/bronze_sword.yaml7
-rw-r--r--data/items/cadantine.yaml6
-rw-r--r--data/items/cadantine_potion_unf.yaml12
-rw-r--r--data/items/catalyst_wine.yaml6
-rw-r--r--data/items/chocolate_dust.yaml6
-rw-r--r--data/items/coif.yaml7
-rw-r--r--data/items/crushed_nest.yaml6
-rw-r--r--data/items/diamond_bolts.yaml2
-rw-r--r--data/items/dragon_axe.yaml14
-rw-r--r--data/items/dragon_pickaxe.yaml14
-rw-r--r--data/items/dwarf_weed.yaml6
-rw-r--r--data/items/dwarf_weed_potion_unf.yaml12
-rw-r--r--data/items/emerald_bolts.yaml2
-rw-r--r--data/items/eye_of_newt.yaml6
-rw-r--r--data/items/full_restore.yaml6
-rw-r--r--data/items/grimy_avantoe.yaml6
-rw-r--r--data/items/grimy_cadantine.yaml6
-rw-r--r--data/items/grimy_dwarf_weed.yaml6
-rw-r--r--data/items/grimy_guam.yaml6
-rw-r--r--data/items/grimy_harralander.yaml6
-rw-r--r--data/items/grimy_irit.yaml6
-rw-r--r--data/items/grimy_kwuarm.yaml6
-rw-r--r--data/items/grimy_lantadyme.yaml6
-rw-r--r--data/items/grimy_marrentill.yaml6
-rw-r--r--data/items/grimy_ranarr.yaml6
-rw-r--r--data/items/grimy_snapdragon.yaml6
-rw-r--r--data/items/grimy_tarromin.yaml6
-rw-r--r--data/items/grimy_toadflax.yaml6
-rw-r--r--data/items/grimy_torstol.yaml6
-rw-r--r--data/items/guam.yaml6
-rw-r--r--data/items/guam_potion_unf.yaml12
-rw-r--r--data/items/hard_leather_body.yaml6
-rw-r--r--data/items/hard_leather_shield.yaml6
-rw-r--r--data/items/harralander.yaml6
-rw-r--r--data/items/harralander_potion_unf.yaml12
-rw-r--r--data/items/irit.yaml6
-rw-r--r--data/items/irit_potion_unf.yaml12
-rw-r--r--data/items/iron_arrow.yaml2
-rw-r--r--data/items/iron_axe.yaml14
-rw-r--r--data/items/iron_bolts.yaml2
-rw-r--r--data/items/iron_dagger.yaml7
-rw-r--r--data/items/iron_full_helm.yaml6
-rw-r--r--data/items/iron_med_helm.yaml6
-rw-r--r--data/items/iron_pickaxe.yaml14
-rw-r--r--data/items/iron_platebody.yaml6
-rw-r--r--data/items/iron_sword.yaml7
-rw-r--r--data/items/kwuarm.yaml6
-rw-r--r--data/items/kwuarm_potion_unf.yaml12
-rw-r--r--data/items/lantadyme.yaml6
-rw-r--r--data/items/lantadyme_potion_unf.yaml12
-rw-r--r--data/items/leather_body.yaml6
-rw-r--r--data/items/leather_boots.yaml6
-rw-r--r--data/items/leather_chaps.yaml6
-rw-r--r--data/items/leather_cowl.yaml6
-rw-r--r--data/items/leather_gloves.yaml6
-rw-r--r--data/items/leather_vambraces.yaml7
-rw-r--r--data/items/limpwurt_root.yaml6
-rw-r--r--data/items/longbow.yaml3
-rw-r--r--data/items/magic_longbow.yaml3
-rw-r--r--data/items/magic_shortbow.yaml3
-rw-r--r--data/items/maple_longbow.yaml3
-rw-r--r--data/items/maple_shortbow.yaml3
-rw-r--r--data/items/marrentill.yaml6
-rw-r--r--data/items/marrentill_potion_unf.yaml12
-rw-r--r--data/items/mithril_arrow.yaml2
-rw-r--r--data/items/mithril_axe.yaml14
-rw-r--r--data/items/mithril_bolts.yaml2
-rw-r--r--data/items/mithril_dagger.yaml7
-rw-r--r--data/items/mithril_full_helm.yaml6
-rw-r--r--data/items/mithril_med_helm.yaml6
-rw-r--r--data/items/mithril_pickaxe.yaml14
-rw-r--r--data/items/mithril_platebody.yaml6
-rw-r--r--data/items/mithril_sword.yaml7
-rw-r--r--data/items/nano_restore.yaml6
-rw-r--r--data/items/oak_longbow.yaml3
-rw-r--r--data/items/oak_shortbow.yaml3
-rw-r--r--data/items/potato_cactus.yaml6
-rw-r--r--data/items/ranarr.yaml6
-rw-r--r--data/items/ranarr_potion_unf.yaml12
-rw-r--r--data/items/restoration_compound.yaml6
-rw-r--r--data/items/ruby_bolts.yaml2
-rw-r--r--data/items/rune_arrow.yaml2
-rw-r--r--data/items/rune_axe.yaml14
-rw-r--r--data/items/rune_bolts.yaml2
-rw-r--r--data/items/rune_dagger.yaml7
-rw-r--r--data/items/rune_full_helm.yaml6
-rw-r--r--data/items/rune_med_helm.yaml6
-rw-r--r--data/items/rune_pickaxe.yaml14
-rw-r--r--data/items/rune_platebody.yaml6
-rw-r--r--data/items/rune_sword.yaml7
-rw-r--r--data/items/sapphire_bolts.yaml2
-rw-r--r--data/items/science_serum.yaml6
-rw-r--r--data/items/shield_potion.yaml6
-rw-r--r--data/items/shortbow.yaml3
-rw-r--r--data/items/snapdragon.yaml6
-rw-r--r--data/items/snapdragon_potion_unf.yaml12
-rw-r--r--data/items/snape_grass.yaml6
-rw-r--r--data/items/steel_arrow.yaml2
-rw-r--r--data/items/steel_axe.yaml14
-rw-r--r--data/items/steel_bolts.yaml2
-rw-r--r--data/items/steel_dagger.yaml7
-rw-r--r--data/items/steel_full_helm.yaml6
-rw-r--r--data/items/steel_med_helm.yaml6
-rw-r--r--data/items/steel_pickaxe.yaml14
-rw-r--r--data/items/steel_platebody.yaml6
-rw-r--r--data/items/steel_sword.yaml7
-rw-r--r--data/items/stim_cell.yaml6
-rw-r--r--data/items/stim_potion.yaml6
-rw-r--r--data/items/super_amp.yaml6
-rw-r--r--data/items/super_bio_serum.yaml6
-rw-r--r--data/items/super_shield.yaml6
-rw-r--r--data/items/super_stim.yaml6
-rw-r--r--data/items/super_stim_cell.yaml6
-rw-r--r--data/items/targeting_serum.yaml6
-rw-r--r--data/items/tarromin.yaml6
-rw-r--r--data/items/tarromin_potion_unf.yaml12
-rw-r--r--data/items/tech_serum.yaml6
-rw-r--r--data/items/toadflax.yaml6
-rw-r--r--data/items/toadflax_potion_unf.yaml12
-rw-r--r--data/items/torstol.yaml6
-rw-r--r--data/items/torstol_potion_unf.yaml12
-rw-r--r--data/items/vial.yaml6
-rw-r--r--data/items/vial_of_water.yaml6
-rw-r--r--data/items/white_berries.yaml6
-rw-r--r--data/items/willow_longbow.yaml3
-rw-r--r--data/items/willow_shortbow.yaml3
-rw-r--r--data/items/yew_longbow.yaml3
-rw-r--r--data/items/yew_shortbow.yaml3
154 files changed, 869 insertions, 169 deletions
diff --git a/data/items/adamant_arrow.yaml b/data/items/adamant_arrow.yaml
index 5b3a364..bbcdcab 100644
--- a/data/items/adamant_arrow.yaml
+++ b/data/items/adamant_arrow.yaml
@@ -6,4 +6,4 @@ value: 20
stackable: true
equip_slot: ammo
stats:
- attack: 31
+ ranged_strength: 31
diff --git a/data/items/adamant_axe.yaml b/data/items/adamant_axe.yaml
index d96bb47..4c71f5e 100644
--- a/data/items/adamant_axe.yaml
+++ b/data/items/adamant_axe.yaml
@@ -1,15 +1,17 @@
id: adamant_axe
name: adamant axe
color: "120"
-description: "A powerful adamant axe."
-value: 1250
+description: "A sturdy adamant axe, good for woodcutting."
+value: 500
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 12
- strength_bonus: 7
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 29
+ crush_attack: 22
+ strength_bonus: 24
speed: 5
tool_type: axe
-tool_speed: 8
+tool_speed: 2
diff --git a/data/items/adamant_bolts.yaml b/data/items/adamant_bolts.yaml
index 5f0509e..47d088f 100644
--- a/data/items/adamant_bolts.yaml
+++ b/data/items/adamant_bolts.yaml
@@ -6,4 +6,4 @@ value: 24
stackable: true
equip_slot: ammo
stats:
- attack: 43
+ ranged_strength: 43
diff --git a/data/items/adamant_dagger.yaml b/data/items/adamant_dagger.yaml
index 10c203a..35508a0 100644
--- a/data/items/adamant_dagger.yaml
+++ b/data/items/adamant_dagger.yaml
@@ -6,7 +6,10 @@ value: 400
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 14
- strength_bonus: 10
+ stab_attack: 23
+ slash_attack: 14
+ crush_attack: -1
+ strength_bonus: 19
speed: 3
diff --git a/data/items/adamant_full_helm.yaml b/data/items/adamant_full_helm.yaml
index 2b5da4e..a62d3aa 100644
--- a/data/items/adamant_full_helm.yaml
+++ b/data/items/adamant_full_helm.yaml
@@ -6,4 +6,8 @@ value: 1000
stackable: false
equip_slot: head
stats:
- defense_bonus: 17
+ stab_defense: 22
+ slash_defense: 24
+ crush_defense: 16
+ science_defense: -8
+ ranged_defense: 22
diff --git a/data/items/adamant_med_helm.yaml b/data/items/adamant_med_helm.yaml
index f251b18..e5bb561 100644
--- a/data/items/adamant_med_helm.yaml
+++ b/data/items/adamant_med_helm.yaml
@@ -6,4 +6,8 @@ value: 400
stackable: false
equip_slot: head
stats:
- defense_bonus: 12
+ stab_defense: 14
+ slash_defense: 16
+ crush_defense: 10
+ science_defense: -3
+ ranged_defense: 14
diff --git a/data/items/adamant_pickaxe.yaml b/data/items/adamant_pickaxe.yaml
index c37b9d8..ee65b58 100644
--- a/data/items/adamant_pickaxe.yaml
+++ b/data/items/adamant_pickaxe.yaml
@@ -1,15 +1,17 @@
id: adamant_pickaxe
name: adamant pickaxe
color: "120"
-description: "A powerful adamant pickaxe."
-value: 1250
+description: "A sturdy adamant pickaxe, good for mining."
+value: 500
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 12
- strength_bonus: 7
- defense_bonus: 0
+ stab_attack: 23
+ slash_attack: -2
+ crush_attack: 10
+ strength_bonus: 16
speed: 5
tool_type: pickaxe
-tool_speed: 6
+tool_speed: 0.75
diff --git a/data/items/adamant_platebody.yaml b/data/items/adamant_platebody.yaml
index 5f18fb2..c13bd82 100644
--- a/data/items/adamant_platebody.yaml
+++ b/data/items/adamant_platebody.yaml
@@ -6,4 +6,8 @@ value: 5000
stackable: false
equip_slot: torso
stats:
- defense_bonus: 33
+ stab_defense: 49
+ slash_defense: 55
+ crush_defense: 40
+ science_defense: -25
+ ranged_defense: 49
diff --git a/data/items/adamant_sword.yaml b/data/items/adamant_sword.yaml
index 5e1f992..036288e 100644
--- a/data/items/adamant_sword.yaml
+++ b/data/items/adamant_sword.yaml
@@ -6,7 +6,10 @@ value: 700
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 17
- strength_bonus: 13
+ stab_attack: 20
+ slash_attack: 40
+ crush_attack: -2
+ strength_bonus: 27
speed: 4
diff --git a/data/items/amp_potion.yaml b/data/items/amp_potion.yaml
new file mode 100644
index 0000000..0d88a53
--- /dev/null
+++ b/data/items/amp_potion.yaml
@@ -0,0 +1,6 @@
+id: amp_potion
+name: "amp potion"
+color: "255"
+description: "A milky white potion that temporarily amplifies physical strength. [Effect not yet implemented]"
+value: 55
+stackable: false
diff --git a/data/items/antitoxin_powder.yaml b/data/items/antitoxin_powder.yaml
new file mode 100644
index 0000000..dedba43
--- /dev/null
+++ b/data/items/antitoxin_powder.yaml
@@ -0,0 +1,6 @@
+id: antitoxin_powder
+name: "antitoxin powder"
+color: "255"
+description: "A fine white powder derived from synthetic horn material. Neutralizes biological toxins."
+value: 15
+stackable: false
diff --git a/data/items/arachnid_enzyme.yaml b/data/items/arachnid_enzyme.yaml
new file mode 100644
index 0000000..4be2f65
--- /dev/null
+++ b/data/items/arachnid_enzyme.yaml
@@ -0,0 +1,6 @@
+id: arachnid_enzyme
+name: "arachnid enzyme"
+color: "196"
+description: "A viscous red enzyme harvested from spider egg sacs. Potent catalytic agent."
+value: 12
+stackable: false
diff --git a/data/items/avantoe.yaml b/data/items/avantoe.yaml
new file mode 100644
index 0000000..709b583
--- /dev/null
+++ b/data/items/avantoe.yaml
@@ -0,0 +1,6 @@
+id: avantoe
+name: "avantoe"
+color: "48"
+description: "A clean avantoe leaf, ready for use in pharmacy."
+value: 48
+stackable: false
diff --git a/data/items/avantoe_potion_unf.yaml b/data/items/avantoe_potion_unf.yaml
new file mode 100644
index 0000000..8b23f35
--- /dev/null
+++ b/data/items/avantoe_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: avantoe_potion_unf
+name: "avantoe potion (unf)"
+color: "48"
+description: "An unfinished potion with avantoe floating in water."
+value: 50
+stackable: false
+made_from:
+ - items: [avantoe]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/bio_serum.yaml b/data/items/bio_serum.yaml
new file mode 100644
index 0000000..4795749
--- /dev/null
+++ b/data/items/bio_serum.yaml
@@ -0,0 +1,6 @@
+id: bio_serum
+name: "bio serum"
+color: "48"
+description: "A clear green serum that neutralizes biological toxins. [Effect not yet implemented]"
+value: 45
+stackable: false
diff --git a/data/items/black_axe.yaml b/data/items/black_axe.yaml
index 2567af8..a43c1e6 100644
--- a/data/items/black_axe.yaml
+++ b/data/items/black_axe.yaml
@@ -1,15 +1,17 @@
id: black_axe
name: black axe
color: "240"
-description: "A sleek black axe, as fast as steel."
-value: 500
+description: "A black axe, good for woodcutting."
+value: 150
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 7
- strength_bonus: 4
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 18
+ crush_attack: 14
+ strength_bonus: 14
speed: 5
tool_type: axe
-tool_speed: 6
+tool_speed: 2.5
diff --git a/data/items/black_pickaxe.yaml b/data/items/black_pickaxe.yaml
index 5dd7df5..ef6ca99 100644
--- a/data/items/black_pickaxe.yaml
+++ b/data/items/black_pickaxe.yaml
@@ -1,15 +1,17 @@
id: black_pickaxe
name: black pickaxe
color: "240"
-description: "A sleek black pickaxe."
-value: 500
+description: "A black pickaxe, good for mining."
+value: 150
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 7
- strength_bonus: 4
- defense_bonus: 0
+ stab_attack: 14
+ slash_attack: -2
+ crush_attack: 6
+ strength_bonus: 9
speed: 5
tool_type: pickaxe
-tool_speed: 5
+tool_speed: 1
diff --git a/data/items/blight_spore.yaml b/data/items/blight_spore.yaml
new file mode 100644
index 0000000..add0f6e
--- /dev/null
+++ b/data/items/blight_spore.yaml
@@ -0,0 +1,6 @@
+id: blight_spore
+name: "blight spore"
+color: "58"
+description: "A desiccated fungal spore from the deadlands. Pulsing with residual bio-energy."
+value: 20
+stackable: false
diff --git a/data/items/bronze_arrow.yaml b/data/items/bronze_arrow.yaml
index 991bc11..eb73a48 100644
--- a/data/items/bronze_arrow.yaml
+++ b/data/items/bronze_arrow.yaml
@@ -6,4 +6,4 @@ value: 1
stackable: true
equip_slot: ammo
stats:
- attack: 7
+ ranged_strength: 7
diff --git a/data/items/bronze_axe.yaml b/data/items/bronze_axe.yaml
index 42427e5..84b2762 100644
--- a/data/items/bronze_axe.yaml
+++ b/data/items/bronze_axe.yaml
@@ -6,10 +6,12 @@ value: 10
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 2
- strength_bonus: 1
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 7
+ crush_attack: 5
+ strength_bonus: 5
speed: 5
tool_type: axe
tool_speed: 4
diff --git a/data/items/bronze_bolts.yaml b/data/items/bronze_bolts.yaml
index 76ca27c..0d3afae 100644
--- a/data/items/bronze_bolts.yaml
+++ b/data/items/bronze_bolts.yaml
@@ -6,4 +6,4 @@ value: 1
stackable: true
equip_slot: ammo
stats:
- attack: 10
+ ranged_strength: 10
diff --git a/data/items/bronze_dagger.yaml b/data/items/bronze_dagger.yaml
index eca6cdb..95ec968 100644
--- a/data/items/bronze_dagger.yaml
+++ b/data/items/bronze_dagger.yaml
@@ -6,7 +6,10 @@ value: 8
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 3
- strength_bonus: 2
+ stab_attack: 5
+ slash_attack: 3
+ crush_attack: -1
+ strength_bonus: 4
speed: 3
diff --git a/data/items/bronze_full_helm.yaml b/data/items/bronze_full_helm.yaml
index 1823f80..ed006a8 100644
--- a/data/items/bronze_full_helm.yaml
+++ b/data/items/bronze_full_helm.yaml
@@ -6,4 +6,8 @@ value: 20
stackable: false
equip_slot: head
stats:
- defense_bonus: 4
+ stab_defense: 5
+ slash_defense: 6
+ crush_defense: 4
+ science_defense: -3
+ ranged_defense: 5
diff --git a/data/items/bronze_med_helm.yaml b/data/items/bronze_med_helm.yaml
index 7aad494..c9635cf 100644
--- a/data/items/bronze_med_helm.yaml
+++ b/data/items/bronze_med_helm.yaml
@@ -6,4 +6,8 @@ value: 8
stackable: false
equip_slot: head
stats:
- defense_bonus: 2
+ stab_defense: 3
+ slash_defense: 4
+ crush_defense: 2
+ science_defense: -1
+ ranged_defense: 3
diff --git a/data/items/bronze_pickaxe.yaml b/data/items/bronze_pickaxe.yaml
index 4ee8829..b581fc0 100644
--- a/data/items/bronze_pickaxe.yaml
+++ b/data/items/bronze_pickaxe.yaml
@@ -6,10 +6,12 @@ value: 10
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 2
- strength_bonus: 1
- defense_bonus: 0
+ stab_attack: 4
+ slash_attack: -2
+ crush_attack: 2
+ strength_bonus: 3
speed: 5
tool_type: pickaxe
tool_speed: 2
diff --git a/data/items/bronze_platebody.yaml b/data/items/bronze_platebody.yaml
index eea105b..8e6dd2c 100644
--- a/data/items/bronze_platebody.yaml
+++ b/data/items/bronze_platebody.yaml
@@ -6,4 +6,8 @@ value: 60
stackable: false
equip_slot: torso
stats:
- defense_bonus: 8
+ stab_defense: 12
+ slash_defense: 15
+ crush_defense: 10
+ science_defense: -10
+ ranged_defense: 12
diff --git a/data/items/bronze_sword.yaml b/data/items/bronze_sword.yaml
index 01a96ae..0cfdd0e 100644
--- a/data/items/bronze_sword.yaml
+++ b/data/items/bronze_sword.yaml
@@ -6,7 +6,10 @@ value: 12
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 4
- strength_bonus: 3
+ stab_attack: 4
+ slash_attack: 10
+ crush_attack: -2
+ strength_bonus: 7
speed: 4
diff --git a/data/items/cadantine.yaml b/data/items/cadantine.yaml
new file mode 100644
index 0000000..c422bf6
--- /dev/null
+++ b/data/items/cadantine.yaml
@@ -0,0 +1,6 @@
+id: cadantine
+name: "cadantine"
+color: "48"
+description: "A clean cadantine leaf, ready for use in pharmacy."
+value: 70
+stackable: false
diff --git a/data/items/cadantine_potion_unf.yaml b/data/items/cadantine_potion_unf.yaml
new file mode 100644
index 0000000..416d938
--- /dev/null
+++ b/data/items/cadantine_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: cadantine_potion_unf
+name: "cadantine potion (unf)"
+color: "48"
+description: "An unfinished potion with cadantine floating in water."
+value: 72
+stackable: false
+made_from:
+ - items: [cadantine]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/catalyst_wine.yaml b/data/items/catalyst_wine.yaml
new file mode 100644
index 0000000..fcfe1a0
--- /dev/null
+++ b/data/items/catalyst_wine.yaml
@@ -0,0 +1,6 @@
+id: catalyst_wine
+name: "catalyst wine"
+color: "124"
+description: "A volatile crimson wine infused with unstable compounds. Handle with care."
+value: 30
+stackable: false
diff --git a/data/items/chocolate_dust.yaml b/data/items/chocolate_dust.yaml
new file mode 100644
index 0000000..56a6666
--- /dev/null
+++ b/data/items/chocolate_dust.yaml
@@ -0,0 +1,6 @@
+id: chocolate_dust
+name: "chocolate dust"
+color: "94"
+description: "Finely ground chocolate. A surprisingly effective pharmaceutical binding agent."
+value: 5
+stackable: false
diff --git a/data/items/coif.yaml b/data/items/coif.yaml
index d789fc1..10c0c55 100644
--- a/data/items/coif.yaml
+++ b/data/items/coif.yaml
@@ -5,4 +5,9 @@ description: "A hard leather coif."
value: 45
equip_slot: head
stats:
- defense_bonus: 6
+ stab_defense: 2
+ slash_defense: 4
+ crush_defense: 2
+ science_defense: 4
+ ranged_defense: 6
+ ranged_attack: 2
diff --git a/data/items/crushed_nest.yaml b/data/items/crushed_nest.yaml
new file mode 100644
index 0000000..533d942
--- /dev/null
+++ b/data/items/crushed_nest.yaml
@@ -0,0 +1,6 @@
+id: crushed_nest
+name: "crushed nest"
+color: "94"
+description: "Finely crushed bird's nest material. Contains trace minerals used in advanced pharmacy."
+value: 25
+stackable: false
diff --git a/data/items/diamond_bolts.yaml b/data/items/diamond_bolts.yaml
index abdc46f..f3e8d83 100644
--- a/data/items/diamond_bolts.yaml
+++ b/data/items/diamond_bolts.yaml
@@ -6,4 +6,4 @@ value: 230
stackable: true
equip_slot: ammo
stats:
- attack: 52
+ ranged_strength: 52
diff --git a/data/items/dragon_axe.yaml b/data/items/dragon_axe.yaml
index 4484a51..e5afe5d 100644
--- a/data/items/dragon_axe.yaml
+++ b/data/items/dragon_axe.yaml
@@ -1,15 +1,17 @@
id: dragon_axe
name: dragon axe
color: "196"
-description: "A legendary dragon axe that bites through wood like butter."
-value: 100000
+description: "A powerful dragon axe."
+value: 50000
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 22
- strength_bonus: 14
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 43
+ crush_attack: 32
+ strength_bonus: 36
speed: 5
tool_type: axe
-tool_speed: 10
+tool_speed: 1
diff --git a/data/items/dragon_pickaxe.yaml b/data/items/dragon_pickaxe.yaml
index 0fa6a7c..a51b102 100644
--- a/data/items/dragon_pickaxe.yaml
+++ b/data/items/dragon_pickaxe.yaml
@@ -1,15 +1,17 @@
id: dragon_pickaxe
name: dragon pickaxe
color: "196"
-description: "A legendary dragon pickaxe that pulverizes rock."
-value: 100000
+description: "A powerful dragon pickaxe."
+value: 50000
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 22
- strength_bonus: 14
- defense_bonus: 0
+ stab_attack: 34
+ slash_attack: -2
+ crush_attack: 16
+ strength_bonus: 26
speed: 5
tool_type: pickaxe
-tool_speed: 8
+tool_speed: 0.25
diff --git a/data/items/dwarf_weed.yaml b/data/items/dwarf_weed.yaml
new file mode 100644
index 0000000..c21331b
--- /dev/null
+++ b/data/items/dwarf_weed.yaml
@@ -0,0 +1,6 @@
+id: dwarf_weed
+name: "dwarf weed"
+color: "48"
+description: "A clean dwarf weed leaf, ready for use in pharmacy."
+value: 85
+stackable: false
diff --git a/data/items/dwarf_weed_potion_unf.yaml b/data/items/dwarf_weed_potion_unf.yaml
new file mode 100644
index 0000000..1a9516e
--- /dev/null
+++ b/data/items/dwarf_weed_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: dwarf_weed_potion_unf
+name: "dwarf weed potion (unf)"
+color: "48"
+description: "An unfinished potion with dwarf weed floating in water."
+value: 88
+stackable: false
+made_from:
+ - items: [dwarf_weed]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/emerald_bolts.yaml b/data/items/emerald_bolts.yaml
index 6c9be22..b123d92 100644
--- a/data/items/emerald_bolts.yaml
+++ b/data/items/emerald_bolts.yaml
@@ -6,4 +6,4 @@ value: 65
stackable: true
equip_slot: ammo
stats:
- attack: 39
+ ranged_strength: 39
diff --git a/data/items/eye_of_newt.yaml b/data/items/eye_of_newt.yaml
new file mode 100644
index 0000000..baf5ebe
--- /dev/null
+++ b/data/items/eye_of_newt.yaml
@@ -0,0 +1,6 @@
+id: eye_of_newt
+name: "eye of newt"
+color: "215"
+description: "A preserved eye of newt, suspended in synthetic fluid. Used in pharmacy."
+value: 3
+stackable: false
diff --git a/data/items/full_restore.yaml b/data/items/full_restore.yaml
new file mode 100644
index 0000000..d34d94d
--- /dev/null
+++ b/data/items/full_restore.yaml
@@ -0,0 +1,6 @@
+id: full_restore
+name: "full restore"
+color: "207"
+description: "A shimmering pink potion. Restores all diminished stats simultaneously. [Effect not yet implemented]"
+value: 200
+stackable: false
diff --git a/data/items/grimy_avantoe.yaml b/data/items/grimy_avantoe.yaml
new file mode 100644
index 0000000..4f84679
--- /dev/null
+++ b/data/items/grimy_avantoe.yaml
@@ -0,0 +1,6 @@
+id: grimy_avantoe
+name: "grimy avantoe"
+color: "65"
+description: "A grimy avantoe leaf. It needs to be cleaned before it can be used."
+value: 35
+stackable: false
diff --git a/data/items/grimy_cadantine.yaml b/data/items/grimy_cadantine.yaml
new file mode 100644
index 0000000..0eb88f8
--- /dev/null
+++ b/data/items/grimy_cadantine.yaml
@@ -0,0 +1,6 @@
+id: grimy_cadantine
+name: "grimy cadantine"
+color: "65"
+description: "A grimy cadantine leaf. It needs to be cleaned before it can be used."
+value: 55
+stackable: false
diff --git a/data/items/grimy_dwarf_weed.yaml b/data/items/grimy_dwarf_weed.yaml
new file mode 100644
index 0000000..8f24595
--- /dev/null
+++ b/data/items/grimy_dwarf_weed.yaml
@@ -0,0 +1,6 @@
+id: grimy_dwarf_weed
+name: "grimy dwarf weed"
+color: "65"
+description: "A grimy dwarf weed leaf. It needs to be cleaned before it can be used."
+value: 65
+stackable: false
diff --git a/data/items/grimy_guam.yaml b/data/items/grimy_guam.yaml
new file mode 100644
index 0000000..fb408af
--- /dev/null
+++ b/data/items/grimy_guam.yaml
@@ -0,0 +1,6 @@
+id: grimy_guam
+name: "grimy guam"
+color: "65"
+description: "A grimy guam leaf. It needs to be cleaned before it can be used."
+value: 2
+stackable: false
diff --git a/data/items/grimy_harralander.yaml b/data/items/grimy_harralander.yaml
new file mode 100644
index 0000000..deea973
--- /dev/null
+++ b/data/items/grimy_harralander.yaml
@@ -0,0 +1,6 @@
+id: grimy_harralander
+name: "grimy harralander"
+color: "65"
+description: "A grimy harralander leaf. It needs to be cleaned before it can be used."
+value: 12
+stackable: false
diff --git a/data/items/grimy_irit.yaml b/data/items/grimy_irit.yaml
new file mode 100644
index 0000000..54f66f8
--- /dev/null
+++ b/data/items/grimy_irit.yaml
@@ -0,0 +1,6 @@
+id: grimy_irit
+name: "grimy irit"
+color: "65"
+description: "A grimy irit leaf. It needs to be cleaned before it can be used."
+value: 30
+stackable: false
diff --git a/data/items/grimy_kwuarm.yaml b/data/items/grimy_kwuarm.yaml
new file mode 100644
index 0000000..88630f8
--- /dev/null
+++ b/data/items/grimy_kwuarm.yaml
@@ -0,0 +1,6 @@
+id: grimy_kwuarm
+name: "grimy kwuarm"
+color: "65"
+description: "A grimy kwuarm leaf. It needs to be cleaned before it can be used."
+value: 40
+stackable: false
diff --git a/data/items/grimy_lantadyme.yaml b/data/items/grimy_lantadyme.yaml
new file mode 100644
index 0000000..8003931
--- /dev/null
+++ b/data/items/grimy_lantadyme.yaml
@@ -0,0 +1,6 @@
+id: grimy_lantadyme
+name: "grimy lantadyme"
+color: "65"
+description: "A grimy lantadyme leaf. It needs to be cleaned before it can be used."
+value: 60
+stackable: false
diff --git a/data/items/grimy_marrentill.yaml b/data/items/grimy_marrentill.yaml
new file mode 100644
index 0000000..7548fe5
--- /dev/null
+++ b/data/items/grimy_marrentill.yaml
@@ -0,0 +1,6 @@
+id: grimy_marrentill
+name: "grimy marrentill"
+color: "65"
+description: "A grimy marrentill leaf. It needs to be cleaned before it can be used."
+value: 4
+stackable: false
diff --git a/data/items/grimy_ranarr.yaml b/data/items/grimy_ranarr.yaml
new file mode 100644
index 0000000..1f82277
--- /dev/null
+++ b/data/items/grimy_ranarr.yaml
@@ -0,0 +1,6 @@
+id: grimy_ranarr
+name: "grimy ranarr"
+color: "65"
+description: "A grimy ranarr leaf. It needs to be cleaned before it can be used."
+value: 25
+stackable: false
diff --git a/data/items/grimy_snapdragon.yaml b/data/items/grimy_snapdragon.yaml
new file mode 100644
index 0000000..f15c604
--- /dev/null
+++ b/data/items/grimy_snapdragon.yaml
@@ -0,0 +1,6 @@
+id: grimy_snapdragon
+name: "grimy snapdragon"
+color: "65"
+description: "A grimy snapdragon leaf. It needs to be cleaned before it can be used."
+value: 50
+stackable: false
diff --git a/data/items/grimy_tarromin.yaml b/data/items/grimy_tarromin.yaml
new file mode 100644
index 0000000..712061c
--- /dev/null
+++ b/data/items/grimy_tarromin.yaml
@@ -0,0 +1,6 @@
+id: grimy_tarromin
+name: "grimy tarromin"
+color: "65"
+description: "A grimy tarromin leaf. It needs to be cleaned before it can be used."
+value: 7
+stackable: false
diff --git a/data/items/grimy_toadflax.yaml b/data/items/grimy_toadflax.yaml
new file mode 100644
index 0000000..c489566
--- /dev/null
+++ b/data/items/grimy_toadflax.yaml
@@ -0,0 +1,6 @@
+id: grimy_toadflax
+name: "grimy toadflax"
+color: "65"
+description: "A grimy toadflax leaf. It needs to be cleaned before it can be used."
+value: 18
+stackable: false
diff --git a/data/items/grimy_torstol.yaml b/data/items/grimy_torstol.yaml
new file mode 100644
index 0000000..47db8d7
--- /dev/null
+++ b/data/items/grimy_torstol.yaml
@@ -0,0 +1,6 @@
+id: grimy_torstol
+name: "grimy torstol"
+color: "65"
+description: "A grimy torstol leaf. It needs to be cleaned before it can be used."
+value: 75
+stackable: false
diff --git a/data/items/guam.yaml b/data/items/guam.yaml
new file mode 100644
index 0000000..98135be
--- /dev/null
+++ b/data/items/guam.yaml
@@ -0,0 +1,6 @@
+id: guam
+name: "guam"
+color: "48"
+description: "A clean guam leaf, ready for use in pharmacy."
+value: 3
+stackable: false
diff --git a/data/items/guam_potion_unf.yaml b/data/items/guam_potion_unf.yaml
new file mode 100644
index 0000000..970a9d2
--- /dev/null
+++ b/data/items/guam_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: guam_potion_unf
+name: "guam potion (unf)"
+color: "48"
+description: "An unfinished potion with guam floating in water."
+value: 5
+stackable: false
+made_from:
+ - items: [guam]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/hard_leather_body.yaml b/data/items/hard_leather_body.yaml
index ef05226..4fe2829 100644
--- a/data/items/hard_leather_body.yaml
+++ b/data/items/hard_leather_body.yaml
@@ -5,4 +5,8 @@ description: "A hardened leather body armour."
value: 60
equip_slot: torso
stats:
- defense_bonus: 12
+ stab_defense: 8
+ slash_defense: 12
+ crush_defense: 8
+ science_defense: 6
+ ranged_defense: 14
diff --git a/data/items/hard_leather_shield.yaml b/data/items/hard_leather_shield.yaml
index 3dc0f30..26c28de 100644
--- a/data/items/hard_leather_shield.yaml
+++ b/data/items/hard_leather_shield.yaml
@@ -5,4 +5,8 @@ description: "A shield made of hardened leather."
value: 55
equip_slot: off_hand
stats:
- defense_bonus: 8
+ stab_defense: 5
+ slash_defense: 7
+ crush_defense: 5
+ science_defense: 4
+ ranged_defense: 8
diff --git a/data/items/harralander.yaml b/data/items/harralander.yaml
new file mode 100644
index 0000000..d8f90a4
--- /dev/null
+++ b/data/items/harralander.yaml
@@ -0,0 +1,6 @@
+id: harralander
+name: "harralander"
+color: "48"
+description: "A clean harralander leaf, ready for use in pharmacy."
+value: 16
+stackable: false
diff --git a/data/items/harralander_potion_unf.yaml b/data/items/harralander_potion_unf.yaml
new file mode 100644
index 0000000..bd578c2
--- /dev/null
+++ b/data/items/harralander_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: harralander_potion_unf
+name: "harralander potion (unf)"
+color: "48"
+description: "An unfinished potion with harralander floating in water."
+value: 18
+stackable: false
+made_from:
+ - items: [harralander]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/irit.yaml b/data/items/irit.yaml
new file mode 100644
index 0000000..b4d4b56
--- /dev/null
+++ b/data/items/irit.yaml
@@ -0,0 +1,6 @@
+id: irit
+name: "irit"
+color: "48"
+description: "A clean irit leaf, ready for use in pharmacy."
+value: 40
+stackable: false
diff --git a/data/items/irit_potion_unf.yaml b/data/items/irit_potion_unf.yaml
new file mode 100644
index 0000000..d10a19a
--- /dev/null
+++ b/data/items/irit_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: irit_potion_unf
+name: "irit potion (unf)"
+color: "48"
+description: "An unfinished potion with irit floating in water."
+value: 42
+stackable: false
+made_from:
+ - items: [irit]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/iron_arrow.yaml b/data/items/iron_arrow.yaml
index c4f698b..ebadaec 100644
--- a/data/items/iron_arrow.yaml
+++ b/data/items/iron_arrow.yaml
@@ -6,4 +6,4 @@ value: 2
stackable: true
equip_slot: ammo
stats:
- attack: 10
+ ranged_strength: 10
diff --git a/data/items/iron_axe.yaml b/data/items/iron_axe.yaml
index 99cfc8b..3f989ca 100644
--- a/data/items/iron_axe.yaml
+++ b/data/items/iron_axe.yaml
@@ -1,15 +1,17 @@
id: iron_axe
name: iron axe
color: "250"
-description: "A solid iron axe, better than bronze."
-value: 50
+description: "A sturdy iron axe, good for woodcutting."
+value: 25
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 3
- strength_bonus: 2
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 10
+ crush_attack: 7
+ strength_bonus: 8
speed: 5
tool_type: axe
-tool_speed: 5
+tool_speed: 3.5
diff --git a/data/items/iron_bolts.yaml b/data/items/iron_bolts.yaml
index 7b75132..ed81578 100644
--- a/data/items/iron_bolts.yaml
+++ b/data/items/iron_bolts.yaml
@@ -6,4 +6,4 @@ value: 3
stackable: true
equip_slot: ammo
stats:
- attack: 17
+ ranged_strength: 17
diff --git a/data/items/iron_dagger.yaml b/data/items/iron_dagger.yaml
index d11b9ad..8fa645c 100644
--- a/data/items/iron_dagger.yaml
+++ b/data/items/iron_dagger.yaml
@@ -6,7 +6,10 @@ value: 20
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 5
- strength_bonus: 3
+ stab_attack: 8
+ slash_attack: 5
+ crush_attack: -1
+ strength_bonus: 7
speed: 3
diff --git a/data/items/iron_full_helm.yaml b/data/items/iron_full_helm.yaml
index f0e95f9..3a2fc0c 100644
--- a/data/items/iron_full_helm.yaml
+++ b/data/items/iron_full_helm.yaml
@@ -6,4 +6,8 @@ value: 50
stackable: false
equip_slot: head
stats:
- defense_bonus: 6
+ stab_defense: 8
+ slash_defense: 9
+ crush_defense: 6
+ science_defense: -3
+ ranged_defense: 8
diff --git a/data/items/iron_med_helm.yaml b/data/items/iron_med_helm.yaml
index 26585e4..6956283 100644
--- a/data/items/iron_med_helm.yaml
+++ b/data/items/iron_med_helm.yaml
@@ -6,4 +6,8 @@ value: 20
stackable: false
equip_slot: head
stats:
- defense_bonus: 4
+ stab_defense: 5
+ slash_defense: 6
+ crush_defense: 3
+ science_defense: -1
+ ranged_defense: 5
diff --git a/data/items/iron_pickaxe.yaml b/data/items/iron_pickaxe.yaml
index 5682883..d120fde 100644
--- a/data/items/iron_pickaxe.yaml
+++ b/data/items/iron_pickaxe.yaml
@@ -1,15 +1,17 @@
id: iron_pickaxe
name: iron pickaxe
color: "250"
-description: "A solid iron pickaxe, better than bronze."
-value: 50
+description: "A sturdy iron pickaxe, good for mining."
+value: 25
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 3
- strength_bonus: 2
- defense_bonus: 0
+ stab_attack: 7
+ slash_attack: -2
+ crush_attack: 3
+ strength_bonus: 5
speed: 5
tool_type: pickaxe
-tool_speed: 3
+tool_speed: 1.5
diff --git a/data/items/iron_platebody.yaml b/data/items/iron_platebody.yaml
index 783d099..3c0be80 100644
--- a/data/items/iron_platebody.yaml
+++ b/data/items/iron_platebody.yaml
@@ -6,4 +6,8 @@ value: 150
stackable: false
equip_slot: torso
stats:
- defense_bonus: 12
+ stab_defense: 18
+ slash_defense: 22
+ crush_defense: 14
+ science_defense: -10
+ ranged_defense: 18
diff --git a/data/items/iron_sword.yaml b/data/items/iron_sword.yaml
index 3e0b577..a5711fc 100644
--- a/data/items/iron_sword.yaml
+++ b/data/items/iron_sword.yaml
@@ -6,7 +6,10 @@ value: 30
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 6
- strength_bonus: 4
+ stab_attack: 7
+ slash_attack: 15
+ crush_attack: -2
+ strength_bonus: 10
speed: 4
diff --git a/data/items/kwuarm.yaml b/data/items/kwuarm.yaml
new file mode 100644
index 0000000..2cd0a4e
--- /dev/null
+++ b/data/items/kwuarm.yaml
@@ -0,0 +1,6 @@
+id: kwuarm
+name: "kwuarm"
+color: "48"
+description: "A clean kwuarm leaf, ready for use in pharmacy."
+value: 54
+stackable: false
diff --git a/data/items/kwuarm_potion_unf.yaml b/data/items/kwuarm_potion_unf.yaml
new file mode 100644
index 0000000..750a47a
--- /dev/null
+++ b/data/items/kwuarm_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: kwuarm_potion_unf
+name: "kwuarm potion (unf)"
+color: "48"
+description: "An unfinished potion with kwuarm floating in water."
+value: 56
+stackable: false
+made_from:
+ - items: [kwuarm]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/lantadyme.yaml b/data/items/lantadyme.yaml
new file mode 100644
index 0000000..35840d8
--- /dev/null
+++ b/data/items/lantadyme.yaml
@@ -0,0 +1,6 @@
+id: lantadyme
+name: "lantadyme"
+color: "48"
+description: "A clean lantadyme leaf, ready for use in pharmacy."
+value: 78
+stackable: false
diff --git a/data/items/lantadyme_potion_unf.yaml b/data/items/lantadyme_potion_unf.yaml
new file mode 100644
index 0000000..bc66c3c
--- /dev/null
+++ b/data/items/lantadyme_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: lantadyme_potion_unf
+name: "lantadyme potion (unf)"
+color: "48"
+description: "An unfinished potion with lantadyme floating in water."
+value: 80
+stackable: false
+made_from:
+ - items: [lantadyme]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/leather_body.yaml b/data/items/leather_body.yaml
index 78dcdf4..e69342c 100644
--- a/data/items/leather_body.yaml
+++ b/data/items/leather_body.yaml
@@ -5,4 +5,8 @@ description: "A leather body armour."
value: 25
equip_slot: torso
stats:
- defense_bonus: 8
+ stab_defense: 4
+ slash_defense: 7
+ crush_defense: 5
+ science_defense: 4
+ ranged_defense: 10
diff --git a/data/items/leather_boots.yaml b/data/items/leather_boots.yaml
index 296d9c7..7716e95 100644
--- a/data/items/leather_boots.yaml
+++ b/data/items/leather_boots.yaml
@@ -5,4 +5,8 @@ description: "A pair of leather boots."
value: 12
equip_slot: feet
stats:
- defense_bonus: 2
+ stab_defense: 1
+ slash_defense: 1
+ crush_defense: 1
+ science_defense: 1
+ ranged_defense: 2
diff --git a/data/items/leather_chaps.yaml b/data/items/leather_chaps.yaml
index 38301f9..1a17c16 100644
--- a/data/items/leather_chaps.yaml
+++ b/data/items/leather_chaps.yaml
@@ -5,4 +5,8 @@ description: "A pair of leather chaps."
value: 20
equip_slot: legs
stats:
- defense_bonus: 6
+ stab_defense: 2
+ slash_defense: 4
+ crush_defense: 3
+ science_defense: 3
+ ranged_defense: 6
diff --git a/data/items/leather_cowl.yaml b/data/items/leather_cowl.yaml
index e8fe399..aa5965a 100644
--- a/data/items/leather_cowl.yaml
+++ b/data/items/leather_cowl.yaml
@@ -5,4 +5,8 @@ description: "A leather cowl."
value: 15
equip_slot: head
stats:
- defense_bonus: 3
+ stab_defense: 1
+ slash_defense: 2
+ crush_defense: 1
+ science_defense: 2
+ ranged_defense: 4
diff --git a/data/items/leather_gloves.yaml b/data/items/leather_gloves.yaml
index 1924954..7590fee 100644
--- a/data/items/leather_gloves.yaml
+++ b/data/items/leather_gloves.yaml
@@ -5,4 +5,8 @@ description: "A pair of leather gloves."
value: 10
equip_slot: hands
stats:
- defense_bonus: 2
+ stab_defense: 1
+ slash_defense: 1
+ crush_defense: 1
+ science_defense: 1
+ ranged_defense: 2
diff --git a/data/items/leather_vambraces.yaml b/data/items/leather_vambraces.yaml
index 4edfddc..fa59aa9 100644
--- a/data/items/leather_vambraces.yaml
+++ b/data/items/leather_vambraces.yaml
@@ -5,4 +5,9 @@ description: "A pair of leather vambraces."
value: 18
equip_slot: hands
stats:
- defense_bonus: 4
+ stab_defense: 2
+ slash_defense: 2
+ crush_defense: 2
+ science_defense: 2
+ ranged_defense: 4
+ ranged_attack: 4
diff --git a/data/items/limpwurt_root.yaml b/data/items/limpwurt_root.yaml
new file mode 100644
index 0000000..49dd0dc
--- /dev/null
+++ b/data/items/limpwurt_root.yaml
@@ -0,0 +1,6 @@
+id: limpwurt_root
+name: "limpwurt root"
+color: "130"
+description: "A thick, gnarled root with natural stimulant properties."
+value: 8
+stackable: false
diff --git a/data/items/longbow.yaml b/data/items/longbow.yaml
index b9de1cb..f40c96d 100644
--- a/data/items/longbow.yaml
+++ b/data/items/longbow.yaml
@@ -5,6 +5,7 @@ description: "A longbow."
value: 20
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 6
stats:
- attack: 8
+ ranged_attack: 8
diff --git a/data/items/magic_longbow.yaml b/data/items/magic_longbow.yaml
index fbe3b4e..c91eb02 100644
--- a/data/items/magic_longbow.yaml
+++ b/data/items/magic_longbow.yaml
@@ -5,6 +5,7 @@ description: "A magic longbow."
value: 6000
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 6
stats:
- attack: 69
+ ranged_attack: 69
diff --git a/data/items/magic_shortbow.yaml b/data/items/magic_shortbow.yaml
index 26b152a..b50916b 100644
--- a/data/items/magic_shortbow.yaml
+++ b/data/items/magic_shortbow.yaml
@@ -5,6 +5,7 @@ description: "A magic shortbow."
value: 4000
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 4
stats:
- attack: 69
+ ranged_attack: 69
diff --git a/data/items/maple_longbow.yaml b/data/items/maple_longbow.yaml
index 6a5e2f6..078e72a 100644
--- a/data/items/maple_longbow.yaml
+++ b/data/items/maple_longbow.yaml
@@ -5,6 +5,7 @@ description: "A maple longbow."
value: 1280
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 6
stats:
- attack: 29
+ ranged_attack: 29
diff --git a/data/items/maple_shortbow.yaml b/data/items/maple_shortbow.yaml
index a61b7d9..5e6ae66 100644
--- a/data/items/maple_shortbow.yaml
+++ b/data/items/maple_shortbow.yaml
@@ -5,6 +5,7 @@ description: "A maple shortbow."
value: 640
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 4
stats:
- attack: 29
+ ranged_attack: 29
diff --git a/data/items/marrentill.yaml b/data/items/marrentill.yaml
new file mode 100644
index 0000000..486d7fd
--- /dev/null
+++ b/data/items/marrentill.yaml
@@ -0,0 +1,6 @@
+id: marrentill
+name: "marrentill"
+color: "48"
+description: "A clean marrentill leaf, ready for use in pharmacy."
+value: 6
+stackable: false
diff --git a/data/items/marrentill_potion_unf.yaml b/data/items/marrentill_potion_unf.yaml
new file mode 100644
index 0000000..e7b3817
--- /dev/null
+++ b/data/items/marrentill_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: marrentill_potion_unf
+name: "marrentill potion (unf)"
+color: "48"
+description: "An unfinished potion with marrentill floating in water."
+value: 8
+stackable: false
+made_from:
+ - items: [marrentill]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/mithril_arrow.yaml b/data/items/mithril_arrow.yaml
index e92bfeb..23464e9 100644
--- a/data/items/mithril_arrow.yaml
+++ b/data/items/mithril_arrow.yaml
@@ -6,4 +6,4 @@ value: 10
stackable: true
equip_slot: ammo
stats:
- attack: 22
+ ranged_strength: 22
diff --git a/data/items/mithril_axe.yaml b/data/items/mithril_axe.yaml
index 09f6423..83cefe9 100644
--- a/data/items/mithril_axe.yaml
+++ b/data/items/mithril_axe.yaml
@@ -1,15 +1,17 @@
id: mithril_axe
name: mithril axe
color: "75"
-description: "A lightweight mithril axe."
-value: 500
+description: "A sturdy mithril axe, good for woodcutting."
+value: 200
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 9
- strength_bonus: 5
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 21
+ crush_attack: 16
+ strength_bonus: 17
speed: 5
tool_type: axe
-tool_speed: 7
+tool_speed: 2.5
diff --git a/data/items/mithril_bolts.yaml b/data/items/mithril_bolts.yaml
index f3b852e..e160065 100644
--- a/data/items/mithril_bolts.yaml
+++ b/data/items/mithril_bolts.yaml
@@ -6,4 +6,4 @@ value: 12
stackable: true
equip_slot: ammo
stats:
- attack: 32
+ ranged_strength: 32
diff --git a/data/items/mithril_dagger.yaml b/data/items/mithril_dagger.yaml
index 9582f8b..21d99ba 100644
--- a/data/items/mithril_dagger.yaml
+++ b/data/items/mithril_dagger.yaml
@@ -6,7 +6,10 @@ value: 150
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 10
- strength_bonus: 7
+ stab_attack: 17
+ slash_attack: 10
+ crush_attack: -1
+ strength_bonus: 14
speed: 3
diff --git a/data/items/mithril_full_helm.yaml b/data/items/mithril_full_helm.yaml
index 73d59de..a8e4f07 100644
--- a/data/items/mithril_full_helm.yaml
+++ b/data/items/mithril_full_helm.yaml
@@ -6,4 +6,8 @@ value: 400
stackable: false
equip_slot: head
stats:
- defense_bonus: 13
+ stab_defense: 16
+ slash_defense: 18
+ crush_defense: 12
+ science_defense: -6
+ ranged_defense: 16
diff --git a/data/items/mithril_med_helm.yaml b/data/items/mithril_med_helm.yaml
index 35e8dd4..7616a01 100644
--- a/data/items/mithril_med_helm.yaml
+++ b/data/items/mithril_med_helm.yaml
@@ -6,4 +6,8 @@ value: 150
stackable: false
equip_slot: head
stats:
- defense_bonus: 9
+ stab_defense: 10
+ slash_defense: 12
+ crush_defense: 7
+ science_defense: -3
+ ranged_defense: 10
diff --git a/data/items/mithril_pickaxe.yaml b/data/items/mithril_pickaxe.yaml
index 032006c..38fa44f 100644
--- a/data/items/mithril_pickaxe.yaml
+++ b/data/items/mithril_pickaxe.yaml
@@ -1,15 +1,17 @@
id: mithril_pickaxe
name: mithril pickaxe
color: "75"
-description: "A lightweight mithril pickaxe."
-value: 500
+description: "A sturdy mithril pickaxe, good for mining."
+value: 200
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 9
- strength_bonus: 5
- defense_bonus: 0
+ stab_attack: 17
+ slash_attack: -2
+ crush_attack: 8
+ strength_bonus: 12
speed: 5
tool_type: pickaxe
-tool_speed: 5
+tool_speed: 1
diff --git a/data/items/mithril_platebody.yaml b/data/items/mithril_platebody.yaml
index 506938a..b40a483 100644
--- a/data/items/mithril_platebody.yaml
+++ b/data/items/mithril_platebody.yaml
@@ -6,4 +6,8 @@ value: 1500
stackable: false
equip_slot: torso
stats:
- defense_bonus: 25
+ stab_defense: 36
+ slash_defense: 42
+ crush_defense: 30
+ science_defense: -20
+ ranged_defense: 36
diff --git a/data/items/mithril_sword.yaml b/data/items/mithril_sword.yaml
index b5f5562..f006ab7 100644
--- a/data/items/mithril_sword.yaml
+++ b/data/items/mithril_sword.yaml
@@ -6,7 +6,10 @@ value: 250
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 13
- strength_bonus: 10
+ stab_attack: 14
+ slash_attack: 30
+ crush_attack: -2
+ strength_bonus: 20
speed: 4
diff --git a/data/items/nano_restore.yaml b/data/items/nano_restore.yaml
new file mode 100644
index 0000000..2714b9f
--- /dev/null
+++ b/data/items/nano_restore.yaml
@@ -0,0 +1,6 @@
+id: nano_restore
+name: "nano restore"
+color: "208"
+description: "An orange potion containing nanobots that restore diminished attributes. [Effect not yet implemented]"
+value: 70
+stackable: false
diff --git a/data/items/oak_longbow.yaml b/data/items/oak_longbow.yaml
index b66535e..12c8296 100644
--- a/data/items/oak_longbow.yaml
+++ b/data/items/oak_longbow.yaml
@@ -5,6 +5,7 @@ description: "An oak longbow."
value: 80
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 6
stats:
- attack: 14
+ ranged_attack: 14
diff --git a/data/items/oak_shortbow.yaml b/data/items/oak_shortbow.yaml
index 550b210..a77cb2b 100644
--- a/data/items/oak_shortbow.yaml
+++ b/data/items/oak_shortbow.yaml
@@ -5,6 +5,7 @@ description: "An oak shortbow."
value: 40
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 4
stats:
- attack: 14
+ ranged_attack: 14
diff --git a/data/items/potato_cactus.yaml b/data/items/potato_cactus.yaml
new file mode 100644
index 0000000..1178727
--- /dev/null
+++ b/data/items/potato_cactus.yaml
@@ -0,0 +1,6 @@
+id: potato_cactus
+name: "potato cactus"
+color: "106"
+description: "A bulbous cactus with medicinal properties. Thrives in the arid zones."
+value: 18
+stackable: false
diff --git a/data/items/ranarr.yaml b/data/items/ranarr.yaml
new file mode 100644
index 0000000..690e2d0
--- /dev/null
+++ b/data/items/ranarr.yaml
@@ -0,0 +1,6 @@
+id: ranarr
+name: "ranarr"
+color: "48"
+description: "A clean ranarr leaf, ready for use in pharmacy."
+value: 35
+stackable: false
diff --git a/data/items/ranarr_potion_unf.yaml b/data/items/ranarr_potion_unf.yaml
new file mode 100644
index 0000000..373abb6
--- /dev/null
+++ b/data/items/ranarr_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: ranarr_potion_unf
+name: "ranarr potion (unf)"
+color: "48"
+description: "An unfinished potion with ranarr floating in water."
+value: 38
+stackable: false
+made_from:
+ - items: [ranarr]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/restoration_compound.yaml b/data/items/restoration_compound.yaml
new file mode 100644
index 0000000..b4179bc
--- /dev/null
+++ b/data/items/restoration_compound.yaml
@@ -0,0 +1,6 @@
+id: restoration_compound
+name: "restoration compound"
+color: "214"
+description: "A golden compound that restores hitpoints and boosts defense, but drains other stats. [Effect not yet implemented]"
+value: 250
+stackable: false
diff --git a/data/items/ruby_bolts.yaml b/data/items/ruby_bolts.yaml
index 3788d2c..cf50f5e 100644
--- a/data/items/ruby_bolts.yaml
+++ b/data/items/ruby_bolts.yaml
@@ -6,4 +6,4 @@ value: 130
stackable: true
equip_slot: ammo
stats:
- attack: 49
+ ranged_strength: 49
diff --git a/data/items/rune_arrow.yaml b/data/items/rune_arrow.yaml
index a7a3e2f..b00e922 100644
--- a/data/items/rune_arrow.yaml
+++ b/data/items/rune_arrow.yaml
@@ -6,4 +6,4 @@ value: 40
stackable: true
equip_slot: ammo
stats:
- attack: 49
+ ranged_strength: 49
diff --git a/data/items/rune_axe.yaml b/data/items/rune_axe.yaml
index da9b54f..584b345 100644
--- a/data/items/rune_axe.yaml
+++ b/data/items/rune_axe.yaml
@@ -1,15 +1,17 @@
id: rune_axe
name: rune axe
color: "87"
-description: "An extremely sharp rune axe."
-value: 40000
+description: "A sturdy rune axe, good for woodcutting."
+value: 5000
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 16
- strength_bonus: 10
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 38
+ crush_attack: 29
+ strength_bonus: 32
speed: 5
tool_type: axe
-tool_speed: 9
+tool_speed: 1.5
diff --git a/data/items/rune_bolts.yaml b/data/items/rune_bolts.yaml
index 7f0f5af..82ac597 100644
--- a/data/items/rune_bolts.yaml
+++ b/data/items/rune_bolts.yaml
@@ -6,4 +6,4 @@ value: 48
stackable: true
equip_slot: ammo
stats:
- attack: 55
+ ranged_strength: 55
diff --git a/data/items/rune_dagger.yaml b/data/items/rune_dagger.yaml
index 86360f2..7904b5a 100644
--- a/data/items/rune_dagger.yaml
+++ b/data/items/rune_dagger.yaml
@@ -6,7 +6,10 @@ value: 5000
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 19
- strength_bonus: 14
+ stab_attack: 30
+ slash_attack: 18
+ crush_attack: -1
+ strength_bonus: 24
speed: 3
diff --git a/data/items/rune_full_helm.yaml b/data/items/rune_full_helm.yaml
index f91521b..d8badb7 100644
--- a/data/items/rune_full_helm.yaml
+++ b/data/items/rune_full_helm.yaml
@@ -6,4 +6,8 @@ value: 12000
stackable: false
equip_slot: head
stats:
- defense_bonus: 22
+ stab_defense: 30
+ slash_defense: 33
+ crush_defense: 22
+ science_defense: -11
+ ranged_defense: 30
diff --git a/data/items/rune_med_helm.yaml b/data/items/rune_med_helm.yaml
index 32e5358..39d16ae 100644
--- a/data/items/rune_med_helm.yaml
+++ b/data/items/rune_med_helm.yaml
@@ -6,4 +6,8 @@ value: 5000
stackable: false
equip_slot: head
stats:
- defense_bonus: 16
+ stab_defense: 19
+ slash_defense: 22
+ crush_defense: 13
+ science_defense: -4
+ ranged_defense: 19
diff --git a/data/items/rune_pickaxe.yaml b/data/items/rune_pickaxe.yaml
index bdb69f0..2b63965 100644
--- a/data/items/rune_pickaxe.yaml
+++ b/data/items/rune_pickaxe.yaml
@@ -1,15 +1,17 @@
id: rune_pickaxe
name: rune pickaxe
color: "87"
-description: "An extremely durable rune pickaxe."
-value: 40000
+description: "A sturdy rune pickaxe, good for mining."
+value: 5000
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 16
- strength_bonus: 10
- defense_bonus: 0
+ stab_attack: 30
+ slash_attack: -2
+ crush_attack: 14
+ strength_bonus: 22
speed: 5
tool_type: pickaxe
-tool_speed: 7
+tool_speed: 0.5
diff --git a/data/items/rune_platebody.yaml b/data/items/rune_platebody.yaml
index b06efac..78bdaa1 100644
--- a/data/items/rune_platebody.yaml
+++ b/data/items/rune_platebody.yaml
@@ -6,4 +6,8 @@ value: 40000
stackable: false
equip_slot: torso
stats:
- defense_bonus: 42
+ stab_defense: 65
+ slash_defense: 72
+ crush_defense: 52
+ science_defense: -30
+ ranged_defense: 65
diff --git a/data/items/rune_sword.yaml b/data/items/rune_sword.yaml
index 6539b59..21b4c73 100644
--- a/data/items/rune_sword.yaml
+++ b/data/items/rune_sword.yaml
@@ -6,7 +6,10 @@ value: 10000
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 23
- strength_bonus: 18
+ stab_attack: 27
+ slash_attack: 52
+ crush_attack: -2
+ strength_bonus: 36
speed: 4
diff --git a/data/items/sapphire_bolts.yaml b/data/items/sapphire_bolts.yaml
index c9d1b4e..e465e91 100644
--- a/data/items/sapphire_bolts.yaml
+++ b/data/items/sapphire_bolts.yaml
@@ -6,4 +6,4 @@ value: 40
stackable: true
equip_slot: ammo
stats:
- attack: 36
+ ranged_strength: 36
diff --git a/data/items/science_serum.yaml b/data/items/science_serum.yaml
new file mode 100644
index 0000000..08b807e
--- /dev/null
+++ b/data/items/science_serum.yaml
@@ -0,0 +1,6 @@
+id: science_serum
+name: "science serum"
+color: "93"
+description: "A violet serum that heightens scientific cognition and casting ability. [Effect not yet implemented]"
+value: 200
+stackable: false
diff --git a/data/items/shield_potion.yaml b/data/items/shield_potion.yaml
new file mode 100644
index 0000000..ccc2d0b
--- /dev/null
+++ b/data/items/shield_potion.yaml
@@ -0,0 +1,6 @@
+id: shield_potion
+name: "shield potion"
+color: "39"
+description: "A luminous blue potion that temporarily reinforces defensive capability. [Effect not yet implemented]"
+value: 85
+stackable: false
diff --git a/data/items/shortbow.yaml b/data/items/shortbow.yaml
index e5b1975..ecd3630 100644
--- a/data/items/shortbow.yaml
+++ b/data/items/shortbow.yaml
@@ -5,6 +5,7 @@ description: "A shortbow."
value: 10
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 4
stats:
- attack: 8
+ ranged_attack: 8
diff --git a/data/items/snapdragon.yaml b/data/items/snapdragon.yaml
new file mode 100644
index 0000000..c963313
--- /dev/null
+++ b/data/items/snapdragon.yaml
@@ -0,0 +1,6 @@
+id: snapdragon
+name: "snapdragon"
+color: "48"
+description: "A clean snapdragon leaf, ready for use in pharmacy."
+value: 65
+stackable: false
diff --git a/data/items/snapdragon_potion_unf.yaml b/data/items/snapdragon_potion_unf.yaml
new file mode 100644
index 0000000..ac3aba3
--- /dev/null
+++ b/data/items/snapdragon_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: snapdragon_potion_unf
+name: "snapdragon potion (unf)"
+color: "48"
+description: "An unfinished potion with snapdragon floating in water."
+value: 68
+stackable: false
+made_from:
+ - items: [snapdragon]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/snape_grass.yaml b/data/items/snape_grass.yaml
new file mode 100644
index 0000000..59a9b30
--- /dev/null
+++ b/data/items/snape_grass.yaml
@@ -0,0 +1,6 @@
+id: snape_grass
+name: "snape grass"
+color: "120"
+description: "A long blade of snape grass. It crackles with faint static charge."
+value: 10
+stackable: false
diff --git a/data/items/steel_arrow.yaml b/data/items/steel_arrow.yaml
index 9c93e0b..e14171f 100644
--- a/data/items/steel_arrow.yaml
+++ b/data/items/steel_arrow.yaml
@@ -6,4 +6,4 @@ value: 5
stackable: true
equip_slot: ammo
stats:
- attack: 16
+ ranged_strength: 16
diff --git a/data/items/steel_axe.yaml b/data/items/steel_axe.yaml
index 5f03609..74075e8 100644
--- a/data/items/steel_axe.yaml
+++ b/data/items/steel_axe.yaml
@@ -1,15 +1,17 @@
id: steel_axe
name: steel axe
color: "253"
-description: "A sharp steel axe for serious woodcutting."
-value: 200
+description: "A sturdy steel axe, good for woodcutting."
+value: 75
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 5
- strength_bonus: 3
- defense_bonus: 0
+ stab_attack: -2
+ slash_attack: 15
+ crush_attack: 11
+ strength_bonus: 12
speed: 5
tool_type: axe
-tool_speed: 6
+tool_speed: 3
diff --git a/data/items/steel_bolts.yaml b/data/items/steel_bolts.yaml
index 20ed5f6..7dfadf1 100644
--- a/data/items/steel_bolts.yaml
+++ b/data/items/steel_bolts.yaml
@@ -6,4 +6,4 @@ value: 6
stackable: true
equip_slot: ammo
stats:
- attack: 25
+ ranged_strength: 25
diff --git a/data/items/steel_dagger.yaml b/data/items/steel_dagger.yaml
index 2022f76..2aa079b 100644
--- a/data/items/steel_dagger.yaml
+++ b/data/items/steel_dagger.yaml
@@ -6,7 +6,10 @@ value: 60
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 7
- strength_bonus: 5
+ stab_attack: 12
+ slash_attack: 7
+ crush_attack: -1
+ strength_bonus: 10
speed: 3
diff --git a/data/items/steel_full_helm.yaml b/data/items/steel_full_helm.yaml
index dd2c59b..11ce736 100644
--- a/data/items/steel_full_helm.yaml
+++ b/data/items/steel_full_helm.yaml
@@ -6,4 +6,8 @@ value: 150
stackable: false
equip_slot: head
stats:
- defense_bonus: 9
+ stab_defense: 12
+ slash_defense: 13
+ crush_defense: 9
+ science_defense: -5
+ ranged_defense: 12
diff --git a/data/items/steel_med_helm.yaml b/data/items/steel_med_helm.yaml
index bad3e07..336020c 100644
--- a/data/items/steel_med_helm.yaml
+++ b/data/items/steel_med_helm.yaml
@@ -6,4 +6,8 @@ value: 60
stackable: false
equip_slot: head
stats:
- defense_bonus: 6
+ stab_defense: 7
+ slash_defense: 9
+ crush_defense: 5
+ science_defense: -2
+ ranged_defense: 7
diff --git a/data/items/steel_pickaxe.yaml b/data/items/steel_pickaxe.yaml
index 466ce0f..875a84b 100644
--- a/data/items/steel_pickaxe.yaml
+++ b/data/items/steel_pickaxe.yaml
@@ -1,15 +1,17 @@
id: steel_pickaxe
name: steel pickaxe
color: "253"
-description: "A sharp steel pickaxe."
-value: 200
+description: "A sturdy steel pickaxe, good for mining."
+value: 75
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: stab
stats:
- attack_bonus: 5
- strength_bonus: 3
- defense_bonus: 0
+ stab_attack: 10
+ slash_attack: -2
+ crush_attack: 4
+ strength_bonus: 7
speed: 5
tool_type: pickaxe
-tool_speed: 4
+tool_speed: 1.25
diff --git a/data/items/steel_platebody.yaml b/data/items/steel_platebody.yaml
index e9fe7e1..22f3747 100644
--- a/data/items/steel_platebody.yaml
+++ b/data/items/steel_platebody.yaml
@@ -6,4 +6,8 @@ value: 500
stackable: false
equip_slot: torso
stats:
- defense_bonus: 18
+ stab_defense: 27
+ slash_defense: 32
+ crush_defense: 22
+ science_defense: -15
+ ranged_defense: 27
diff --git a/data/items/steel_sword.yaml b/data/items/steel_sword.yaml
index 0f65ff9..ffc6e31 100644
--- a/data/items/steel_sword.yaml
+++ b/data/items/steel_sword.yaml
@@ -6,7 +6,10 @@ value: 100
stackable: false
equip_slot: main_hand
weapon_type: melee
+attack_type: slash
stats:
- attack_bonus: 9
- strength_bonus: 7
+ stab_attack: 10
+ slash_attack: 22
+ crush_attack: -2
+ strength_bonus: 14
speed: 4
diff --git a/data/items/stim_cell.yaml b/data/items/stim_cell.yaml
new file mode 100644
index 0000000..03930e7
--- /dev/null
+++ b/data/items/stim_cell.yaml
@@ -0,0 +1,6 @@
+id: stim_cell
+name: "stim cell"
+color: "226"
+description: "A bright yellow energy supplement that restores stamina. [Effect not yet implemented]"
+value: 65
+stackable: false
diff --git a/data/items/stim_potion.yaml b/data/items/stim_potion.yaml
new file mode 100644
index 0000000..19841d0
--- /dev/null
+++ b/data/items/stim_potion.yaml
@@ -0,0 +1,6 @@
+id: stim_potion
+name: "stim potion"
+color: "196"
+description: "A bubbling red potion that temporarily boosts attack capability. [Effect not yet implemented]"
+value: 30
+stackable: false
diff --git a/data/items/super_amp.yaml b/data/items/super_amp.yaml
new file mode 100644
index 0000000..153e01f
--- /dev/null
+++ b/data/items/super_amp.yaml
@@ -0,0 +1,6 @@
+id: super_amp
+name: "super amp"
+color: "231"
+description: "A dangerously concentrated strength amplifier. Handle carefully. [Effect not yet implemented]"
+value: 155
+stackable: false
diff --git a/data/items/super_bio_serum.yaml b/data/items/super_bio_serum.yaml
new file mode 100644
index 0000000..d2ef4de
--- /dev/null
+++ b/data/items/super_bio_serum.yaml
@@ -0,0 +1,6 @@
+id: super_bio_serum
+name: "super bio serum"
+color: "34"
+description: "A concentrated antitoxin. Provides extended poison immunity. [Effect not yet implemented]"
+value: 130
+stackable: false
diff --git a/data/items/super_shield.yaml b/data/items/super_shield.yaml
new file mode 100644
index 0000000..5f6053d
--- /dev/null
+++ b/data/items/super_shield.yaml
@@ -0,0 +1,6 @@
+id: super_shield
+name: "super shield"
+color: "27"
+description: "A deep indigo potion that provides significant defensive enhancement. [Effect not yet implemented]"
+value: 175
+stackable: false
diff --git a/data/items/super_stim.yaml b/data/items/super_stim.yaml
new file mode 100644
index 0000000..d82704c
--- /dev/null
+++ b/data/items/super_stim.yaml
@@ -0,0 +1,6 @@
+id: super_stim
+name: "super stim"
+color: "160"
+description: "A potent dark-red stimulant. Dramatically boosts attack capability. [Effect not yet implemented]"
+value: 120
+stackable: false
diff --git a/data/items/super_stim_cell.yaml b/data/items/super_stim_cell.yaml
new file mode 100644
index 0000000..7952603
--- /dev/null
+++ b/data/items/super_stim_cell.yaml
@@ -0,0 +1,6 @@
+id: super_stim_cell
+name: "super stim cell"
+color: "220"
+description: "An advanced energy compound that fully restores stamina. [Effect not yet implemented]"
+value: 140
+stackable: false
diff --git a/data/items/targeting_serum.yaml b/data/items/targeting_serum.yaml
new file mode 100644
index 0000000..fd583d6
--- /dev/null
+++ b/data/items/targeting_serum.yaml
@@ -0,0 +1,6 @@
+id: targeting_serum
+name: "targeting serum"
+color: "70"
+description: "A dark green serum that sharpens ranged targeting systems. [Effect not yet implemented]"
+value: 190
+stackable: false
diff --git a/data/items/tarromin.yaml b/data/items/tarromin.yaml
new file mode 100644
index 0000000..8f9e61c
--- /dev/null
+++ b/data/items/tarromin.yaml
@@ -0,0 +1,6 @@
+id: tarromin
+name: "tarromin"
+color: "48"
+description: "A clean tarromin leaf, ready for use in pharmacy."
+value: 10
+stackable: false
diff --git a/data/items/tarromin_potion_unf.yaml b/data/items/tarromin_potion_unf.yaml
new file mode 100644
index 0000000..6a3fab6
--- /dev/null
+++ b/data/items/tarromin_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: tarromin_potion_unf
+name: "tarromin potion (unf)"
+color: "48"
+description: "An unfinished potion with tarromin floating in water."
+value: 12
+stackable: false
+made_from:
+ - items: [tarromin]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/tech_serum.yaml b/data/items/tech_serum.yaml
new file mode 100644
index 0000000..fd1b857
--- /dev/null
+++ b/data/items/tech_serum.yaml
@@ -0,0 +1,6 @@
+id: tech_serum
+name: "tech serum"
+color: "51"
+description: "A cyan serum that temporarily enhances technology interface capability. [Effect not yet implemented]"
+value: 100
+stackable: false
diff --git a/data/items/toadflax.yaml b/data/items/toadflax.yaml
new file mode 100644
index 0000000..adcd5b7
--- /dev/null
+++ b/data/items/toadflax.yaml
@@ -0,0 +1,6 @@
+id: toadflax
+name: "toadflax"
+color: "48"
+description: "A clean toadflax leaf, ready for use in pharmacy."
+value: 25
+stackable: false
diff --git a/data/items/toadflax_potion_unf.yaml b/data/items/toadflax_potion_unf.yaml
new file mode 100644
index 0000000..ca2a123
--- /dev/null
+++ b/data/items/toadflax_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: toadflax_potion_unf
+name: "toadflax potion (unf)"
+color: "48"
+description: "An unfinished potion with toadflax floating in water."
+value: 28
+stackable: false
+made_from:
+ - items: [toadflax]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/torstol.yaml b/data/items/torstol.yaml
new file mode 100644
index 0000000..db9ed3c
--- /dev/null
+++ b/data/items/torstol.yaml
@@ -0,0 +1,6 @@
+id: torstol
+name: "torstol"
+color: "48"
+description: "A clean torstol leaf, ready for use in pharmacy."
+value: 100
+stackable: false
diff --git a/data/items/torstol_potion_unf.yaml b/data/items/torstol_potion_unf.yaml
new file mode 100644
index 0000000..f5816d2
--- /dev/null
+++ b/data/items/torstol_potion_unf.yaml
@@ -0,0 +1,12 @@
+id: torstol_potion_unf
+name: "torstol potion (unf)"
+color: "48"
+description: "An unfinished potion with torstol floating in water."
+value: 102
+stackable: false
+made_from:
+ - items: [torstol]
+ qty: 1
+ - items: [vial_of_water]
+ qty: 1
+ticks: 0
diff --git a/data/items/vial.yaml b/data/items/vial.yaml
new file mode 100644
index 0000000..2a5260a
--- /dev/null
+++ b/data/items/vial.yaml
@@ -0,0 +1,6 @@
+id: vial
+name: "vial"
+color: "253"
+description: "An empty glass vial."
+value: 1
+stackable: false
diff --git a/data/items/vial_of_water.yaml b/data/items/vial_of_water.yaml
new file mode 100644
index 0000000..c3e2995
--- /dev/null
+++ b/data/items/vial_of_water.yaml
@@ -0,0 +1,6 @@
+id: vial_of_water
+name: "vial of water"
+color: "39"
+description: "A small glass vial filled with purified water. The base for all potions."
+value: 2
+stackable: false
diff --git a/data/items/white_berries.yaml b/data/items/white_berries.yaml
new file mode 100644
index 0000000..bdaa993
--- /dev/null
+++ b/data/items/white_berries.yaml
@@ -0,0 +1,6 @@
+id: white_berries
+name: "white berries"
+color: "255"
+description: "Pale berries from a hardy bush. They have defensive biochemical properties."
+value: 10
+stackable: false
diff --git a/data/items/willow_longbow.yaml b/data/items/willow_longbow.yaml
index 1d8cd2f..3a09368 100644
--- a/data/items/willow_longbow.yaml
+++ b/data/items/willow_longbow.yaml
@@ -5,6 +5,7 @@ description: "A willow longbow."
value: 320
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 6
stats:
- attack: 20
+ ranged_attack: 20
diff --git a/data/items/willow_shortbow.yaml b/data/items/willow_shortbow.yaml
index e8e21b1..51eb97c 100644
--- a/data/items/willow_shortbow.yaml
+++ b/data/items/willow_shortbow.yaml
@@ -5,6 +5,7 @@ description: "A willow shortbow."
value: 160
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 4
stats:
- attack: 20
+ ranged_attack: 20
diff --git a/data/items/yew_longbow.yaml b/data/items/yew_longbow.yaml
index a2e0754..53d99da 100644
--- a/data/items/yew_longbow.yaml
+++ b/data/items/yew_longbow.yaml
@@ -5,6 +5,7 @@ description: "A yew longbow."
value: 2000
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 6
stats:
- attack: 47
+ ranged_attack: 47
diff --git a/data/items/yew_shortbow.yaml b/data/items/yew_shortbow.yaml
index 6c29555..8856d96 100644
--- a/data/items/yew_shortbow.yaml
+++ b/data/items/yew_shortbow.yaml
@@ -5,6 +5,7 @@ description: "A yew shortbow."
value: 1600
equip_slot: main_hand
weapon_type: ranged
+attack_type: ranged
speed: 4
stats:
- attack: 47
+ ranged_attack: 47