diff --git a/assets/common/items/debug/boost.ron b/assets/common/items/debug/boost.ron
index 6642dd8cbe..d4f248f1ac 100644
--- a/assets/common/items/debug/boost.ron
+++ b/assets/common/items/debug/boost.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...",
kind: Tool(
(
- kind: Debug("Boost"),
+ kind: Debug,
stats: (
equip_time_millis: 0,
power: 1.00),
diff --git a/assets/common/items/debug/possess.ron b/assets/common/items/debug/possess.ron
index 6642dd8cbe..d4f248f1ac 100644
--- a/assets/common/items/debug/possess.ron
+++ b/assets/common/items/debug/possess.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "You can hear him giggle whenever\nyou hit the ground a bit too hard...",
kind: Tool(
(
- kind: Debug("Boost"),
+ kind: Debug,
stats: (
equip_time_millis: 0,
power: 1.00),
diff --git a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron
index 88e13ce50b..6b6b627bdf 100644
--- a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron
+++ b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "An axe infused with malachite.",
kind: Tool(
(
- kind: Axe("MalachiteAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.50),
diff --git a/assets/common/items/npc_weapons/axe/starter_axe.ron b/assets/common/items/npc_weapons/axe/starter_axe.ron
index 7317526398..fc69ede912 100644
--- a/assets/common/items/npc_weapons/axe/starter_axe.ron
+++ b/assets/common/items/npc_weapons/axe/starter_axe.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Every dent tells the story of a chopped tree.",
kind: Tool(
(
- kind: Axe("BasicAxe"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.50),
diff --git a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron
index 5b219d4328..8029f63b20 100644
--- a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron
+++ b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "You don't recognize the creature these horns belong to.",
kind: Tool(
(
- kind: Bow("HornLongbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 0.5),
diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron
index 01e55c9324..e393beae88 100644
--- a/assets/common/items/npc_weapons/bow/saurok_bow.ron
+++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Bow("SaurokBow"),
+ kind: Bow,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/dagger/starter_dagger.ron b/assets/common/items/npc_weapons/dagger/starter_dagger.ron
index 9fd1fed023..242d50ccbc 100644
--- a/assets/common/items/npc_weapons/dagger/starter_dagger.ron
+++ b/assets/common/items/npc_weapons/dagger/starter_dagger.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Easily concealed.",
kind: Tool(
(
- kind: Dagger("BasicDagger"),
+ kind: Dagger,
stats: (
equip_time_millis: 300,
power: 1.00),
diff --git a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron
index b7b7a53a40..2742f70d58 100644
--- a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron
+++ b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool(
(
- kind: Hammer("CultPurp0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.5),
diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
index c05dcbc953..9ca58e7641 100644
--- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Hammer("CyclopsHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
index e644eb425b..7189e590f5 100644
--- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Hammer("OgreHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/hammer/starter_hammer.ron b/assets/common/items/npc_weapons/hammer/starter_hammer.ron
index b25fb22d77..1b8dfb9bd4 100644
--- a/assets/common/items/npc_weapons/hammer/starter_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/starter_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "'Property of...' The rest is missing.",
kind: Tool(
(
- kind: Hammer("BasicHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.50),
diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
index be4995c0c2..0158b54974 100644
--- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Hammer("TrollHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
index e9a3c1df84..bc76cc0e06 100644
--- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Hammer("WendigoHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/shield/shield_1.ron b/assets/common/items/npc_weapons/shield/shield_1.ron
index 78e3bdb8bf..de62fdaec5 100644
--- a/assets/common/items/npc_weapons/shield/shield_1.ron
+++ b/assets/common/items/npc_weapons/shield/shield_1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Should withstand a few more hits, hopefully...",
kind: Tool (
(
- kind: Shield("BasicShield"),
+ kind: Shield,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/npc_weapons/staff/bone_staff.ron b/assets/common/items/npc_weapons/staff/bone_staff.ron
index c2b2cb1f6b..dedf7947ed 100644
--- a/assets/common/items/npc_weapons/staff/bone_staff.ron
+++ b/assets/common/items/npc_weapons/staff/bone_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "There's a red gem suspended in the bones.",
kind: Tool(
(
- kind: Staff("BoneStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 300,
power: 0.8),
diff --git a/assets/common/items/npc_weapons/staff/cultist_staff.ron b/assets/common/items/npc_weapons/staff/cultist_staff.ron
index 88defa70a1..6193ad7e47 100644
--- a/assets/common/items/npc_weapons/staff/cultist_staff.ron
+++ b/assets/common/items/npc_weapons/staff/cultist_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The fire gives off no heat.",
kind: Tool(
(
- kind: Staff("CultistStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 300,
power: 0.8),
diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron
index c5e7862ee1..44518db7bb 100644
--- a/assets/common/items/npc_weapons/staff/ogre_staff.ron
+++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Staff("OgreStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron
index e961c2029c..4e92877d59 100644
--- a/assets/common/items/npc_weapons/staff/saurok_staff.ron
+++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placeholder",
kind: Tool(
(
- kind: Staff("SaurokStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron
index cef57a8fa8..d52ede4ee0 100644
--- a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron
+++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool(
(
- kind: Sword("CultPurp0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.5),
diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron
index 34fc36da5b..c2d0a0ea1c 100644
--- a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron
+++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool(
(
- kind: Sword("CultPurp0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.0),
diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
index 443038a718..1f83990d4c 100644
--- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron
+++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placehoder",
kind: Tool(
(
- kind: Sword("DullahanSword"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron
index ca9f9e7ce9..1702afc2f7 100644
--- a/assets/common/items/npc_weapons/sword/saurok_sword.ron
+++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Placehoder",
kind: Tool(
(
- kind: Sword("SaurokSword"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.00,
diff --git a/assets/common/items/npc_weapons/sword/starter_sword.ron b/assets/common/items/npc_weapons/sword/starter_sword.ron
index 1d08a880a5..8e236bb9d0 100644
--- a/assets/common/items/npc_weapons/sword/starter_sword.ron
+++ b/assets/common/items/npc_weapons/sword/starter_sword.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Held together by Rust and hope.",
kind: Tool(
(
- kind: Sword("BasicSword"),
+ kind: Sword,
stats: (
equip_time_millis: 300,
power: 0.50),
diff --git a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron
index 7be7c56e86..7f14ed265d 100644
--- a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron
+++ b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's a big sword, and sharp too.",
kind: Tool(
(
- kind: Sword("Zweihander0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.75),
diff --git a/assets/common/items/npc_weapons/tool/broom.ron b/assets/common/items/npc_weapons/tool/broom.ron
index ee8d516970..a5cece752c 100644
--- a/assets/common/items/npc_weapons/tool/broom.ron
+++ b/assets/common/items/npc_weapons/tool/broom.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's beginning to fall apart.",
kind: Tool (
(
- kind: Farming("Broom"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.5),
diff --git a/assets/common/items/npc_weapons/tool/fishing_rod.ron b/assets/common/items/npc_weapons/tool/fishing_rod.ron
index 6fd61b5b14..84efc1ae3f 100644
--- a/assets/common/items/npc_weapons/tool/fishing_rod.ron
+++ b/assets/common/items/npc_weapons/tool/fishing_rod.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Smells of fish.",
kind: Tool (
(
- kind: Farming("FishingRod0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.5),
diff --git a/assets/common/items/npc_weapons/tool/hoe.ron b/assets/common/items/npc_weapons/tool/hoe.ron
index c2d50560bf..7a53519300 100644
--- a/assets/common/items/npc_weapons/tool/hoe.ron
+++ b/assets/common/items/npc_weapons/tool/hoe.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's stained with dirt.",
kind: Tool (
(
- kind: Farming("Hoe0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.50),
diff --git a/assets/common/items/npc_weapons/tool/pickaxe.ron b/assets/common/items/npc_weapons/tool/pickaxe.ron
index 7328d16f28..2c65c2e835 100644
--- a/assets/common/items/npc_weapons/tool/pickaxe.ron
+++ b/assets/common/items/npc_weapons/tool/pickaxe.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It has a chipped edge.",
kind: Tool (
(
- kind: Farming("Pickaxe0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.50),
diff --git a/assets/common/items/npc_weapons/tool/pitchfork.ron b/assets/common/items/npc_weapons/tool/pitchfork.ron
index 3182e48afd..d49dee8808 100644
--- a/assets/common/items/npc_weapons/tool/pitchfork.ron
+++ b/assets/common/items/npc_weapons/tool/pitchfork.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "One of the prongs is broken.",
kind: Tool (
(
- kind: Farming("Pitchfork"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.50),
diff --git a/assets/common/items/npc_weapons/tool/rake.ron b/assets/common/items/npc_weapons/tool/rake.ron
index 46a42bf373..d0a42c9f0f 100644
--- a/assets/common/items/npc_weapons/tool/rake.ron
+++ b/assets/common/items/npc_weapons/tool/rake.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Held together with twine.",
kind: Tool (
(
- kind: Farming("Rake"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.50),
diff --git a/assets/common/items/npc_weapons/tool/shovel-0.ron b/assets/common/items/npc_weapons/tool/shovel-0.ron
index 87d3c665db..445fad1634 100644
--- a/assets/common/items/npc_weapons/tool/shovel-0.ron
+++ b/assets/common/items/npc_weapons/tool/shovel-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's covered in manure.",
kind: Tool (
(
- kind: Farming("Shovel0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.50),
diff --git a/assets/common/items/npc_weapons/tool/shovel-1.ron b/assets/common/items/npc_weapons/tool/shovel-1.ron
index d6e34e0b6b..6a1c3ce931 100644
--- a/assets/common/items/npc_weapons/tool/shovel-1.ron
+++ b/assets/common/items/npc_weapons/tool/shovel-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been recently cleaned.",
kind: Tool (
(
- kind: Farming("Shovel1"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.50),
diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron
index 14c15580c0..17c37aa705 100644
--- a/assets/common/items/npc_weapons/unique/beast_claws.ron
+++ b/assets/common/items/npc_weapons/unique/beast_claws.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Was attached to a beast.",
kind: Tool(
(
- kind: NpcWeapon("BeastClaws"),
+ kind: NpcWeapon(BeastClaws),
stats: (
equip_time_millis: 500,
power: 1.00),
diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
index 92c744ca3d..9e87b26d57 100644
--- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
+++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Was attached to a mighty stone golem.",
kind: Tool(
(
- kind: NpcWeapon("StoneGolemsFist"),
+ kind: NpcWeapon(StoneGolemFist),
stats: (
equip_time_millis: 500,
power: 1.00),
diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron
index 920421ee10..9882fb4842 100644
--- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron
+++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.",
kind: Tool(
(
- kind: Axe("BloodsteelAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.60,
diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron
index 544ff38393..65e25e6cce 100644
--- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron
+++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.",
kind: Tool(
(
- kind: Axe("BloodsteelAxe1"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.60),
diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron
index 633b098413..f7278edbc5 100644
--- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron
+++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy's veins.",
kind: Tool(
(
- kind: Axe("BloodsteelAxe2"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.60),
diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron
index 52504490f2..a8ce9896e4 100644
--- a/assets/common/items/weapons/axe/bronze_axe-0.ron
+++ b/assets/common/items/weapons/axe/bronze_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A fine quality metal alloy axe.",
kind: Tool(
(
- kind: Axe("BronzeAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.00
diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron
index d72b86fbc2..f40182984a 100644
--- a/assets/common/items/weapons/axe/bronze_axe-1.ron
+++ b/assets/common/items/weapons/axe/bronze_axe-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.",
kind: Tool(
(
- kind: Axe("BronzeAxe1"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.00
diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron
index b7c190d479..433c2c2ddb 100644
--- a/assets/common/items/weapons/axe/cobalt_axe-0.ron
+++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The lustrous bluish gray axe provides a certain stylish class to the weapon.",
kind: Tool(
(
- kind: Axe("CobaltAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.80),
diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron
index ff142c7ec4..4eec31e7b5 100644
--- a/assets/common/items/weapons/axe/iron_axe-0.ron
+++ b/assets/common/items/weapons/axe/iron_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Heavy iron hammered into rough blades, a simple tool for killing.",
kind: Tool(
(
- kind: Axe("IronAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron
index b12804f7de..9b37b9274c 100644
--- a/assets/common/items/weapons/axe/iron_axe-1.ron
+++ b/assets/common/items/weapons/axe/iron_axe-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Heavy iron axe, likely created for ritual execution.",
kind: Tool(
(
- kind: Axe("IronAxe1"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron
index 5de76a30d1..bb81880ddd 100644
--- a/assets/common/items/weapons/axe/iron_axe-2.ron
+++ b/assets/common/items/weapons/axe/iron_axe-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The iron axe head is split into two distinct curves, giving it a unique appearance.",
kind: Tool(
(
- kind: Axe("IronAxe2"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron
index 016d490cb7..742b10995f 100644
--- a/assets/common/items/weapons/axe/iron_axe-3.ron
+++ b/assets/common/items/weapons/axe/iron_axe-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Tried and true iron armaments, mass produced for killing.",
kind: Tool(
(
- kind: Axe("IronAxe3"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron
index b4e3a2870b..a297fdeb90 100644
--- a/assets/common/items/weapons/axe/iron_axe-4.ron
+++ b/assets/common/items/weapons/axe/iron_axe-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This axe has a heavy iron head used to cleave nearly anything.",
kind: Tool(
(
- kind: Axe("IronAxe4"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron
index d6b1a4d18f..050a7c0694 100644
--- a/assets/common/items/weapons/axe/iron_axe-5.ron
+++ b/assets/common/items/weapons/axe/iron_axe-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "While heavy, this iron forged axe is quite easy to swing, at least for those with the muscle backing it.",
kind: Tool(
(
- kind: Axe("IronAxe5"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron
index 9ca68ad56d..0e9bb4aff2 100644
--- a/assets/common/items/weapons/axe/iron_axe-6.ron
+++ b/assets/common/items/weapons/axe/iron_axe-6.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A simple dual bitted iron forged axe.",
kind: Tool(
(
- kind: Axe("IronAxe6"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron
index f5e8d2539b..0977a19d62 100644
--- a/assets/common/items/weapons/axe/iron_axe-7.ron
+++ b/assets/common/items/weapons/axe/iron_axe-7.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Double bitted axe head, decorated iron construction.",
kind: Tool(
(
- kind: Axe("IronAxe7"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron
index 728a08743a..22581213d0 100644
--- a/assets/common/items/weapons/axe/iron_axe-8.ron
+++ b/assets/common/items/weapons/axe/iron_axe-8.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Several sharp axe heads forged with points to mimic animal fangs.",
kind: Tool(
(
- kind: Axe("IronAxe8"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron
index 4c7f831ded..da43a2941a 100644
--- a/assets/common/items/weapons/axe/iron_axe-9.ron
+++ b/assets/common/items/weapons/axe/iron_axe-9.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Strikes from this axe look like wolf bites in flesh.",
kind: Tool(
(
- kind: Axe("IronAxe9"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.20
diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron
index 6e71b1adcc..06bd30142c 100644
--- a/assets/common/items/weapons/axe/malachite_axe-0.ron
+++ b/assets/common/items/weapons/axe/malachite_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Etched axe head decorated with malachite on the blades to provide magical properties.",
kind: Tool(
(
- kind: Axe("MalachiteAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 2.00),
diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron
index 4ebdae2d71..293e0b469a 100644
--- a/assets/common/items/weapons/axe/orc_axe-0.ron
+++ b/assets/common/items/weapons/axe/orc_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A rough cut axe created by orcs to cleave beasts in two.",
kind: Tool(
(
- kind: Axe("OrcAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.60),
diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron
index 7317526398..fc69ede912 100644
--- a/assets/common/items/weapons/axe/starter_axe.ron
+++ b/assets/common/items/weapons/axe/starter_axe.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Every dent tells the story of a chopped tree.",
kind: Tool(
(
- kind: Axe("BasicAxe"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.50),
diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron
index d80dd8c8b6..6db9da1292 100644
--- a/assets/common/items/weapons/axe/steel_axe-0.ron
+++ b/assets/common/items/weapons/axe/steel_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Well crafted metal alloy axe that slices more cleanly than its iron counterparts.",
kind: Tool(
(
- kind: Axe("SteelAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron
index 4858fcda57..a1de1ff0cb 100644
--- a/assets/common/items/weapons/axe/steel_axe-1.ron
+++ b/assets/common/items/weapons/axe/steel_axe-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Double bitted, well polished, and spiked axe head.",
kind: Tool(
(
- kind: Axe("SteelAxe1"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron
index 2fc296176e..702b2c6c71 100644
--- a/assets/common/items/weapons/axe/steel_axe-2.ron
+++ b/assets/common/items/weapons/axe/steel_axe-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A simple metal alloy axe.",
kind: Tool(
(
- kind: Axe("SteelAxe2"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron
index a36f5909c4..66b52dbe56 100644
--- a/assets/common/items/weapons/axe/steel_axe-3.ron
+++ b/assets/common/items/weapons/axe/steel_axe-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The blade of this steel axe is forged in a manner to resemble a crescent moon.",
kind: Tool(
(
- kind: Axe("SteelAxe3"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron
index 5bd6ae7a8d..375c670501 100644
--- a/assets/common/items/weapons/axe/steel_axe-4.ron
+++ b/assets/common/items/weapons/axe/steel_axe-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The blade of this axe resembles a full moon.",
kind: Tool(
(
- kind: Axe("SteelAxe4"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron
index db2e9d8cf9..2f0ce88b5e 100644
--- a/assets/common/items/weapons/axe/steel_axe-5.ron
+++ b/assets/common/items/weapons/axe/steel_axe-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Druidic rituals formed this axe in the dark of night. Made to look like the wings of an owl swooping in on a kill.",
kind: Tool(
(
- kind: Axe("SteelAxe5"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron
index 87601ac003..d624671644 100644
--- a/assets/common/items/weapons/axe/steel_axe-6.ron
+++ b/assets/common/items/weapons/axe/steel_axe-6.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This axe is designed to mimic the playing card suit, swiftly slicing through the air.",
kind: Tool(
(
- kind: Axe("SteelAxe6"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 1.40
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron
index 6e7f263b29..6c3c3c2713 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Rough cut axe of dwarven origin, it's very old, but still usable.",
kind: Tool(
(
- kind: Axe("WornIronAxe0"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.80),
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron
index e8791f0d37..7e46247bef 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Light elven axe, scratched from eons of use. Still usable in some manner.",
kind: Tool(
(
- kind: Axe("WornIronAxe1"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.80),
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron
index 42c364ba76..40d5d5166d 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "There's nothing too remarkable about this old axe.",
kind: Tool(
(
- kind: Axe("WornIronAxe2"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.80),
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron
index 7835ba34b1..4e0bdf832e 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Rough cut iron makes it hard to tell that this axe is even used, other than how old it feels.",
kind: Tool(
(
- kind: Axe("WornIronAxe3"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.80),
diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron
index 239573fa1e..80f96a3e1b 100644
--- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron
+++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "An axe formed with the intent of making the blade seem like a beetle. With how brittle it has gotten over the years, one would be mistaken in thinking it was made from beetle shell.",
kind: Tool(
(
- kind: Axe("WornIronAxe4"),
+ kind: Axe,
stats: (
equip_time_millis: 400,
power: 0.80),
diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron
index ecd79e9918..857204e357 100644
--- a/assets/common/items/weapons/bow/horn_longbow-0.ron
+++ b/assets/common/items/weapons/bow/horn_longbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "You don't recognize the creature these horns belong to.",
kind: Tool(
(
- kind: Bow("HornLongbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 1.50
diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron
index 12d04eb275..c4d0b20c36 100644
--- a/assets/common/items/weapons/bow/iron_longbow-0.ron
+++ b/assets/common/items/weapons/bow/iron_longbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Has an insignia on it.",
kind: Tool(
(
- kind: Bow("IronLongbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 1.75
diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/leafy_longbow-0.ron
index 010fa16bc0..82cfd80900 100644
--- a/assets/common/items/weapons/bow/leafy_longbow-0.ron
+++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "There's a new leaf starting to grow.",
kind: Tool(
(
- kind: Bow("LeafyLongbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 1.25
diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/leafy_shortbow-0.ron
index 95467dd1e8..d9e3698aac 100644
--- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron
+++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The wood still seems alive.",
kind: Tool(
(
- kind: Bow("LeafyShortbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron
index 8f15756a45..754e46a8dd 100644
--- a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron
+++ b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Infused with Velorite power.",
kind: Tool(
(
- kind: Bow("NatureOreLongbow"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 2.00),
diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron
index 4e195e495e..c7dd7ab7c2 100644
--- a/assets/common/items/weapons/bow/rare_longbow.ron
+++ b/assets/common/items/weapons/bow/rare_longbow.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "You can sense power resting in the bow.",
kind: Tool(
(
- kind: Bow("RareLongbow"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 2.00),
diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron
index 64535186fa..2da0e169ee 100644
--- a/assets/common/items/weapons/bow/starter_bow.ron
+++ b/assets/common/items/weapons/bow/starter_bow.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Someone carved their initials into it.",
kind: Tool(
(
- kind: Bow("ShortBow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 0.50),
diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron
index 8993a763aa..42ec0d8afc 100644
--- a/assets/common/items/weapons/bow/wood_longbow-0.ron
+++ b/assets/common/items/weapons/bow/wood_longbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been well used.",
kind: Tool(
(
- kind: Bow("WoodLongbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron
index 98ce61eeff..c97b7549f1 100644
--- a/assets/common/items/weapons/bow/wood_longbow-1.ron
+++ b/assets/common/items/weapons/bow/wood_longbow-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's hard to pull all the way back.",
kind: Tool(
(
- kind: Bow("WoodLongbow1"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron
index 63db4ba5e9..bc41b2ed9b 100644
--- a/assets/common/items/weapons/bow/wood_shortbow-0.ron
+++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Strips of leather are wrapped around the handle.",
kind: Tool(
(
- kind: Bow("WoodShortbow0"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 0.8),
diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/wood_shortbow-1.ron
index c2e782df33..452e2d5b19 100644
--- a/assets/common/items/weapons/bow/wood_shortbow-1.ron
+++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Works on the ground too.",
kind: Tool(
(
- kind: Bow("WoodShortbow1"),
+ kind: Bow,
stats: (
equip_time_millis: 400,
power: 0.75),
diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron
index a6db333a31..88e980ecb7 100644
--- a/assets/common/items/weapons/dagger/starter_dagger.ron
+++ b/assets/common/items/weapons/dagger/starter_dagger.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Easily concealed.",
kind: Tool(
(
- kind: Dagger("BasicDagger"),
+ kind: Dagger,
stats: (
equip_time_millis: 300,
power: 1.00
diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron
index 01399a862a..4b972801c4 100644
--- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A heavy hammer forged from a simple metal alloy.",
kind: Tool(
(
- kind: Hammer("BronzeHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.00),
diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron
index 7eff809faf..b3c3a4ab69 100644
--- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The entire head of this club is forged from bronze alloy.",
kind: Tool(
(
- kind: Hammer("BronzeHammer1"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.00),
diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron
index 7ec731dc00..009df1be87 100644
--- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The bluish gray tinge to the metal of this hammer head provides a slight classiness to the weapon.",
kind: Tool(
(
- kind: Hammer("CobaltHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.60
diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron
index 52e76720f5..a5f6fbd269 100644
--- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The decorative hooked head of this mace is formed from a bluish gray metal.",
kind: Tool(
(
- kind: Hammer("CobaltHammer1"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.60
diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
index df28a1e780..d56ea6a368 100644
--- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
+++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool(
(
- kind: Hammer("CultPurp0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 2.00),
diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron
index fa68fd920c..7af99e88b1 100644
--- a/assets/common/items/weapons/hammer/flimsy_hammer.ron
+++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The head is barely secured.",
kind: Tool(
(
- kind: Hammer("FlimsyHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.50),
diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron
index 519221f04e..5032c1f445 100644
--- a/assets/common/items/weapons/hammer/hammer_1.ron
+++ b/assets/common/items/weapons/hammer/hammer_1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Breaks bones like sticks and stones.",
kind: Tool(
(
- kind: Hammer("BasicHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.50),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron
index 744bbe68f3..5daec4f635 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This heavy, solid chunk iron hammer head is simple and brutal in its design.",
kind: Tool(
(
- kind: Hammer("IronHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron
index 1395b00940..132098de35 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This heavy, square iron hammer is designed for squashing heads like watermelons.",
kind: Tool(
(
- kind: Hammer("IronHammer1"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron
index 11fa3a7889..89e8e2a0c4 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A decorative iron mace, great for smashing.",
kind: Tool(
(
- kind: Hammer("IronHammer2"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron
index 240a39b21c..de109ee94f 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The decorative iron mace has a crowning tip on top.",
kind: Tool(
(
- kind: Hammer("IronHammer3"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron
index 712df853fe..45687f17f7 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-4.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Worn head shows that this hammer had been used for many years to make other weapons, now relegated to being a weapon in its own right.",
kind: Tool(
(
- kind: Hammer("IronHammer4"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron
index dc227312d1..60e119ac64 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-5.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A hybrid fusion of a warhammer and a polearm.",
kind: Tool(
(
- kind: Hammer("IronHammer5"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron
index afc00a705e..f1861da769 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-6.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A rough shaped iron hammer with spikes for added destruction.",
kind: Tool(
(
- kind: Hammer("IronHammer6"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron
index 645bbc5e76..6f202c273b 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-7.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This iron forged hammer is roughly shaped into the shape of a fist holding the hammer head.",
kind: Tool(
(
- kind: Hammer("IronHammer7"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron
index 0ee3a4554f..cee115593e 100644
--- a/assets/common/items/weapons/hammer/iron_hammer-8.ron
+++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This hammer has a spike on the opposite end, making it dangerous when swung either direction.",
kind: Tool(
(
- kind: Hammer("IronHammer8"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.20),
diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron
index c395d7844b..052cbeaa9d 100644
--- a/assets/common/items/weapons/hammer/mjolnir.ron
+++ b/assets/common/items/weapons/hammer/mjolnir.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's crackling with lightning.",
kind: Tool(
(
- kind: Hammer("Mjolnir"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 2.00),
diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron
index 9babfd2cf7..87f4d13a31 100644
--- a/assets/common/items/weapons/hammer/ramshead_hammer.ron
+++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "You feel an evil presence in the hammer.",
kind: Tool(
(
- kind: Hammer("RamsheadHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.80),
diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron
index ddea70a7f8..14c0bb88f9 100644
--- a/assets/common/items/weapons/hammer/runic_hammer.ron
+++ b/assets/common/items/weapons/hammer/runic_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "There are strange runes inscribed into it.",
kind: Tool(
(
- kind: Hammer("RunicHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.80),
diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron
index b25fb22d77..1b8dfb9bd4 100644
--- a/assets/common/items/weapons/hammer/starter_hammer.ron
+++ b/assets/common/items/weapons/hammer/starter_hammer.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "'Property of...' The rest is missing.",
kind: Tool(
(
- kind: Hammer("BasicHammer"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.50),
diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron
index c5e8159b1f..dab68a08c6 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "While lighter and more durable than its iron counterparts, it is nonetheless just as deadly.",
kind: Tool(
(
- kind: Hammer("SteelHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron
index a639f1bb00..d6a2303806 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The lighter attributes of the metal alloy are barely noticed when forged into such a wide hammer head.",
kind: Tool(
(
- kind: Hammer("SteelHammer1"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron
index 9d140199a3..af1aa428c1 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A heavy and wide baton made of a durable metal alloy, decorated with spikes.",
kind: Tool(
(
- kind: Hammer("SteelHammer2"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron
index 91a714e754..483ee406f6 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A heavy, spiked steel ball tip provides a great smashing weapon.",
kind: Tool(
(
- kind: Hammer("SteelHammer3"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron
index 264de07517..990f99d6f9 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-4.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This destructive hammer was likely wielded by a vicious killer.",
kind: Tool(
(
- kind: Hammer("SteelHammer4"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron
index 69409b3419..cf21df87d7 100644
--- a/assets/common/items/weapons/hammer/steel_hammer-5.ron
+++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A spiked ball designed to resemble the stars lining the night sky.",
kind: Tool(
(
- kind: Hammer("SteelHammer5"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron
index 7b4bfc3590..169f4a97c0 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Bloodied stone tied to a branch, simple but functional as a weapon.",
kind: Tool(
(
- kind: Hammer("StoneHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.70),
diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron
index b17b600571..8a784f8109 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A rough stone, crumbling on the striking surfaces. Still usable as a weapon.",
kind: Tool(
(
- kind: Hammer("StoneHammer1"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.70),
diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron
index 3e059f34c2..ec0e6e3a7a 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A rock tied to a stick, still good for smashing, but not very strong.",
kind: Tool(
(
- kind: Hammer("StoneHammer2"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.70),
diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron
index cf2ec7e2a9..e9e1a6c537 100644
--- a/assets/common/items/weapons/hammer/stone_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A heavy rock with a slot worn through to fasten it in place. Brutal in its simple design, but still functional.",
kind: Tool(
(
- kind: Hammer("StoneHammer3"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.70),
diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron
index b3e3737b81..187c7b45aa 100644
--- a/assets/common/items/weapons/hammer/wood_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Hardened wood, subjected to many different elements to provide a enough strength to be a weapon.",
kind: Tool(
(
- kind: Hammer("WoodHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
index b7c807fdef..124c8f2cf8 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "While the dwarves excel at rough hewn weapons, this one has seen its fair share of battles, might still serve well enough for a few more.",
kind: Tool(
(
- kind: Hammer("WornIronHammer0"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.85),
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
index 4bdea3070c..72857525af 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Elven hammers are lighter than most. This one has seen its fair share of wear and tear.",
kind: Tool(
(
- kind: Hammer("WornIronHammer1"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.85),
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
index 384f255d6a..e26d985336 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "An unremarkable mace, that has seen a lot of use.",
kind: Tool(
(
- kind: Hammer("WornIronHammer2"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.85),
diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
index b2a591be36..b220a87aab 100644
--- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
+++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "A heavy orc crafted hammer, missing chunks from heavy use.",
kind: Tool(
(
- kind: Hammer("WornIronHammer3"),
+ kind: Hammer,
stats: (
equip_time_millis: 500,
power: 0.85),
diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
index 37c4a6ae50..f6e4ce9203 100644
--- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
+++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Heals your allies with the mystical Velorite aura.",
kind: Tool(
(
- kind: Sceptre("SceptreVelorite"),
+ kind: Sceptre,
stats: (
equip_time_millis: 400,
power: 2.0),
diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron
index c6a81cfc8d..fb6a4578ad 100644
--- a/assets/common/items/weapons/sceptre/staff_nature.ron
+++ b/assets/common/items/weapons/sceptre/staff_nature.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Heals your allies with the power of nature.",
kind: Tool(
(
- kind: Sceptre("Sceptre"),
+ kind: Sceptre,
stats: (
equip_time_millis: 400,
power: 1.00
diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron
index 50cd20ca7e..08c565d6c4 100644
--- a/assets/common/items/weapons/sceptre/starter_sceptre.ron
+++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Heals your allies with the power of nature.",
kind: Tool(
(
- kind: Sceptre("StarterSceptre"),
+ kind: Sceptre,
stats: (
equip_time_millis: 400,
power: 0.50),
diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron
index 6866f5fc3e..8cce97f19d 100644
--- a/assets/common/items/weapons/shield/shield_1.ron
+++ b/assets/common/items/weapons/shield/shield_1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Should withstand a few more hits, hopefully...",
kind: Tool (
(
- kind: Shield("BasicShield"),
+ kind: Shield,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron
index 51b1864ca7..ad6154eda3 100644
--- a/assets/common/items/weapons/staff/amethyst_staff.ron
+++ b/assets/common/items/weapons/staff/amethyst_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The amethyst faintly glows.",
kind: Tool(
(
- kind: Staff("AmethystStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 300,
power: 1.50
diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron
index 26bdc8f2fc..07ff390481 100644
--- a/assets/common/items/weapons/staff/bone_staff.ron
+++ b/assets/common/items/weapons/staff/bone_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "There's a red gem suspended in the bones.",
kind: Tool(
(
- kind: Staff("BoneStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 300,
power: 1.00),
diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron
index 0aca3faa84..7c0b305a8e 100644
--- a/assets/common/items/weapons/staff/cultist_staff.ron
+++ b/assets/common/items/weapons/staff/cultist_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The fire gives off no heat.",
kind: Tool(
(
- kind: Staff("CultistStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 300,
power: 2.00),
diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron
index 5122f333ff..2100624af6 100644
--- a/assets/common/items/weapons/staff/staff_1.ron
+++ b/assets/common/items/weapons/staff/staff_1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Walking stick with a sharpened end.",
kind: Tool(
(
- kind: Staff("BasicStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 200,
power: 0.50),
diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron
index 49720e7e8a..9e5ba43552 100644
--- a/assets/common/items/weapons/staff/starter_staff.ron
+++ b/assets/common/items/weapons/staff/starter_staff.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Smells like resin and magic.",
kind: Tool(
(
- kind: Staff("BasicStaff"),
+ kind: Staff,
stats: (
equip_time_millis: 300,
power: 0.50),
diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron
index 2be01d9a74..cb3870c4ee 100644
--- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron
+++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool(
(
- kind: Sword("CultPurp0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 2.00),
diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron
index f216415682..c106820b69 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The blade has been chipped quite a few times.",
kind: Tool(
(
- kind: Sword("GreatswordDam0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.80),
diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron
index c1c5b8d3a4..c106820b69 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The blade has been chipped quite a few times.",
kind: Tool(
(
- kind: Sword("GreatswordDam1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.80),
diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron
index 98978dac25..c106820b69 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The blade has been chipped quite a few times.",
kind: Tool(
(
- kind: Sword("GreatswordDam2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.80),
diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron
index 04e80f74f0..dbf3540f99 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been polished and sharpened recently.",
kind: Tool(
(
- kind: Sword("GreatswordFine0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron
index 28de3d276d..dbf3540f99 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been polished and sharpened recently.",
kind: Tool(
(
- kind: Sword("GreatswordFine1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron
index 41b27cd57d..dbf3540f99 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been polished and sharpened recently.",
kind: Tool(
(
- kind: Sword("GreatswordFine2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.40
diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron
index 1fc6851047..3429a7216e 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The sword's almost a work of art.",
kind: Tool(
(
- kind: Sword("GreatswordOrn0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.70
diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron
index e510161007..3429a7216e 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The sword's almost a work of art.",
kind: Tool(
(
- kind: Sword("GreatswordOrn1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.70
diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron
index 8df47c87c6..3429a7216e 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The sword's almost a work of art.",
kind: Tool(
(
- kind: Sword("GreatswordOrn2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.70
diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron
index 92f79527c4..b2f8c404b3 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been well used.",
kind: Tool(
(
- kind: Sword("GreatswordSimple0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.10),
diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron
index 5a595ed5e7..b2f8c404b3 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been well used.",
kind: Tool(
(
- kind: Sword("GreatswordSimple1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.10),
diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron
index 899c4b3d63..b2f8c404b3 100644
--- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron
+++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been well used.",
kind: Tool(
(
- kind: Sword("GreatswordSimple2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.10),
diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron
index 4c62c260b6..c7cb292ceb 100644
--- a/assets/common/items/weapons/sword/long_2h_dam-0.ron
+++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's slightly cracked.",
kind: Tool(
(
- kind: Sword("LongDam0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/long_2h_dam-1.ron
index c43f4fd2d2..c7cb292ceb 100644
--- a/assets/common/items/weapons/sword/long_2h_dam-1.ron
+++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's slightly cracked.",
kind: Tool(
(
- kind: Sword("LongDam1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron
index 4f20c1a6f3..c7cb292ceb 100644
--- a/assets/common/items/weapons/sword/long_2h_dam-2.ron
+++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's slightly cracked.",
kind: Tool(
(
- kind: Sword("LongDam2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron
index c20cbf017a..c7cb292ceb 100644
--- a/assets/common/items/weapons/sword/long_2h_dam-3.ron
+++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's slightly cracked.",
kind: Tool(
(
- kind: Sword("LongDam3"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron
index 1a30b5f109..c7cb292ceb 100644
--- a/assets/common/items/weapons/sword/long_2h_dam-4.ron
+++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's slightly cracked.",
kind: Tool(
(
- kind: Sword("LongDam4"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron
index ecbd8764da..c7cb292ceb 100644
--- a/assets/common/items/weapons/sword/long_2h_dam-5.ron
+++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's slightly cracked.",
kind: Tool(
(
- kind: Sword("LongDam5"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.60),
diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron
index c6e205a5bd..2dfab19680 100644
--- a/assets/common/items/weapons/sword/long_2h_fine-0.ron
+++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It shines when you hold it up to the light.",
kind: Tool(
(
- kind: Sword("LongFine0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.20
diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron
index 90569b67c2..2dfab19680 100644
--- a/assets/common/items/weapons/sword/long_2h_fine-1.ron
+++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It shines when you hold it up to the light.",
kind: Tool(
(
- kind: Sword("LongFine1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.20
diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/long_2h_fine-2.ron
index 72a2cd05d1..2dfab19680 100644
--- a/assets/common/items/weapons/sword/long_2h_fine-2.ron
+++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It shines when you hold it up to the light.",
kind: Tool(
(
- kind: Sword("LongFine2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.20
diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron
index 35b437a56b..2dfab19680 100644
--- a/assets/common/items/weapons/sword/long_2h_fine-3.ron
+++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It shines when you hold it up to the light.",
kind: Tool(
(
- kind: Sword("LongFine3"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.20
diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron
index a64e63bd09..2dfab19680 100644
--- a/assets/common/items/weapons/sword/long_2h_fine-4.ron
+++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It shines when you hold it up to the light.",
kind: Tool(
(
- kind: Sword("LongFine4"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.20
diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron
index bd90c4d9cf..2dfab19680 100644
--- a/assets/common/items/weapons/sword/long_2h_fine-5.ron
+++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It shines when you hold it up to the light.",
kind: Tool(
(
- kind: Sword("LongFine5"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.20
diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron
index 2a91b2426b..3c07aea767 100644
--- a/assets/common/items/weapons/sword/long_2h_orn-0.ron
+++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's probably the weapon of some noble.",
kind: Tool(
(
- kind: Sword("LongOrn0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron
index f5233512cb..3c07aea767 100644
--- a/assets/common/items/weapons/sword/long_2h_orn-1.ron
+++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's probably the weapon of some noble.",
kind: Tool(
(
- kind: Sword("LongOrn1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron
index 9196f9445f..3c07aea767 100644
--- a/assets/common/items/weapons/sword/long_2h_orn-2.ron
+++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's probably the weapon of some noble.",
kind: Tool(
(
- kind: Sword("LongOrn2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron
index 5f04e2a81b..3c07aea767 100644
--- a/assets/common/items/weapons/sword/long_2h_orn-3.ron
+++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's probably the weapon of some noble.",
kind: Tool(
(
- kind: Sword("LongOrn3"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron
index 3412f2565e..3c07aea767 100644
--- a/assets/common/items/weapons/sword/long_2h_orn-4.ron
+++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's probably the weapon of some noble.",
kind: Tool(
(
- kind: Sword("LongOrn4"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron
index 05d45cd618..3c07aea767 100644
--- a/assets/common/items/weapons/sword/long_2h_orn-5.ron
+++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's probably the weapon of some noble.",
kind: Tool(
(
- kind: Sword("LongOrn5"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron
index 57215942ae..93fa46aba2 100644
--- a/assets/common/items/weapons/sword/long_2h_simple-0.ron
+++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It was well maintained by it's previous owner.",
kind: Tool(
(
- kind: Sword("LongSimple0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.90),
diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron
index 6178030dc6..93fa46aba2 100644
--- a/assets/common/items/weapons/sword/long_2h_simple-1.ron
+++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It was well maintained by it's previous owner.",
kind: Tool(
(
- kind: Sword("LongSimple1"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.90),
diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron
index 2974fab6b3..93fa46aba2 100644
--- a/assets/common/items/weapons/sword/long_2h_simple-2.ron
+++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It was well maintained by it's previous owner.",
kind: Tool(
(
- kind: Sword("LongSimple2"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.90),
diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron
index e3d558ee51..93fa46aba2 100644
--- a/assets/common/items/weapons/sword/long_2h_simple-3.ron
+++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It was well maintained by it's previous owner.",
kind: Tool(
(
- kind: Sword("LongSimple3"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.90),
diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron
index 9ae0db5f16..93fa46aba2 100644
--- a/assets/common/items/weapons/sword/long_2h_simple-4.ron
+++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It was well maintained by it's previous owner.",
kind: Tool(
(
- kind: Sword("LongSimple4"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.90),
diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron
index 7ee5904055..93fa46aba2 100644
--- a/assets/common/items/weapons/sword/long_2h_simple-5.ron
+++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It was well maintained by it's previous owner.",
kind: Tool(
(
- kind: Sword("LongSimple5"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 0.90),
diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron
index 8b05b5b9ab..caeb1a11a9 100644
--- a/assets/common/items/weapons/sword/short_sword_0.ron
+++ b/assets/common/items/weapons/sword/short_sword_0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "There's blood encrusted on the blade.",
kind: Tool(
(
- kind: Sword("Short0"),
+ kind: Sword,
stats: (
equip_time_millis: 400,
power: 0.75),
diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter_sword.ron
index 1d08a880a5..8e236bb9d0 100644
--- a/assets/common/items/weapons/sword/starter_sword.ron
+++ b/assets/common/items/weapons/sword/starter_sword.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Held together by Rust and hope.",
kind: Tool(
(
- kind: Sword("BasicSword"),
+ kind: Sword,
stats: (
equip_time_millis: 300,
power: 0.50),
diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron
index ab2ae1e019..d8d7bbe855 100644
--- a/assets/common/items/weapons/sword/wood_sword.ron
+++ b/assets/common/items/weapons/sword/wood_sword.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "The resin glows.",
kind: Tool(
(
- kind: Sword("WoodTraining"),
+ kind: Sword,
stats: (
equip_time_millis: 400,
power: 0.8),
diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron
index 5314429b7a..36d04c0a2e 100644
--- a/assets/common/items/weapons/sword/zweihander_sword_0.ron
+++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's a big sword, and sharp too.",
kind: Tool(
(
- kind: Sword("Zweihander0"),
+ kind: Sword,
stats: (
equip_time_millis: 500,
power: 1.50
diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron
index 0d74bbe63d..f4f93d1f2d 100644
--- a/assets/common/items/weapons/tool/broom.ron
+++ b/assets/common/items/weapons/tool/broom.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's beginning to fall apart.",
kind: Tool (
(
- kind: Farming("Broom"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron
index 217c5cab1d..8d48c43265 100644
--- a/assets/common/items/weapons/tool/fishing_rod.ron
+++ b/assets/common/items/weapons/tool/fishing_rod.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Smells of fish.",
kind: Tool (
(
- kind: Farming("FishingRod0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron
index 11c14e4b40..cabc0521bf 100644
--- a/assets/common/items/weapons/tool/hoe.ron
+++ b/assets/common/items/weapons/tool/hoe.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's stained with dirt.",
kind: Tool (
(
- kind: Farming("Hoe0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron
index 57f27ef9a2..f13c1047af 100644
--- a/assets/common/items/weapons/tool/pickaxe.ron
+++ b/assets/common/items/weapons/tool/pickaxe.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It has a chipped edge.",
kind: Tool (
(
- kind: Farming("Pickaxe0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron
index ef81ed3e59..8e1f9d0666 100644
--- a/assets/common/items/weapons/tool/pitchfork.ron
+++ b/assets/common/items/weapons/tool/pitchfork.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "One of the prongs is broken.",
kind: Tool (
(
- kind: Farming("Pitchfork"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron
index 6b87b616b8..ddeed160a0 100644
--- a/assets/common/items/weapons/tool/rake.ron
+++ b/assets/common/items/weapons/tool/rake.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "Held together with twine.",
kind: Tool (
(
- kind: Farming("Rake"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron
index 736e4ad697..c32d3583fd 100644
--- a/assets/common/items/weapons/tool/shovel-0.ron
+++ b/assets/common/items/weapons/tool/shovel-0.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's covered in manure.",
kind: Tool (
(
- kind: Farming("Shovel0"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),
diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron
index 2402333578..eeedd4eda2 100644
--- a/assets/common/items/weapons/tool/shovel-1.ron
+++ b/assets/common/items/weapons/tool/shovel-1.ron
@@ -3,7 +3,7 @@ ItemDef(
description: "It's been recently cleaned.",
kind: Tool (
(
- kind: Farming("Shovel1"),
+ kind: Farming,
stats: (
equip_time_millis: 400,
power: 1.00),