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/npcweapon/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron similarity index 84% rename from assets/common/items/npc_weapons/npcweapon/beast_claws.ron rename to assets/common/items/npc_weapons/unique/beast_claws.ron index 14c15580c0..17c37aa705 100644 --- a/assets/common/items/npc_weapons/npcweapon/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/npcweapon/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron similarity index 83% rename from assets/common/items/npc_weapons/npcweapon/stone_golems_fist.ron rename to assets/common/items/npc_weapons/unique/stone_golems_fist.ron index 92c744ca3d..9e87b26d57 100644 --- a/assets/common/items/npc_weapons/npcweapon/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), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index b7c0aa25ce..bd5ba2fdff 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -4,522 +4,574 @@ ({ // Weapons // Bows - Tool(Bow("ShortBow0")): VoxTrans( + Tool("common.items.weapons.bow.starter_bow"): VoxTrans( "voxel.weapon.bow.shortbow_starter", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("WoodShortbow0")): VoxTrans( + Tool("common.items.weapons.bow.wood_shortbow-0"): VoxTrans( "voxel.weapon.bow.shortbow_wood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("WoodShortbow1")): VoxTrans( + Tool("common.items.weapons.bow.wood_shortbow-1"): VoxTrans( "voxel.weapon.bow.shortbow_wood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("LeafyShortbow0")): VoxTrans( + Tool("common.items.weapons.bow.leafy_shortbow-0"): VoxTrans( "voxel.weapon.bow.shortbow_leafy-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("WoodLongbow0")): VoxTrans( + Tool("common.items.weapons.bow.wood_longbow-0"): VoxTrans( "voxel.weapon.bow.longbow_wood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("WoodLongbow1")): VoxTrans( + Tool("common.items.weapons.bow.wood_longbow-1"): VoxTrans( "voxel.weapon.bow.longbow_wood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("LeafyLongbow0")): VoxTrans( + Tool("common.items.weapons.bow.leafy_longbow-0"): VoxTrans( "voxel.weapon.bow.longbow_leafy-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("HornLongbow0")): VoxTrans( + Tool("common.items.weapons.bow.horn_longbow-0"): VoxTrans( "voxel.weapon.bow.longbow_horn-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("IronLongbow0")): VoxTrans( + Tool("common.items.npc_weapons.bow.horn_longbow-0"): VoxTrans( + "voxel.weapon.bow.longbow_horn-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.iron_longbow-0"): VoxTrans( "voxel.weapon.bow.longbow_iron-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("RareLongbow")): VoxTrans( + Tool("common.items.weapons.bow.rare_longbow"): VoxTrans( "voxel.weapon.bow.longbow_rare", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool(Bow("NatureOreLongbow")): VoxTrans( + Tool("common.items.weapons.bow.nature_ore_longbow-0"): VoxTrans( "voxel.weapon.bow.longbow_ore_nature-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), // Daggers - Tool(Dagger("BasicDagger")): VoxTrans( + Tool("common.items.weapons.dagger.starter_dagger"): VoxTrans( + "voxel.weapon.dagger.dagger_rusty", + (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.npc_weapons.dagger.starter_dagger"): VoxTrans( "voxel.weapon.dagger.dagger_rusty", (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, ), // Swords - Tool(Sword("Short0")): VoxTrans( + Tool("common.items.weapons.sword.short_sword_0"): VoxTrans( "voxel.weapon.sword.short_2h-0", (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60, ), - Tool(Sword("BasicSword")): VoxTrans( + Tool("common.items.weapons.sword.starter_sword"): VoxTrans( "voxel.weapon.sword.rusty_2h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3, ), - Tool(Sword("Zweihander0")): VoxTrans( + Tool("common.items.npc_weapons.sword.starter_sword"): VoxTrans( + "voxel.weapon.sword.rusty_2h", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3, + ), + Tool("common.items.weapons.sword.zweihander_sword_0"): VoxTrans( "voxel.weapon.sword.zweihander_2h-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Sword("WoodTraining")): VoxTrans( + Tool("common.items.npc_weapons.sword.zweihander_sword_0"): VoxTrans( + "voxel.weapon.sword.zweihander_2h-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword.wood_sword"): VoxTrans( "voxel.weapon.sword.wood_ore_2h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Sword("LongFine3")): VoxTrans( - "voxel.weapon.sword.long_2h_fine-3", - (0.0, 9.0, 0.0), (-90.0, 90.0, 0.0), 2.4, - ), - Tool(Sword("GreatswordDam0")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_dam-0"): VoxTrans( "voxel.weapon.sword.greatsword_2h_dam-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordDam1")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_dam-1"): VoxTrans( "voxel.weapon.sword.greatsword_2h_dam-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordDam2")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_dam-2"): VoxTrans( "voxel.weapon.sword.greatsword_2h_dam-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordSimple0")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_simple-0"): VoxTrans( "voxel.weapon.sword.greatsword_2h_simple-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordSimple1")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_simple-1"): VoxTrans( "voxel.weapon.sword.greatsword_2h_simple-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordSimple2")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_simple-2"): VoxTrans( "voxel.weapon.sword.greatsword_2h_simple-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordOrn0")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_orn-0"): VoxTrans( "voxel.weapon.sword.greatsword_2h_orn-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordOrn1")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_orn-1"): VoxTrans( "voxel.weapon.sword.greatsword_2h_orn-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordOrn2")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_orn-2"): VoxTrans( "voxel.weapon.sword.greatsword_2h_orn-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordFine0")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_fine-0"): VoxTrans( "voxel.weapon.sword.greatsword_2h_fine-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordFine1")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_fine-1"): VoxTrans( "voxel.weapon.sword.greatsword_2h_fine-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("GreatswordFine2")): VoxTrans( + Tool("common.items.weapons.sword.greatsword_2h_fine-2"): VoxTrans( "voxel.weapon.sword.greatsword_2h_fine-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongDam0")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_dam-0"): VoxTrans( "voxel.weapon.sword.long_2h_dam-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongDam1")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_dam-1"): VoxTrans( "voxel.weapon.sword.long_2h_dam-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongDam2")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_dam-2"): VoxTrans( "voxel.weapon.sword.long_2h_dam-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongDam3")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_dam-3"): VoxTrans( "voxel.weapon.sword.long_2h_dam-3", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongDam4")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_dam-4"): VoxTrans( "voxel.weapon.sword.long_2h_dam-4", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongDam5")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_dam-5"): VoxTrans( "voxel.weapon.sword.long_2h_dam-5", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongSimple0")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_simple-0"): VoxTrans( "voxel.weapon.sword.long_2h_simple-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongSimple1")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_simple-1"): VoxTrans( "voxel.weapon.sword.long_2h_simple-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongSimple2")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_simple-2"): VoxTrans( "voxel.weapon.sword.long_2h_simple-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongSimple3")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_simple-3"): VoxTrans( "voxel.weapon.sword.long_2h_simple-3", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongSimple4")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_simple-4"): VoxTrans( "voxel.weapon.sword.long_2h_simple-4", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongSimple5")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_simple-5"): VoxTrans( "voxel.weapon.sword.long_2h_simple-5", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongOrn0")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_orn-0"): VoxTrans( "voxel.weapon.sword.long_2h_orn-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongOrn1")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_orn-1"): VoxTrans( "voxel.weapon.sword.long_2h_orn-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongOrn2")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_orn-2"): VoxTrans( "voxel.weapon.sword.long_2h_orn-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongOrn3")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_orn-3"): VoxTrans( "voxel.weapon.sword.long_2h_orn-3", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongOrn4")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_orn-4"): VoxTrans( "voxel.weapon.sword.long_2h_orn-4", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongOrn5")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_orn-5"): VoxTrans( "voxel.weapon.sword.long_2h_orn-5", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongFine0")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_fine-0"): VoxTrans( "voxel.weapon.sword.long_2h_fine-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongFine1")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_fine-1"): VoxTrans( "voxel.weapon.sword.long_2h_fine-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongFine2")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_fine-2"): VoxTrans( "voxel.weapon.sword.long_2h_fine-2", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongFine3")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_fine-3"): VoxTrans( "voxel.weapon.sword.long_2h_fine-3", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongFine4")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_fine-4"): VoxTrans( "voxel.weapon.sword.long_2h_fine-4", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("LongFine5")): VoxTrans( + Tool("common.items.weapons.sword.long_2h_fine-5"): VoxTrans( "voxel.weapon.sword.long_2h_fine-5", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), - Tool(Sword("CultPurp0")): VoxTrans( + Tool("common.items.npc_weapons.sword.cultist_purp_2h-0"): VoxTrans( + "voxel.weapon.sword.cultist_purp_2h-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + ), + Tool("common.items.npc_weapons.sword.cultist_purp_2h_boss-0"): VoxTrans( + "voxel.weapon.sword.cultist_purp_2h-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, + ), + Tool("common.items.weapons.sword.cultist_purp_2h_boss-0"): VoxTrans( "voxel.weapon.sword.cultist_purp_2h-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), // Axes - Tool(Axe("BasicAxe")): VoxTrans( + Tool("common.items.weapons.axe.starter_axe"): VoxTrans( "voxel.weapon.axe.2haxe_rusty", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("OrcAxe0")): VoxTrans( + Tool("common.items.npc_weapons.axe.starter_axe"): VoxTrans( + "voxel.weapon.axe.2haxe_rusty", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.axe.orc_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_orc-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("WornIronAxe0")): VoxTrans( + Tool("common.items.weapons.axe.worn_iron_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("WornIronAxe1")): VoxTrans( + Tool("common.items.weapons.axe.worn_iron_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("WornIronAxe2")): VoxTrans( + Tool("common.items.weapons.axe.worn_iron_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-2", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("WornIronAxe3")): VoxTrans( + Tool("common.items.weapons.axe.worn_iron_axe-3"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-3", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("WornIronAxe4")): VoxTrans( + Tool("common.items.weapons.axe.worn_iron_axe-4"): VoxTrans( "voxel.weapon.axe.2haxe_worn_iron-4", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("BronzeAxe0")): VoxTrans( + Tool("common.items.weapons.axe.bronze_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_bronze-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("BronzeAxe1")): VoxTrans( + Tool("common.items.weapons.axe.bronze_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_bronze-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe0")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_iron-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe1")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_iron-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe2")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_iron-2", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe3")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-3"): VoxTrans( "voxel.weapon.axe.2haxe_iron-3", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe4")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-4"): VoxTrans( "voxel.weapon.axe.2haxe_iron-4", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe5")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-5"): VoxTrans( "voxel.weapon.axe.2haxe_iron-5", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe6")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-6"): VoxTrans( "voxel.weapon.axe.2haxe_iron-6", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe7")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-7"): VoxTrans( "voxel.weapon.axe.2haxe_iron-7", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe8")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-8"): VoxTrans( "voxel.weapon.axe.2haxe_iron-8", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("IronAxe8")): VoxTrans( - "voxel.weapon.axe.2haxe_iron-8", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, - ), - Tool(Axe("IronAxe9")): VoxTrans( + Tool("common.items.weapons.axe.iron_axe-9"): VoxTrans( "voxel.weapon.axe.2haxe_iron-9", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe0")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_steel-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe1")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_steel-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe2")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_steel-2", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe3")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-3"): VoxTrans( "voxel.weapon.axe.2haxe_steel-3", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe4")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-4"): VoxTrans( "voxel.weapon.axe.2haxe_steel-4", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe5")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-5"): VoxTrans( "voxel.weapon.axe.2haxe_steel-5", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("SteelAxe6")): VoxTrans( + Tool("common.items.weapons.axe.steel_axe-6"): VoxTrans( "voxel.weapon.axe.2haxe_steel-6", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("BloodsteelAxe0")): VoxTrans( + Tool("common.items.weapons.axe.bloodsteel_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_bloodsteel-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("BloodsteelAxe1")): VoxTrans( + Tool("common.items.weapons.axe.bloodsteel_axe-1"): VoxTrans( "voxel.weapon.axe.2haxe_bloodsteel-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("BloodsteelAxe2")): VoxTrans( + Tool("common.items.weapons.axe.bloodsteel_axe-2"): VoxTrans( "voxel.weapon.axe.2haxe_bloodsteel-2", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("CobaltAxe0")): VoxTrans( + Tool("common.items.weapons.axe.cobalt_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_cobalt-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Axe("MalachiteAxe0")): VoxTrans( + Tool("common.items.weapons.axe.malachite_axe-0"): VoxTrans( + "voxel.weapon.axe.2haxe_malachite-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.npc_weapons.axe.malachite_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_malachite-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), // Hammers - Tool(Hammer("BasicHammer")): VoxTrans( + Tool("common.items.weapons.hammer.hammer_1"): VoxTrans( "voxel.weapon.hammer.2hhammer_rusty", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("WoodHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.starter_hammer"): VoxTrans( + "voxel.weapon.hammer.2hhammer_rusty", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.npc_weapons.hammer.starter_hammer"): VoxTrans( + "voxel.weapon.hammer.2hhammer_rusty", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.weapons.hammer.wood_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_wood-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("FlimsyHammer")): VoxTrans( + Tool("common.items.weapons.hammer.flimsy_hammer"): VoxTrans( "voxel.weapon.hammer.2hhammer_flimsy", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("StoneHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.stone_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_stone-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("StoneHammer1")): VoxTrans( + Tool("common.items.weapons.hammer.stone_hammer-1"): VoxTrans( "voxel.weapon.hammer.2hhammer_stone-1", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("StoneHammer2")): VoxTrans( + Tool("common.items.weapons.hammer.stone_hammer-2"): VoxTrans( "voxel.weapon.hammer.2hhammer_stone-2", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("StoneHammer3")): VoxTrans( + Tool("common.items.weapons.hammer.stone_hammer-3"): VoxTrans( "voxel.weapon.hammer.2hhammer_stone-3", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("WornIronHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.worn_iron_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_worn_iron-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("WornIronHammer1")): VoxTrans( + Tool("common.items.weapons.hammer.worn_iron_hammer-1"): VoxTrans( "voxel.weapon.hammer.2hhammer_worn_iron-1", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("WornIronHammer2")): VoxTrans( + Tool("common.items.weapons.hammer.worn_iron_hammer-2"): VoxTrans( "voxel.weapon.hammer.2hhammer_worn_iron-2", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("WornIronHammer3")): VoxTrans( + Tool("common.items.weapons.hammer.worn_iron_hammer-3"): VoxTrans( "voxel.weapon.hammer.2hhammer_worn_iron-3", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("BronzeHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.bronze_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_bronze-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("BronzeHammer1")): VoxTrans( + Tool("common.items.weapons.hammer.bronze_hammer-1"): VoxTrans( "voxel.weapon.hammer.2hhammer_bronze-1", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer1")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-1"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-1", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer2")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-2"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-2", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer3")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-3"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-3", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer4")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-4"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-4", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer5")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-5"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-5", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer6")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-6"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-6", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer7")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-7"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-7", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("IronHammer8")): VoxTrans( + Tool("common.items.weapons.hammer.iron_hammer-8"): VoxTrans( "voxel.weapon.hammer.2hhammer_iron-8", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("SteelHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.steel_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_steel-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("SteelHammer1")): VoxTrans( + Tool("common.items.weapons.hammer.steel_hammer-1"): VoxTrans( "voxel.weapon.hammer.2hhammer_steel-1", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("SteelHammer2")): VoxTrans( + Tool("common.items.weapons.hammer.steel_hammer-2"): VoxTrans( "voxel.weapon.hammer.2hhammer_steel-2", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("SteelHammer3")): VoxTrans( + Tool("common.items.weapons.hammer.steel_hammer-3"): VoxTrans( "voxel.weapon.hammer.2hhammer_steel-3", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("SteelHammer4")): VoxTrans( + Tool("common.items.weapons.hammer.steel_hammer-4"): VoxTrans( "voxel.weapon.hammer.2hhammer_steel-4", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("SteelHammer5")): VoxTrans( + Tool("common.items.weapons.hammer.steel_hammer-5"): VoxTrans( "voxel.weapon.hammer.2hhammer_steel-5", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("CobaltHammer0")): VoxTrans( + Tool("common.items.weapons.hammer.cobalt_hammer-0"): VoxTrans( "voxel.weapon.hammer.2hhammer_cobalt-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("CobaltHammer1")): VoxTrans( + Tool("common.items.weapons.hammer.cobalt_hammer-1"): VoxTrans( "voxel.weapon.hammer.2hhammer_cobalt-1", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("RunicHammer")): VoxTrans( + Tool("common.items.weapons.hammer.runic_hammer"): VoxTrans( "voxel.weapon.hammer.2hhammer_runic", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("RamsheadHammer")): VoxTrans( + Tool("common.items.weapons.hammer.ramshead_hammer"): VoxTrans( "voxel.weapon.hammer.2hhammer_ramshead", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("Mjolnir")): VoxTrans( + Tool("common.items.weapons.hammer.mjolnir"): VoxTrans( "voxel.weapon.hammer.2hhammer_mjolnir", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Hammer("CultPurp0")): VoxTrans( + Tool("common.items.weapons.hammer.cultist_purp_2h-0"): VoxTrans( + "voxel.weapon.hammer.cult_purp-0", + (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.npc_weapons.hammer.cultist_purp_2h-0"): VoxTrans( "voxel.weapon.hammer.cult_purp-0", (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), // Staffs - Tool(Staff("BasicStaff")): VoxTrans( + Tool("common.items.weapons.staff.staff_1"): VoxTrans( "voxel.weapon.staff.firestaff_starter", (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, ), - Tool(Staff("BoneStaff")): VoxTrans( + Tool("common.items.weapons.staff.starter_staff"): VoxTrans( + "voxel.weapon.staff.firestaff_starter", + (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.staff.bone_staff"): VoxTrans( "voxel.weapon.staff.firestaff_bone", (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, ), - Tool(Staff("AmethystStaff")): VoxTrans( + Tool("common.items.npc_weapons.staff.bone_staff"): VoxTrans( + "voxel.weapon.staff.firestaff_bone", + (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.staff.amethyst_staff"): VoxTrans( "voxel.weapon.staff.firestaff_amethyst", (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, ), - Tool(Staff("CultistStaff")): VoxTrans( + Tool("common.items.weapons.staff.cultist_staff"): VoxTrans( + "voxel.weapon.staff.firestaff_cultist", + (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, + ), + Tool("common.items.npc_weapons.staff.cultist_staff"): VoxTrans( "voxel.weapon.staff.firestaff_cultist", (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, ), // Healing staff - Tool(Sceptre("Sceptre")): VoxTrans( + Tool("common.items.weapons.sceptre.staff_nature"): VoxTrans( "voxel.weapon.sceptre.wood-nature", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2, ), - Tool(Sceptre("StarterSceptre")): VoxTrans( + Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans( "voxel.weapon.sceptre.wood-simple", (0.0, -0.0, 0.0), (-130., 90.0, 0.0), 1.25, ), - Tool(Sceptre("SceptreVelorite")): VoxTrans( + Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans( "voxel.weapon.sceptre.ore-nature", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15, ), // Shields - Tool(Shield("BasicShield")): VoxTrans( + Tool("common.items.weapons.shield.shield_1"): VoxTrans( + "voxel.weapon.shield.wood-0", + (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4, + ), + Tool("common.items.npc_weapons.shield.shield_1"): VoxTrans( "voxel.weapon.shield.wood-0", (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4, ), @@ -537,43 +589,67 @@ "element.icons.lantern_red-0", ), // Farming Equipment - Tool(Farming("Broom")): VoxTrans( + Tool("common.items.weapons.tool.broom"): VoxTrans( "voxel.weapon.tool.broom-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Farming("Hoe0")): VoxTrans( + Tool("common.items.weapons.tool.hoe"): VoxTrans( "voxel.weapon.tool.hoe_green", (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0, ), - Tool(Farming("Hoe1")): VoxTrans( - "voxel.weapon.tool.hoe_blue", - (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0, - ), - Tool(Farming("Pitchfork")): VoxTrans( + Tool("common.items.weapons.tool.pitchfork"): VoxTrans( "voxel.weapon.tool.pitchfork-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), - Tool(Farming("Rake")): VoxTrans( + Tool("common.items.weapons.tool.rake"): VoxTrans( "voxel.weapon.tool.rake-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool(Farming("FishingRod0")): VoxTrans( + Tool("common.items.weapons.tool.fishing_rod"): VoxTrans( "voxel.weapon.tool.fishing_rod_blue-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5, ), - Tool(Farming("FishingRod0")): VoxTrans( - "voxel.weapon.tool.fishing_rod_orange-0", - (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, - ), - Tool(Farming("Pickaxe0")): VoxTrans( + Tool("common.items.weapons.tool.pickaxe"): VoxTrans( "voxel.weapon.tool.pickaxe_green-0", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool(Farming("Shovel0")): VoxTrans( + Tool("common.items.weapons.tool.shovel-0"): VoxTrans( "voxel.weapon.tool.shovel_green", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Tool(Farming("Shovel1")): VoxTrans( + Tool("common.items.weapons.tool.shovel-1"): VoxTrans( + "voxel.weapon.tool.shovel_gold", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.npc_weapons.tool.broom"): VoxTrans( + "voxel.weapon.tool.broom-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.npc_weapons.tool.hoe"): VoxTrans( + "voxel.weapon.tool.hoe_green", + (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0, + ), + Tool("common.items.npc_weapons.tool.pitchfork"): VoxTrans( + "voxel.weapon.tool.pitchfork-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.npc_weapons.tool.rake"): VoxTrans( + "voxel.weapon.tool.rake-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.npc_weapons.tool.fishing_rod"): VoxTrans( + "voxel.weapon.tool.fishing_rod_blue-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5, + ), + Tool("common.items.npc_weapons.tool.pickaxe"): VoxTrans( + "voxel.weapon.tool.pickaxe_green-0", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.npc_weapons.tool.shovel-0"): VoxTrans( + "voxel.weapon.tool.shovel_green", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.npc_weapons.tool.shovel-1"): VoxTrans( "voxel.weapon.tool.shovel_gold", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), @@ -1282,7 +1358,11 @@ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), // Debug Items - Tool(Debug("Boost")): VoxTrans( + Tool("common.items.debug.boost"): VoxTrans( + "voxel.weapon.tool.broom_belzeshrub_purple", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, + ), + Tool("common.items.debug.possess"): VoxTrans( "voxel.weapon.tool.broom_belzeshrub_purple", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 66e9cdb4fe..5a3f965d8f 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -1,572 +1,660 @@ ({ //Swords - Sword("BasicSword"): ( + Tool(Tool("common.items.weapons.sword.starter_sword")): ( vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), color: None ), - Sword("Rapier"): ( + Tool(Tool("common.items.npc_weapons.sword.starter_sword")): ( vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), color: None ), - Sword("WoodTraining"): ( + Tool("common.items.weapons.sword.wood_sword"): ( vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)), color: None ), - Sword("Zweihander0"): ( + Tool("common.items.weapons.sword.zweihander_sword_0"): ( vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), color: None ), - Sword("Short0"): ( + Tool("common.items.npc_weapons.sword.zweihander_sword_0"): ( + vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), + color: None + ), + Tool("common.items.weapons.sword.short_sword_0"): ( vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)), color: None ), - Sword("GreatswordDam0"): ( + Tool("common.items.weapons.sword.greatsword_2h_dam-0"): ( vox_spec: ("weapon.sword.greatsword_2h_dam-0", (-1.0, -4.5, -6.5)), color: None ), - Sword("GreatswordDam1"): ( + Tool("common.items.weapons.sword.greatsword_2h_dam-1"): ( vox_spec: ("weapon.sword.greatsword_2h_dam-1", (-1.0, -4.5, -6.5)), color: None ), - Sword("GreatswordDam2"): ( + Tool("common.items.weapons.sword.greatsword_2h_dam-2"): ( vox_spec: ("weapon.sword.greatsword_2h_dam-2", (-1.0, -4.5, -6.5)), color: None ), - Sword("GreatswordSimple0"): ( + Tool("common.items.weapons.sword.greatsword_2h_simple-0"): ( vox_spec: ("weapon.sword.greatsword_2h_simple-0", (-1.0, -4.5, -6.5)), color: None ), - Sword("GreatswordSimple1"): ( + Tool("common.items.weapons.sword.greatsword_2h_simple-1"): ( vox_spec: ("weapon.sword.greatsword_2h_simple-1", (-1.0, -4.5, -6.5)), color: None ), - Sword("GreatswordSimple2"): ( + Tool("common.items.weapons.sword.greatsword_2h_simple-2"): ( vox_spec: ("weapon.sword.greatsword_2h_simple-2", (-1.0, -4.5, -6.5)), color: None ), - Sword("GreatswordOrn0"): ( + Tool("common.items.weapons.sword.greatsword_2h_orn-0"): ( vox_spec: ("weapon.sword.greatsword_2h_orn-0", (-1.0, -4.5, -7.5)), color: None ), - Sword("GreatswordOrn1"): ( + Tool("common.items.weapons.sword.greatsword_2h_orn-1"): ( vox_spec: ("weapon.sword.greatsword_2h_orn-1", (-1.0, -4.5, -7.5)), color: None ), - Sword("GreatswordOrn2"): ( + Tool("common.items.weapons.sword.greatsword_2h_orn-2"): ( vox_spec: ("weapon.sword.greatsword_2h_orn-2", (-1.0, -4.5, -7.5)), color: None ), - Sword("GreatswordFine0"): ( + Tool("common.items.weapons.sword.greatsword_2h_fine-0"): ( vox_spec: ("weapon.sword.greatsword_2h_fine-0", (-2.0, -6.5, -8.0)), color: None ), - Sword("GreatswordFine1"): ( + Tool("common.items.weapons.sword.greatsword_2h_fine-1"): ( vox_spec: ("weapon.sword.greatsword_2h_fine-1", (-2.0, -6.5, -8.0)), color: None ), - Sword("GreatswordFine2"): ( + Tool("common.items.weapons.sword.greatsword_2h_fine-2"): ( vox_spec: ("weapon.sword.greatsword_2h_fine-2", (-2.0, -6.5, -8.0)), color: None ), - Sword("LongDam0"): ( + Tool("common.items.weapons.sword.long_2h_dam-0"): ( vox_spec: ("weapon.sword.long_2h_dam-0", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongDam1"): ( + Tool("common.items.weapons.sword.long_2h_dam-1"): ( vox_spec: ("weapon.sword.long_2h_dam-1", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongDam2"): ( + Tool("common.items.weapons.sword.long_2h_dam-2"): ( vox_spec: ("weapon.sword.long_2h_dam-2", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongDam3"): ( + Tool("common.items.weapons.sword.long_2h_dam-3"): ( vox_spec: ("weapon.sword.long_2h_dam-3", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongDam4"): ( + Tool("common.items.weapons.sword.long_2h_dam-4"): ( vox_spec: ("weapon.sword.long_2h_dam-4", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongDam5"): ( + Tool("common.items.weapons.sword.long_2h_dam-5"): ( vox_spec: ("weapon.sword.long_2h_dam-5", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongSimple0"): ( + Tool("common.items.weapons.sword.long_2h_simple-0"): ( vox_spec: ("weapon.sword.long_2h_simple-0", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongSimple1"): ( + Tool("common.items.weapons.sword.long_2h_simple-1"): ( vox_spec: ("weapon.sword.long_2h_simple-1", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongSimple2"): ( + Tool("common.items.weapons.sword.long_2h_simple-2"): ( vox_spec: ("weapon.sword.long_2h_simple-2", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongSimple3"): ( + Tool("common.items.weapons.sword.long_2h_simple-3"): ( vox_spec: ("weapon.sword.long_2h_simple-3", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongSimple4"): ( + Tool("common.items.weapons.sword.long_2h_simple-4"): ( vox_spec: ("weapon.sword.long_2h_simple-4", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongSimple5"): ( + Tool("common.items.weapons.sword.long_2h_simple-5"): ( vox_spec: ("weapon.sword.long_2h_simple-5", (-1.0, -3.5, -5.0)), color: None ), - Sword("LongOrn0"): ( + Tool("common.items.weapons.sword.long_2h_orn-0"): ( vox_spec: ("weapon.sword.long_2h_orn-0", (-1.0, -3.5, -6.0)), color: None ), - Sword("LongOrn1"): ( + Tool("common.items.weapons.sword.long_2h_orn-1"): ( vox_spec: ("weapon.sword.long_2h_orn-1", (-1.0, -3.5, -6.0)), color: None ), - Sword("LongOrn2"): ( + Tool("common.items.weapons.sword.long_2h_orn-2"): ( vox_spec: ("weapon.sword.long_2h_orn-2", (-1.0, -3.5, -6.0)), color: None ), - Sword("LongOrn3"): ( + Tool("common.items.weapons.sword.long_2h_orn-3"): ( vox_spec: ("weapon.sword.long_2h_orn-3", (-1.0, -3.5, -6.0)), color: None ), - Sword("LongOrn4"): ( + Tool("common.items.weapons.sword.long_2h_orn-4"): ( vox_spec: ("weapon.sword.long_2h_orn-4", (-1.0, -3.5, -6.0)), color: None ), - Sword("LongOrn5"): ( + Tool("common.items.weapons.sword.long_2h_orn-5"): ( vox_spec: ("weapon.sword.long_2h_orn-5", (-1.0, -3.5, -6.0)), color: None ), - Sword("LongFine0"): ( + Tool("common.items.weapons.sword.long_2h_fine-0"): ( vox_spec: ("weapon.sword.long_2h_fine-0", (-2.0, -4.5, -6.0)), color: None ), - Sword("LongFine1"): ( + Tool("common.items.weapons.sword.long_2h_fine-1"): ( vox_spec: ("weapon.sword.long_2h_fine-1", (-2.0, -4.5, -6.0)), color: None ), - Sword("LongFine2"): ( + Tool("common.items.weapons.sword.long_2h_fine-2"): ( vox_spec: ("weapon.sword.long_2h_fine-2", (-2.0, -4.5, -6.0)), color: None ), - Sword("LongFine3"): ( + Tool("common.items.weapons.sword.long_2h_fine-3"): ( vox_spec: ("weapon.sword.long_2h_fine-3", (-2.0, -4.5, -6.0)), color: None ), - Sword("LongFine4"): ( + Tool("common.items.weapons.sword.long_2h_fine-4"): ( vox_spec: ("weapon.sword.long_2h_fine-4", (-2.0, -4.5, -6.0)), color: None ), - Sword("LongFine5"): ( + Tool("common.items.weapons.sword.long_2h_fine-5"): ( vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)), color: None ), - Sword("CultPurp0"): ( + Tool("common.items.weapons.sword.cultist_purp_2h-0"): ( + vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), + color: None + ), + Tool("common.items.npc_weapons.sword.cultist_purp_2h-0"): ( + vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), + color: None + ), + Tool("common.items.npc_weapons.sword.cultist_purp_2h_boss-0"): ( vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), color: None ), // Axes - Axe("BasicAxe"): ( + Tool("common.items.npc_weapons.axe.starter_axe"): ( vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), color: None ), - Axe("OrcAxe0"): ( + Tool("common.items.weapons.axe.starter_axe"): ( + vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), + color: None + ), + Tool("common.items.weapons.axe.orc_axe-0"): ( vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -3.0, -4.5)), color: None ), - Axe("WornIronAxe0"): ( + Tool("common.items.weapons.axe.worn_iron_axe-0"): ( vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -3.0, -4.0)), color: None ), - Axe("WornIronAxe1"): ( + Tool("common.items.weapons.axe.worn_iron_axe-1"): ( vox_spec: ("weapon.axe.2haxe_worn_iron-1", (-1.5, -4.0, -4.0)), color: None ), - Axe("WornIronAxe2"): ( + Tool("common.items.weapons.axe.worn_iron_axe-2"): ( vox_spec: ("weapon.axe.2haxe_worn_iron-2", (-1.5, -4.0, -4.0)), color: None ), - Axe("WornIronAxe3"): ( + Tool("common.items.weapons.axe.worn_iron_axe-3"): ( vox_spec: ("weapon.axe.2haxe_worn_iron-3", (-1.5, -8.0, -4.0)),//offcenterY color: None ), - Axe("WornIronAxe4"): ( + Tool("common.items.weapons.axe.worn_iron_axe-4"): ( vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -4.0, -5.5)), color: None ), - Axe("BronzeAxe0"): ( + Tool("common.items.weapons.axe.bronze_axe-0"): ( vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -4.0, -4.5)), color: None ), - Axe("BronzeAxe1"): ( + Tool("common.items.weapons.axe.bronze_axe-1"): ( vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)), color: None ), - Axe("IronAxe0"): ( + Tool("common.items.weapons.axe.iron_axe-0"): ( vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)), color: None ), - Axe("IronAxe1"): ( + Tool("common.items.weapons.axe.iron_axe-1"): ( vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -5.0, -5.5)), color: None ), - Axe("IronAxe2"): ( + Tool("common.items.weapons.axe.iron_axe-2"): ( vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -5.0, -5.5)), color: None ), - Axe("IronAxe3"): ( + Tool("common.items.weapons.axe.iron_axe-3"): ( vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -6.0, -6.5)), color: None ), - Axe("IronAxe4"): ( + Tool("common.items.weapons.axe.iron_axe-4"): ( vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -6.0, -5.5)), color: None ), - Axe("IronAxe5"): ( + Tool("common.items.weapons.axe.iron_axe-5"): ( vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -6.0, -5.0)), color: None ), - Axe("IronAxe6"): ( + Tool("common.items.weapons.axe.iron_axe-6"): ( vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -5.0, -6.0)), color: None ), - Axe("IronAxe7"): ( + Tool("common.items.weapons.axe.iron_axe-7"): ( vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -5.0, -5.0)), color: None ), - Axe("IronAxe8"): ( + Tool("common.items.weapons.axe.iron_axe-8"): ( vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -5.0, -5.0)), color: None ), - Axe("IronAxe9"): ( + Tool("common.items.weapons.axe.iron_axe-9"): ( vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -4.0, -5.0)), color: None ), - Axe("SteelAxe0"): ( + Tool("common.items.weapons.axe.steel_axe-0"): ( vox_spec: ("weapon.axe.2haxe_steel-0", (-1.5, -6.0, -4.5)), color: None ), - Axe("SteelAxe1"): ( + Tool("common.items.weapons.axe.steel_axe-1"): ( vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -7.0, -5.5)), color: None ), - Axe("SteelAxe2"): ( + Tool("common.items.weapons.axe.steel_axe-2"): ( vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -3.5, -3.5)), color: None ), - Axe("SteelAxe3"): ( + Tool("common.items.weapons.axe.steel_axe-3"): ( vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -4.0, -6.0)), color: None ), - Axe("SteelAxe4"): ( + Tool("common.items.weapons.axe.steel_axe-4"): ( vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -4.0, -5.5)), color: None ), - Axe("SteelAxe5"): ( + Tool("common.items.weapons.axe.steel_axe-5"): ( vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -5.5, -5.5)), color: None ), - Axe("SteelAxe6"): ( + Tool("common.items.weapons.axe.steel_axe-6"): ( vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -4.0, -4.0)), color: None ), - Axe("BloodsteelAxe0"): ( + Tool("common.items.weapons.axe.bloodsteel_axe-0"): ( vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-1.5, -7.0, -4.0)), color: None ), - Axe("BloodsteelAxe1"): ( + Tool("common.items.weapons.axe.bloodsteel_axe-1"): ( vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -5.5, -5.0)), color: None ), - Axe("BloodsteelAxe2"): ( + Tool("common.items.weapons.axe.bloodsteel_axe-2"): ( vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -5.0, -4.0)), color: None ), - Axe("CobaltAxe0"): ( + Tool("common.items.weapons.axe.cobalt_axe-0"): ( vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), color: None ), - Axe("MalachiteAxe0"): ( + Tool("common.items.npc_weapons.axe.malachite_axe-0"): ( + vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), + color: None + ), + Tool("common.items.weapons.axe.malachite_axe-0"): ( vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), color: None ), // Hammers - Hammer("BasicHammer"): ( + Tool("common.items.weapons.hammer.hammer_1"): ( vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), color: None ), - Hammer("WoodHammer0"): ( + Tool("common.items.weapons.hammer.starter_hammer"): ( + vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), + color: None + ), + Tool("common.items.npc_weapons.hammer.starter_hammer"): ( + vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), + color: None + ), + Tool("common.items.weapons.hammer.wood_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_wood-0", (-3.5, -5.5, -4.5)), color: None ), - Hammer("FlimsyHammer"): ( + Tool("common.items.weapons.hammer.flimsy_hammer"): ( vox_spec: ("weapon.hammer.2hhammer_flimsy", (-2.5, -5.5, -4.0)), color: None ), - Hammer("StoneHammer0"): ( + Tool("common.items.weapons.hammer.stone_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_stone-0", (-3.5, -6.5, -5.0)), color: None ), - Hammer("StoneHammer1"): ( + Tool("common.items.weapons.hammer.stone_hammer-1"): ( vox_spec: ("weapon.hammer.2hhammer_stone-1", (-3.5, -6.5, -5.0)), color: None ), - Hammer("StoneHammer2"): ( + Tool("common.items.weapons.hammer.stone_hammer-2"): ( vox_spec: ("weapon.hammer.2hhammer_stone-2", (-3.5, -6.5, -5.0)), color: None ), - Hammer("StoneHammer3"): ( + Tool("common.items.weapons.hammer.stone_hammer-3"): ( vox_spec: ("weapon.hammer.2hhammer_stone-3", (-2.5, -6.5, -5.0)), color: None ), - Hammer("WornIronHammer0"): ( + Tool("common.items.weapons.hammer.worn_iron_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_worn_iron-0", (-2.5, -4.5, -4.0)), color: None ), - Hammer("WornIronHammer1"): ( + Tool("common.items.weapons.hammer.worn_iron_hammer-1"): ( vox_spec: ("weapon.hammer.2hhammer_worn_iron-1", (-2.5, -4.5, -3.0)), color: None ), - Hammer("WornIronHammer2"): ( + Tool("common.items.weapons.hammer.worn_iron_hammer-2"): ( vox_spec: ("weapon.hammer.2hhammer_worn_iron-2", (-2.5, -3.5, -3.0)), color: None ), - Hammer("WornIronHammer3"): ( + Tool("common.items.weapons.hammer.worn_iron_hammer-3"): ( vox_spec: ("weapon.hammer.2hhammer_worn_iron-3", (-2.5, -4.5, -3.0)), color: None ), - Hammer("BronzeHammer0"): ( + Tool("common.items.weapons.hammer.bronze_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_bronze-0", (-2.5, -6.5, -5.0)), color: None ), - Hammer("BronzeHammer1"): ( + Tool("common.items.weapons.hammer.bronze_hammer-1"): ( vox_spec: ("weapon.hammer.2hhammer_bronze-1", (-3.5, -3.5, -4.0)), color: None ), - Hammer("IronHammer0"): ( + Tool("common.items.weapons.hammer.iron_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_iron-0", (-2.5, -6.5, -4.0)), color: None ), - Hammer("IronHammer1"): ( + Tool("common.items.weapons.hammer.iron_hammer-1"): ( vox_spec: ("weapon.hammer.2hhammer_iron-1", (-3.5, -7.5, -5.0)), color: None ), - Hammer("IronHammer2"): ( + Tool("common.items.weapons.hammer.iron_hammer-2"): ( vox_spec: ("weapon.hammer.2hhammer_iron-2", (-3.5, -3.5, -5.0)), color: None ), - Hammer("IronHammer3"): ( + Tool("common.items.weapons.hammer.iron_hammer-3"): ( vox_spec: ("weapon.hammer.2hhammer_iron-3", (-3.5, -3.5, -5.0)), color: None ), - Hammer("IronHammer4"): ( + Tool("common.items.weapons.hammer.iron_hammer-4"): ( vox_spec: ("weapon.hammer.2hhammer_iron-4", (-3.5, -7.5, -4.0)), color: None ), - Hammer("IronHammer5"): ( + Tool("common.items.weapons.hammer.iron_hammer-5"): ( vox_spec: ("weapon.hammer.2hhammer_iron-5", (-1.5, -7.0, -5.0)), color: None ), - Hammer("IronHammer6"): ( + Tool("common.items.weapons.hammer.iron_hammer-6"): ( vox_spec: ("weapon.hammer.2hhammer_iron-6", (-2.5, -7.0, -5.0)), color: None ), - Hammer("IronHammer7"): ( + Tool("common.items.weapons.hammer.iron_hammer-7"): ( vox_spec: ("weapon.hammer.2hhammer_iron-7", (-3.5, -7.5, -5.0)), color: None ), - Hammer("IronHammer8"): ( + Tool("common.items.weapons.hammer.iron_hammer-8"): ( vox_spec: ("weapon.hammer.2hhammer_iron-8", (-1.5, -5.5, -7.0)), color: None ), - Hammer("SteelHammer0"): ( + Tool("common.items.weapons.hammer.steel_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_steel-0", (-2.5, -5.5, -5.0)), color: None ), - Hammer("SteelHammer1"): ( + Tool("common.items.weapons.hammer.steel_hammer-1"): ( vox_spec: ("weapon.hammer.2hhammer_steel-1", (-3.5, -7.5, -5.0)), color: None ), - Hammer("SteelHammer2"): ( + Tool("common.items.weapons.hammer.steel_hammer-2"): ( vox_spec: ("weapon.hammer.2hhammer_steel-2", (-3.5, -3.5, -3.0)), color: None ), - Hammer("SteelHammer3"): ( + Tool("common.items.weapons.hammer.steel_hammer-3"): ( vox_spec: ("weapon.hammer.2hhammer_steel-3", (-5.5, -5.5, -4.5)), color: None ), - Hammer("SteelHammer4"): ( + Tool("common.items.weapons.hammer.steel_hammer-4"): ( vox_spec: ("weapon.hammer.2hhammer_steel-4", (-3.5, -7.5, -4.0)), color: None ), - Hammer("SteelHammer5"): ( + Tool("common.items.weapons.hammer.steel_hammer-5"): ( vox_spec: ("weapon.hammer.2hhammer_steel-5", (-5.5, -5.5, -5.0)), color: None ), - Hammer("CobaltHammer0"): ( + Tool("common.items.weapons.hammer.cobalt_hammer-0"): ( vox_spec: ("weapon.hammer.2hhammer_cobalt-0", (-2.5, -7.5, -6.0)), color: None ), - Hammer("CobaltHammer1"): ( + Tool("common.items.weapons.hammer.cobalt_hammer-1"): ( vox_spec: ("weapon.hammer.2hhammer_cobalt-1", (-4.5, -4.5, -4.0)), color: None ), - Hammer("RunicHammer"): ( + Tool("common.items.weapons.hammer.runic_hammer"): ( vox_spec: ("weapon.hammer.2hhammer_runic", (-2.5, -7.5, -5.0)), color: None ), - Hammer("RamsheadHammer"): ( + Tool("common.items.weapons.hammer.ramshead_hammer"): ( vox_spec: ("weapon.hammer.2hhammer_ramshead", (-4.5, -5.5, -5.0)), color: None ), - Hammer("Mjolnir"): ( + Tool("common.items.weapons.hammer.mjolnir"): ( vox_spec: ("weapon.hammer.2hhammer_mjolnir", (-2.5, -8.5, -4.0)), color: None ), - Hammer("CultPurp0"): ( + Tool("common.items.weapons.hammer.cultist_purp_2h-0"): ( vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)), color: None ), - /*Dagger("Craftsman"): ( //TODO This should be a 1h hammer! + Tool("common.items.npc_weapons.hammer.cultist_purp_2h-0"): ( + vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)), + color: None + ), + /*"Craftsman": ( //TODO This should be a 1h hammer! vox_spec: ("weapon.hammer.craftsman", (-2.0, -5.0, -5.5)), color: None ),*/ // Daggers - Dagger("BasicDagger"): ( + Tool("common.items.weapons.dagger.starter_dagger"): ( + vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), + color: None + ), + Tool("common.items.npc_weapons.dagger.starter_dagger"): ( vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), color: None ), // Shields - Shield("BasicShield"): ( + Tool("common.items.weapons.shield.shield_1"): ( + vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)), + color: None + ), + Tool("common.items.npc_weapons.shield.shield_1"): ( vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)), color: None ), // Bows - Bow("ShortBow0"): ( + Tool("common.items.weapons.bow.starter_bow"): ( vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)), color: None ), - Bow("WoodShortbow0"): ( + Tool("common.items.weapons.bow.wood_shortbow-0"): ( vox_spec: ("weapon.bow.shortbow_wood-0", (-0.5, -3.0, -9.5)), color: None ), - Bow("WoodShortbow1"): ( + Tool("common.items.weapons.bow.wood_shortbow-1"): ( vox_spec: ("weapon.bow.shortbow_wood-1", (-0.5, -3.5, -9.5)), color: None ), - Bow("LeafyShortbow0"): ( + Tool("common.items.weapons.bow.leafy_shortbow-0"): ( vox_spec: ("weapon.bow.shortbow_leafy-0", (-0.5, -4.5, -9.0)), color: None ), - Bow("WoodLongbow0"): ( + Tool("common.items.weapons.bow.wood_longbow-0"): ( vox_spec: ("weapon.bow.longbow_wood-0", (-0.5, -3.5, -12.5)), color: None ), - Bow("WoodLongbow1"): ( + Tool("common.items.weapons.bow.wood_longbow-1"): ( vox_spec: ("weapon.bow.longbow_wood-1", (-1.5, -3.5, -12.5)), color: None ), - Bow("LeafyLongbow0"): ( + Tool("common.items.weapons.bow.leafy_longbow-0"): ( vox_spec: ("weapon.bow.longbow_leafy-0", (-1.5, -4.5, -12.5)), color: None ), - Bow("HornLongbow0"): ( + Tool("common.items.weapons.bow.horn_longbow-0"): ( vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), color: None ), - Bow("IronLongbow0"): ( + Tool("common.items.npc_weapons.bow.horn_longbow-0"): ( + vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), + color: None + ), + Tool("common.items.weapons.bow.iron_longbow-0"): ( vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)), color: None ), - Bow("RareLongbow"): ( + Tool("common.items.weapons.bow.rare_longbow"): ( vox_spec: ("weapon.bow.longbow_rare", (-1.5, -5.0, -13.5)), color: None ), - Bow("NatureOreLongbow"): ( + Tool("common.items.weapons.bow.nature_ore_longbow-0"): ( vox_spec: ("weapon.bow.longbow_ore_nature-0", (-1.5, -4.0, -15.0)), color: None ), // Farming Equipment - Farming("Broom"): ( + Tool("common.items.weapons.tool.broom"): ( vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)), color: None ), - Farming("Hoe0"): ( + Tool("common.items.weapons.tool.hoe"): ( vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)), color: None ), - Farming("Hoe1"): ( - vox_spec: ("weapon.tool.hoe_blue", (-2.5, -4.5, -4.0)), - color: None - ), - Farming("Pitchfork"): ( + Tool("common.items.weapons.tool.pitchfork"): ( vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)), color: None ), - Farming("FishingRod0"): ( + Tool("common.items.weapons.tool.fishing_rod"): ( vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)), color: None ), - Farming("Rake"): ( + Tool("common.items.weapons.tool.rake"): ( vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)), color: None - ), - Farming("FishingRod1"): ( - vox_spec: ("weapon.tool.fishing_rod_orange-0", (-2.5, -4.5, -4.0)), - color: None - ), - Farming("Pickaxe0"): ( + ), + Tool("common.items.weapons.tool.pickaxe"): ( vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)), color: None ), - Farming("Shovel0"): ( + Tool("common.items.weapons.tool.shovel-0"): ( vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)), color: None ), - Farming("Shovel1"): ( + Tool("common.items.weapons.tool.shovel-1"): ( vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)), color: None ), - // Staves - Staff("BasicStaff"): ( + Tool("common.items.npc_weapons.tool.broom"): ( + vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.hoe"): ( + vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.pitchfork"): ( + vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.fishing_rod"): ( + vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.rake"): ( + vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.pickaxe"): ( + vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.shovel-0"): ( + vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)), + color: None + ), + Tool("common.items.npc_weapons.tool.shovel-1"): ( + vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)), + color: None + ), + // Staves + Tool("common.items.weapons.staff.staff_1"): ( vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)), color: None ), - Staff("BoneStaff"): ( + Tool("common.items.weapons.staff.starter_staff"): ( + vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)), + color: None + ), + Tool("common.items.weapons.staff.bone_staff"): ( vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)), color: None ), - Staff("AmethystStaff"): ( + Tool("common.items.npc_weapons.staff.bone_staff"): ( + vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)), + color: None + ), + Tool("common.items.weapons.staff.amethyst_staff"): ( vox_spec: ("weapon.staff.firestaff_amethyst", (-1.5, -4.0, -4.0)), color: None ), - Staff("CultistStaff"): ( + Tool("common.items.weapons.staff.cultist_staff"): ( vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)), color: None ), - // Healing staff - Sceptre("StarterSceptre"): ( + Tool("common.items.npc_weapons.staff.cultist_staff"): ( + vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)), + color: None + ), + // Healing sceptre + Tool("common.items.weapons.sceptre.starter_sceptre"): ( vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)), color: None ), - Sceptre("Sceptre"): ( + Tool("common.items.weapons.sceptre.staff_nature"): ( vox_spec: ("weapon.sceptre.wood-nature", (-1.0, -6.0, -5.0)), color: None ), - Sceptre("SceptreVelorite"): ( + Tool("common.items.weapons.sceptre.sceptre_velorite_0"): ( vox_spec: ("weapon.sceptre.ore-nature", (-2.0, -6.0, -5.0)), color: None ), // Misc - Debug("Boost"): ( + Tool("common.items.debug.boost"): ( vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), color: None - ), + ), + Tool("common.items.debug.possess"): ( + vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), + color: None + ), // Misc - Empty: ( + Tool("common.items.weapons.empty.empty"): ( vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), color: None - ), + ), + Tool("common.items.npc_weapons.empty.empty"): ( + vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), + color: None + ), }) diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 6ef4d82215..2094f78176 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -2,7 +2,7 @@ pub mod armor; pub mod tool; // Reexports -pub use tool::{Hands, Tool, ToolKind}; +pub use tool::{Hands, Tool, ToolKind, UniqueKind}; use crate::{ assets::{self, Asset, Error}, @@ -351,6 +351,7 @@ pub trait ItemDesc { fn name(&self) -> &str; fn kind(&self) -> &ItemKind; fn quality(&self) -> &Quality; + fn item_definition_id(&self) -> &str; } impl ItemDesc for Item { @@ -361,6 +362,8 @@ impl ItemDesc for Item { fn kind(&self) -> &ItemKind { &self.item_def.kind } fn quality(&self) -> &Quality { &self.item_def.quality } + + fn item_definition_id(&self) -> &str { &self.item_def.item_definition_id } } impl ItemDesc for ItemDef { @@ -371,6 +374,8 @@ impl ItemDesc for ItemDef { fn kind(&self) -> &ItemKind { &self.kind } fn quality(&self) -> &Quality { &self.quality } + + fn item_definition_id(&self) -> &str { &self.item_definition_id } } impl Component for Item { diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index d094c1c11c..f968b55704 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -16,17 +16,17 @@ use std::time::Duration; #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum ToolKind { - Sword(String), - Axe(String), - Hammer(String), - Bow(String), - Dagger(String), - Staff(String), - Sceptre(String), - Shield(String), - NpcWeapon(String), - Debug(String), - Farming(String), + Sword, + Axe, + Hammer, + Bow, + Dagger, + Staff, + Sceptre, + Shield, + Unique(UniqueKind), + Debug, + Farming, /// This is an placeholder item, it is used by non-humanoid npcs to attack Empty, } @@ -34,17 +34,17 @@ pub enum ToolKind { impl ToolKind { pub fn hands(&self) -> Hands { match self { - ToolKind::Sword(_) => Hands::TwoHand, - ToolKind::Axe(_) => Hands::TwoHand, - ToolKind::Hammer(_) => Hands::TwoHand, - ToolKind::Bow(_) => Hands::TwoHand, - ToolKind::Dagger(_) => Hands::OneHand, - ToolKind::Staff(_) => Hands::TwoHand, - ToolKind::Sceptre(_) => Hands::TwoHand, - ToolKind::Shield(_) => Hands::OneHand, - ToolKind::NpcWeapon(_) => Hands::TwoHand, - ToolKind::Debug(_) => Hands::TwoHand, - ToolKind::Farming(_) => Hands::TwoHand, + ToolKind::Sword => Hands::TwoHand, + ToolKind::Axe => Hands::TwoHand, + ToolKind::Hammer => Hands::TwoHand, + ToolKind::Bow => Hands::TwoHand, + ToolKind::Dagger => Hands::OneHand, + ToolKind::Staff => Hands::TwoHand, + ToolKind::Sceptre => Hands::TwoHand, + ToolKind::Shield => Hands::OneHand, + ToolKind::Unique(_) => Hands::TwoHand, + ToolKind::Debug => Hands::TwoHand, + ToolKind::Farming => Hands::TwoHand, ToolKind::Empty => Hands::OneHand, } } @@ -90,8 +90,9 @@ impl Tool { use CharacterAbility::*; use ToolKind::*; + use UniqueKind::*; match &self.kind { - Sword(_) => vec![ + Sword => vec![ ComboMelee { stage_data: vec![ combo_melee::Stage { @@ -173,7 +174,7 @@ impl Tool { num_spins: 3, }, ], - Axe(_) => vec![ + Axe => vec![ BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(600), @@ -212,7 +213,7 @@ impl Tool { vertical_leap_strength: 8.0, }, ], - Hammer(_) => vec![ + Hammer => vec![ BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(600), @@ -250,7 +251,7 @@ impl Tool { vertical_leap_strength: 8.0, }, ], - Farming(_) => vec![BasicMelee { + Farming => vec![BasicMelee { energy_cost: 1, buildup_duration: Duration::from_millis(600), swing_duration: Duration::from_millis(100), @@ -260,7 +261,7 @@ impl Tool { range: 3.5, max_angle: 20.0, }], - Bow(_) => vec![ + Bow => vec![ BasicRanged { energy_cost: 0, buildup_duration: Duration::from_millis(100), @@ -353,7 +354,7 @@ impl Tool { reps_remaining: 5, }, ], - Dagger(_) => vec![BasicMelee { + Dagger => vec![BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(100), swing_duration: Duration::from_millis(100), @@ -363,7 +364,7 @@ impl Tool { range: 3.5, max_angle: 20.0, }], - Sceptre(_) => vec![ + Sceptre => vec![ BasicBeam { buildup_duration: Duration::from_millis(250), recover_duration: Duration::from_millis(250), @@ -442,7 +443,7 @@ impl Tool { projectile_speed: 40.0, }, ], - Staff(_) => vec![ + Staff => vec![ BasicRanged { energy_cost: 0, buildup_duration: Duration::from_millis(500), @@ -517,7 +518,7 @@ impl Tool { move_efficiency: 0.1, }, ], - Shield(_) => vec![ + Shield => vec![ BasicMelee { energy_cost: 0, buildup_duration: Duration::from_millis(100), @@ -530,59 +531,43 @@ impl Tool { }, BasicBlock, ], - NpcWeapon(kind) => { - if kind == "StoneGolemsFist" { - vec![ - BasicMelee { - energy_cost: 0, - buildup_duration: Duration::from_millis(400), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(250), - knockback: 25.0, - base_damage: 200, - range: 5.0, - max_angle: 120.0, - }, - Shockwave { - energy_cost: 0, - buildup_duration: Duration::from_millis(500), - swing_duration: Duration::from_millis(200), - recover_duration: Duration::from_millis(800), - damage: 500, - knockback: Knockback::TowardsUp(40.0), - shockwave_angle: 90.0, - shockwave_vertical_angle: 15.0, - shockwave_speed: 20.0, - shockwave_duration: Duration::from_millis(2000), - requires_ground: true, - move_efficiency: 0.05, - }, - ] - } else if kind == "BeastClaws" { - vec![BasicMelee { - energy_cost: 0, - buildup_duration: Duration::from_millis(250), - swing_duration: Duration::from_millis(250), - recover_duration: Duration::from_millis(250), - knockback: 25.0, - base_damage: 200, - range: 5.0, - max_angle: 120.0, - }] - } else { - vec![BasicMelee { - energy_cost: 0, - buildup_duration: Duration::from_millis(100), - swing_duration: Duration::from_millis(100), - recover_duration: Duration::from_millis(200), - base_damage: 10, - knockback: 0.0, - range: 1.0, - max_angle: 30.0, - }] - } - }, - Debug(_) => vec![ + Unique(StoneGolemFist) => vec![ + BasicMelee { + energy_cost: 0, + buildup_duration: Duration::from_millis(400), + swing_duration: Duration::from_millis(100), + recover_duration: Duration::from_millis(250), + knockback: 25.0, + base_damage: 200, + range: 5.0, + max_angle: 120.0, + }, + Shockwave { + energy_cost: 0, + buildup_duration: Duration::from_millis(500), + swing_duration: Duration::from_millis(200), + recover_duration: Duration::from_millis(800), + damage: 500, + knockback: Knockback::TowardsUp(40.0), + shockwave_angle: 90.0, + shockwave_vertical_angle: 15.0, + shockwave_speed: 20.0, + shockwave_duration: Duration::from_millis(2000), + requires_ground: true, + move_efficiency: 0.05, + }, + ], + Unique(BeastClaws) => vec![BasicMelee { + energy_cost: 0, + buildup_duration: Duration::from_millis(250), + swing_duration: Duration::from_millis(250), + recover_duration: Duration::from_millis(250), + knockback: 25.0, + base_damage: 200, + range: 5.0, + max_angle: 120.0, + }], + Debug => vec![ CharacterAbility::Boost { movement_duration: Duration::from_millis(50), only_up: false, @@ -624,3 +609,9 @@ impl Tool { } } } + +#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum UniqueKind { + StoneGolemFist, + BeastClaws, +} diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs index c076e91458..39948e5184 100644 --- a/common/src/sys/agent.rs +++ b/common/src/sys/agent.rs @@ -4,7 +4,10 @@ use crate::{ agent::Activity, group, group::Invite, - item::{tool::ToolKind, ItemKind}, + item::{ + tool::{ToolKind, UniqueKind}, + ItemKind, + }, Agent, Alignment, Body, CharacterState, ControlAction, ControlEvent, Controller, Energy, GroupManip, Health, LightEmitter, Loadout, MountState, Ori, PhysicsState, Pos, Scale, UnresolvedChatMsg, Vel, @@ -317,14 +320,13 @@ impl<'a> System<'a> for Sys { None } }) { - Some(ToolKind::Bow(_)) => Tactic::RangedPowerup, - Some(ToolKind::Staff(_)) => Tactic::Staff, - Some(ToolKind::Hammer(_)) => Tactic::Hammer, - Some(ToolKind::Sword(_)) => Tactic::Sword, - Some(ToolKind::Axe(_)) => Tactic::Axe, - Some(ToolKind::NpcWeapon(kind)) => match kind.as_str() { - "StoneGolemsFist" => Tactic::StoneGolemBoss, - _ => Tactic::Melee, + Some(ToolKind::Bow) => Tactic::RangedPowerup, + Some(ToolKind::Staff) => Tactic::Staff, + Some(ToolKind::Hammer) => Tactic::Hammer, + Some(ToolKind::Sword) => Tactic::Sword, + Some(ToolKind::Axe) => Tactic::Axe, + Some(ToolKind::Unique(UniqueKind::StoneGolemFist)) => { + Tactic::StoneGolemBoss }, _ => Tactic::Melee, }; diff --git a/server/src/migrations/2020-11-07-182406_rename_npcweapons/down.sql b/server/src/migrations/2020-11-07-182406_rename_npcweapons/down.sql new file mode 100644 index 0000000000..e4ce35be0a --- /dev/null +++ b/server/src/migrations/2020-11-07-182406_rename_npcweapons/down.sql @@ -0,0 +1,6 @@ +-- This file should undo anything in `up.sql` + +UPDATE item +SET item_definition_id = 'common.items.npc_weapons.npcweapon.beast_claws' WHERE item_definition_id = 'common.items.npc_weapons.unique.beast_claws'; +UPDATE item +SET item_definition_id = 'common.items.npc_weapons.npcweapon.stone_golems_fist' WHERE item_definition_id = 'common.items.npc_weapons.unique.stone_golems_fist'; \ No newline at end of file diff --git a/server/src/migrations/2020-11-07-182406_rename_npcweapons/up.sql b/server/src/migrations/2020-11-07-182406_rename_npcweapons/up.sql new file mode 100644 index 0000000000..8951bb1e3f --- /dev/null +++ b/server/src/migrations/2020-11-07-182406_rename_npcweapons/up.sql @@ -0,0 +1,6 @@ +-- Changes filepaths of npcweapons + +UPDATE item +SET item_definition_id = 'common.items.npc_weapons.unique.beast_claws' WHERE item_definition_id = 'common.items.npc_weapons.npcweapon.beast_claws'; +UPDATE item +SET item_definition_id = 'common.items.npc_weapons.unique.stone_golems_fist' WHERE item_definition_id = 'common.items.npc_weapons.npcweapon.stone_golems_fist'; \ No newline at end of file diff --git a/tools/src/main.rs b/tools/src/main.rs index 12f7b62c8c..62995f9e24 100644 --- a/tools/src/main.rs +++ b/tools/src/main.rs @@ -72,38 +72,21 @@ fn weapon_stats() -> Result<(), Box> { fn get_tool_kind(kind: &ToolKind) -> String { match kind { - ToolKind::Sword(_) => "Sword".to_string(), - ToolKind::Axe(_) => "Axe".to_string(), - ToolKind::Hammer(_) => "Hammer".to_string(), - ToolKind::Bow(_) => "Bow".to_string(), - ToolKind::Dagger(_) => "Dagger".to_string(), - ToolKind::Staff(_) => "Staff".to_string(), - ToolKind::Sceptre(_) => "Sceptre".to_string(), - ToolKind::Shield(_) => "Shield".to_string(), - ToolKind::Debug(_) => "Debug".to_string(), - ToolKind::Farming(_) => "Farming".to_string(), - ToolKind::NpcWeapon(_) => "NpcWeapon".to_string(), + ToolKind::Sword => "Sword".to_string(), + ToolKind::Axe => "Axe".to_string(), + ToolKind::Hammer => "Hammer".to_string(), + ToolKind::Bow => "Bow".to_string(), + ToolKind::Dagger => "Dagger".to_string(), + ToolKind::Staff => "Staff".to_string(), + ToolKind::Sceptre => "Sceptre".to_string(), + ToolKind::Shield => "Shield".to_string(), + ToolKind::Debug => "Debug".to_string(), + ToolKind::Farming => "Farming".to_string(), + ToolKind::Unique(_) => "Unique".to_string(), ToolKind::Empty => "Empty".to_string(), } } -fn get_tool_kind_kind(kind: &ToolKind) -> String { - match kind { - ToolKind::Sword(x) => x.clone(), - ToolKind::Axe(x) => x.clone(), - ToolKind::Hammer(x) => x.clone(), - ToolKind::Bow(x) => x.clone(), - ToolKind::Dagger(x) => x.clone(), - ToolKind::Staff(x) => x.clone(), - ToolKind::Sceptre(x) => x.clone(), - ToolKind::Shield(x) => x.clone(), - ToolKind::Debug(x) => x.clone(), - ToolKind::Farming(x) => x.clone(), - ToolKind::NpcWeapon(x) => x.clone(), - ToolKind::Empty => "".to_string(), - } -} - fn get_armor_kind(kind: &ArmorKind) -> String { match kind { ArmorKind::Shoulder(_) => "Shoulder".to_string(), @@ -146,7 +129,6 @@ fn all_items() -> Result<(), Box> { let kind = match item.kind() { ItemKind::Armor(armor) => get_armor_kind_kind(&armor.kind), ItemKind::Lantern(lantern) => lantern.kind.clone(), - ItemKind::Tool(tool) => get_tool_kind_kind(&tool.kind), _ => "".to_owned(), }; diff --git a/voxygen/src/anim/src/biped_large/alpha.rs b/voxygen/src/anim/src/biped_large/alpha.rs index 0ba316bdb5..31181f1489 100644 --- a/voxygen/src/anim/src/biped_large/alpha.rs +++ b/voxygen/src/anim/src/biped_large/alpha.rs @@ -56,7 +56,7 @@ impl Animation for AlphaAnimation { next.torso.position = Vec3::new(0.0, 0.0, 0.1); next.torso.orientation = Quaternion::rotation_z(0.0); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -87,7 +87,7 @@ impl Animation for AlphaAnimation { movement1 * -0.9 + (movement2 * 1.75).sin() * 2.5 + movement3 * -0.5, ); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.hand_l.position = Vec3::new(-12.0, 0.0, 10.0); next.hand_l.orientation = Quaternion::rotation_x(0.0) * Quaternion::rotation_z(-2.0); @@ -138,7 +138,7 @@ impl Animation for AlphaAnimation { * Quaternion::rotation_y(slowersmooth * 0.35 - 0.3) * Quaternion::rotation_z(1.4 + slowersmooth * 0.2); }, - Some(ToolKind::Debug(_)) => { + Some(ToolKind::Debug) => { next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0); next.hand_l.orientation = Quaternion::rotation_x(1.27); next.main.position = Vec3::new(-5.0, 5.0, 23.0); diff --git a/voxygen/src/anim/src/biped_large/beam.rs b/voxygen/src/anim/src/biped_large/beam.rs index 475368b107..38319a44bb 100644 --- a/voxygen/src/anim/src/biped_large/beam.rs +++ b/voxygen/src/anim/src/biped_large/beam.rs @@ -54,7 +54,7 @@ impl Animation for BeamAnimation { * Quaternion::rotation_z(0.0); match active_tool_kind { - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.control.position = Vec3::new( s_a.stc.0 + (movement1 * 26.0) * (1.0 - movement3), s_a.stc.1 + (movement1 + (movement2 * 8.0).sin() * 2.0) * (1.0 - movement3), diff --git a/voxygen/src/anim/src/biped_large/charge.rs b/voxygen/src/anim/src/biped_large/charge.rs index 72554c733b..732a751f2f 100644 --- a/voxygen/src/anim/src/biped_large/charge.rs +++ b/voxygen/src/anim/src/biped_large/charge.rs @@ -78,7 +78,7 @@ impl Animation for ChargeAnimation { next.lower_torso.orientation = Quaternion::rotation_z(stop * -0.7 + tilt * 4.0); match active_tool_kind { - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3); @@ -98,7 +98,7 @@ impl Animation for ChargeAnimation { * Quaternion::rotation_y(s_a.stc.4) * Quaternion::rotation_z(s_a.stc.5 + stop * 0.2); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2); diff --git a/voxygen/src/anim/src/biped_large/dash.rs b/voxygen/src/anim/src/biped_large/dash.rs index 0163991731..e23047edd2 100644 --- a/voxygen/src/anim/src/biped_large/dash.rs +++ b/voxygen/src/anim/src/biped_large/dash.rs @@ -69,7 +69,7 @@ impl Animation for DashAnimation { match active_tool_kind { //TODO: Inventory - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.head.position = Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1 + movement2.min(1.0) * 1.0); next.head.orientation = Quaternion::rotation_x(0.0) diff --git a/voxygen/src/anim/src/biped_large/equip.rs b/voxygen/src/anim/src/biped_large/equip.rs index 10f029911f..dd063cb044 100644 --- a/voxygen/src/anim/src/biped_large/equip.rs +++ b/voxygen/src/anim/src/biped_large/equip.rs @@ -33,19 +33,19 @@ impl Animation for EquipAnimation { next.control.position = Vec3::new(equip_slowa * -1.5, 0.0, equip_slow * 1.5); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.hand_l.position = Vec3::new(-18.0, -8.0, -1.0); next.hand_r.position = Vec3::new(-16.0, -7.5, -4.0); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { next.hand_l.position = Vec3::new(-7.0, -5.0, 17.0); next.hand_r.position = Vec3::new(-5.0, -4.5, 14.0); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.hand_l.position = Vec3::new(-15.0, -7.0, 3.0); next.hand_r.position = Vec3::new(-13.0, -6.5, 0.0); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(4.0, -6.0, 0.0); next.hand_r.position = Vec3::new(6.0, -6.0, 6.0); next.hand_l.orientation = @@ -53,7 +53,7 @@ impl Animation for EquipAnimation { next.hand_r.orientation = Quaternion::rotation_y(2.2) * Quaternion::rotation_z(-1.57); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.hand_l.position = Vec3::new(-3.0, -5.0, 9.0); next.hand_r.position = Vec3::new(-1.75, -4.5, 7.0); }, diff --git a/voxygen/src/anim/src/biped_large/idle.rs b/voxygen/src/anim/src/biped_large/idle.rs index 4a9412707c..a65afb011c 100644 --- a/voxygen/src/anim/src/biped_large/idle.rs +++ b/voxygen/src/anim/src/biped_large/idle.rs @@ -90,19 +90,19 @@ impl Animation for IdleAnimation { Quaternion::rotation_z(0.0 + slow * 0.2) * Quaternion::rotation_x(0.0); match active_tool_kind { - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(-2.0, -5.0, -6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(-6.0, -5.0, -12.0); next.main.orientation = Quaternion::rotation_y(0.6) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(-10.0, -8.0, 12.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.main.position = Vec3::new(-10.0, -8.0, 12.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, diff --git a/voxygen/src/anim/src/biped_large/jump.rs b/voxygen/src/anim/src/biped_large/jump.rs index f09aefa242..e2aa7bf7e1 100644 --- a/voxygen/src/anim/src/biped_large/jump.rs +++ b/voxygen/src/anim/src/biped_large/jump.rs @@ -60,19 +60,19 @@ impl Animation for JumpAnimation { next.second.scale = Vec3::one() * 0.0; match active_tool_kind { - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(-2.0, -5.0, -6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(-6.0, -5.0, -12.0); next.main.orientation = Quaternion::rotation_y(0.6) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(-10.0, -8.0, 12.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.main.position = Vec3::new(-10.0, -8.0, 12.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, diff --git a/voxygen/src/anim/src/biped_large/leapmelee.rs b/voxygen/src/anim/src/biped_large/leapmelee.rs index 0f2b5e99c1..5e9255a4aa 100644 --- a/voxygen/src/anim/src/biped_large/leapmelee.rs +++ b/voxygen/src/anim/src/biped_large/leapmelee.rs @@ -38,7 +38,7 @@ impl Animation for LeapAnimation { _ => (0.0, 0.0, 0.0, 0.0), }; - if let Some(ToolKind::Hammer(_)) = active_tool_kind { + if let Some(ToolKind::Hammer) = active_tool_kind { next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3); next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2); diff --git a/voxygen/src/anim/src/biped_large/run.rs b/voxygen/src/anim/src/biped_large/run.rs index b6550dcc0e..8ca0796598 100644 --- a/voxygen/src/anim/src/biped_large/run.rs +++ b/voxygen/src/anim/src/biped_large/run.rs @@ -298,22 +298,22 @@ impl Animation for RunAnimation { * Quaternion::rotation_z(0.0); match active_tool_kind { - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(-2.0, -5.0, -6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(-6.0, -5.0, -12.0); next.main.orientation = Quaternion::rotation_y(0.6) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(-10.0, -8.0, 12.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.main.position = Vec3::new(-10.0, -8.0, 12.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); diff --git a/voxygen/src/anim/src/biped_large/shoot.rs b/voxygen/src/anim/src/biped_large/shoot.rs index e188cb5c2e..714f82bc82 100644 --- a/voxygen/src/anim/src/biped_large/shoot.rs +++ b/voxygen/src/anim/src/biped_large/shoot.rs @@ -317,7 +317,7 @@ impl Animation for ShootAnimation { next.lower_torso.orientation = next.upper_torso.orientation * -0.08; match active_tool_kind { - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3); @@ -337,7 +337,7 @@ impl Animation for ShootAnimation { * Quaternion::rotation_y(s_a.stc.4) * Quaternion::rotation_z(s_a.stc.5 + exp * 1.5); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.hand_l.position = Vec3::new( s_a.bhl.0 - exp * 2.0, s_a.bhl.1 - exp * 4.0, diff --git a/voxygen/src/anim/src/biped_large/spin.rs b/voxygen/src/anim/src/biped_large/spin.rs index c49eccaa8e..93297a2d29 100644 --- a/voxygen/src/anim/src/biped_large/spin.rs +++ b/voxygen/src/anim/src/biped_large/spin.rs @@ -51,7 +51,7 @@ impl Animation for SpinAnimation { next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); - if let Some(ToolKind::Sword(_)) = active_tool_kind { + if let Some(ToolKind::Sword) = active_tool_kind { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -92,8 +92,7 @@ impl Animation for SpinAnimation { next.torso.orientation = Quaternion::rotation_z(movement2 * 6.28); } - if let Some(ToolKind::Axe(_) | ToolKind::Hammer(_) | ToolKind::Dagger(_)) = active_tool_kind - { + if let Some(ToolKind::Axe | ToolKind::Hammer | ToolKind::Dagger) = active_tool_kind { next.hand_l.position = Vec3::new(-0.75, -1.0, -2.5); next.hand_l.orientation = Quaternion::rotation_x(1.27); next.hand_r.position = Vec3::new(0.75, -1.5, -5.5); diff --git a/voxygen/src/anim/src/biped_large/spinmelee.rs b/voxygen/src/anim/src/biped_large/spinmelee.rs index 815f598be7..db255fc79c 100644 --- a/voxygen/src/anim/src/biped_large/spinmelee.rs +++ b/voxygen/src/anim/src/biped_large/spinmelee.rs @@ -62,7 +62,7 @@ impl Animation for SpinMeleeAnimation { let quick = (anim_time as f32 * lab as f32 * 8.0).sin(); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -85,7 +85,7 @@ impl Animation for SpinMeleeAnimation { next.head.orientation = Quaternion::rotation_x(-0.15 + movement3 * 0.15); next.lower_torso.orientation = Quaternion::rotation_x(0.2); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { next.hand_l.position = Vec3::new(-0.5, 0.0, 4.0); next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(PI); diff --git a/voxygen/src/anim/src/biped_large/wield.rs b/voxygen/src/anim/src/biped_large/wield.rs index 626fcf4037..bd77702bb5 100644 --- a/voxygen/src/anim/src/biped_large/wield.rs +++ b/voxygen/src/anim/src/biped_large/wield.rs @@ -2,7 +2,7 @@ use super::{ super::{vek::*, Animation}, BipedLargeSkeleton, SkeletonAttr, }; -use common::comp::item::ToolKind; +use common::comp::item::{ToolKind, UniqueKind}; use std::{f32::consts::PI, ops::Mul}; pub struct WieldAnimation; @@ -208,7 +208,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_z(test * 0.02); } match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4); @@ -222,7 +222,7 @@ impl Animation for WieldAnimation { next.control.orientation = Quaternion::rotation_x(u_slow * 0.15) * Quaternion::rotation_z(u_slowalt * 0.08); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3) * Quaternion::rotation_y(s_a.bhl.4) @@ -243,7 +243,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(s_a.bc.4) * Quaternion::rotation_z(s_a.bc.5 + u_slowalt * 0.1); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4) @@ -262,7 +262,7 @@ impl Animation for WieldAnimation { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_y(0.0); }, - Some(ToolKind::Staff(_)) => { + Some(ToolKind::Staff) => { next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3) * Quaternion::rotation_y(s_a.sthl.4); @@ -283,7 +283,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(0.15) * Quaternion::rotation_z(u_slowalt * 0.08); }, - Some(ToolKind::NpcWeapon(_)) => { + Some(ToolKind::Unique(UniqueKind::BeastClaws)) => { next.shoulder_l.position = Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2); diff --git a/voxygen/src/anim/src/character/alpha.rs b/voxygen/src/anim/src/character/alpha.rs index 8e58cd38b2..4e8bfd697b 100644 --- a/voxygen/src/anim/src/character/alpha.rs +++ b/voxygen/src/anim/src/character/alpha.rs @@ -65,7 +65,7 @@ impl Animation for AlphaAnimation { next.torso.position = Vec3::new(0.0, 0.0, 0.1) * s_a.scaler; next.torso.orientation = Quaternion::rotation_z(0.0); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -96,13 +96,13 @@ impl Animation for AlphaAnimation { movement1 * -0.9 + (movement2 * 1.75).sin() * 2.5 + movement3 * -0.5, ); }, - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.control_l.position = Vec3::new(-10.0 + push * 5.0, 6.0 + push * 5.0, 2.0); next.control_l.orientation = Quaternion::rotation_x(-1.4 + slow * 0.4) * Quaternion::rotation_y(slow * -1.3) * Quaternion::rotation_z(1.4 + slow * -0.5); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { next.head.position = Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1); next.head.orientation = Quaternion::rotation_z(0.1 + axe * 0.2) * Quaternion::rotation_x(0.0) @@ -129,7 +129,7 @@ impl Animation for AlphaAnimation { * Quaternion::rotation_z(PI * 0.4); next.lantern.orientation = Quaternion::rotation_x(0.4); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.hand_l.position = Vec3::new(-12.0, 0.0, 0.0); next.hand_l.orientation = Quaternion::rotation_x(-0.0) * Quaternion::rotation_y(0.0); @@ -187,7 +187,7 @@ impl Animation for AlphaAnimation { * Quaternion::rotation_y(slowersmooth * 0.35 - 0.3) * Quaternion::rotation_z(1.4 + slowersmooth * 0.2); }, - Some(ToolKind::Debug(_)) => { + Some(ToolKind::Debug) => { next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0); next.hand_l.orientation = Quaternion::rotation_x(1.27); next.main.position = Vec3::new(-5.0, 5.0, 23.0); diff --git a/voxygen/src/anim/src/character/beam.rs b/voxygen/src/anim/src/character/beam.rs index 4bd3614a63..e4015c7131 100644 --- a/voxygen/src/anim/src/character/beam.rs +++ b/voxygen/src/anim/src/character/beam.rs @@ -54,7 +54,7 @@ impl Animation for BeamAnimation { * Quaternion::rotation_z(0.0); match active_tool_kind { - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.control.position = Vec3::new( s_a.stc.0 + (movement1 * 16.0) * (1.0 - movement3), s_a.stc.1 + (movement1 + (movement2 * 8.0).sin() * 2.0) * (1.0 - movement3), diff --git a/voxygen/src/anim/src/character/charge.rs b/voxygen/src/anim/src/character/charge.rs index 64a8af041e..b6ee338285 100644 --- a/voxygen/src/anim/src/character/charge.rs +++ b/voxygen/src/anim/src/character/charge.rs @@ -85,7 +85,7 @@ impl Animation for ChargeAnimation { next.shorts.orientation = Quaternion::rotation_z(stop * -0.7 + tilt * 4.0); match active_tool_kind { - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3); @@ -105,7 +105,7 @@ impl Animation for ChargeAnimation { * Quaternion::rotation_y(s_a.stc.4) * Quaternion::rotation_z(s_a.stc.5 + stop * 0.2); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2); diff --git a/voxygen/src/anim/src/character/chargeswing.rs b/voxygen/src/anim/src/character/chargeswing.rs index b0f569d52c..d02fa6bb52 100644 --- a/voxygen/src/anim/src/character/chargeswing.rs +++ b/voxygen/src/anim/src/character/chargeswing.rs @@ -49,7 +49,7 @@ impl Animation for ChargeswingAnimation { Some(StageSection::Recover) => (1.0, 1.0, (anim_time as f32).powf(4.0), 0.0), _ => (0.0, 0.0, 0.0, 0.0), }; - if let Some(ToolKind::Hammer(_)) = active_tool_kind { + if let Some(ToolKind::Hammer) = active_tool_kind { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); next.hand_l.position = Vec3::new( diff --git a/voxygen/src/anim/src/character/dash.rs b/voxygen/src/anim/src/character/dash.rs index 051364a6ba..3efa5b6d4e 100644 --- a/voxygen/src/anim/src/character/dash.rs +++ b/voxygen/src/anim/src/character/dash.rs @@ -68,7 +68,7 @@ impl Animation for DashAnimation { next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); diff --git a/voxygen/src/anim/src/character/equip.rs b/voxygen/src/anim/src/character/equip.rs index 6d33314e0f..c9b1f37460 100644 --- a/voxygen/src/anim/src/character/equip.rs +++ b/voxygen/src/anim/src/character/equip.rs @@ -32,23 +32,23 @@ impl Animation for EquipAnimation { next.control.position = Vec3::new(equip_slowa * -1.5, 0.0, equip_slow * 1.5); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.hand_l.position = Vec3::new(-8.0, -5.0, 17.0); next.hand_r.position = Vec3::new(-6.0, -4.5, 14.0); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { next.hand_l.position = Vec3::new(-7.0, -5.0, 17.0); next.hand_r.position = Vec3::new(-5.0, -4.5, 14.0); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.hand_l.position = Vec3::new(-5.0, -5.0, 13.0); next.hand_r.position = Vec3::new(-3.0, -4.5, 10.0); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(-3.0, -5.0, 8.0); next.hand_r.position = Vec3::new(-1.75, -4.5, 5.0); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.hand_l.position = Vec3::new(-3.0, -5.0, 9.0); next.hand_r.position = Vec3::new(-1.75, -4.5, 7.0); }, diff --git a/voxygen/src/anim/src/character/idle.rs b/voxygen/src/anim/src/character/idle.rs index c44fbb8515..1c9546dc98 100644 --- a/voxygen/src/anim/src/character/idle.rs +++ b/voxygen/src/anim/src/character/idle.rs @@ -79,21 +79,21 @@ impl Animation for IdleAnimation { next.glider.scale = Vec3::one() * 0.0; match active_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.main.position = Vec3::new(-4.0, -5.0, 7.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.main.position = Vec3::new(-0.0, -5.0, 3.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, -5.0, 6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(2.0, -5.0, -1.0); next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); }, @@ -104,12 +104,12 @@ impl Animation for IdleAnimation { } match second_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.second.position = Vec3::new(4.0, -6.0, 7.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.second.position = Vec3::new(0.0, -4.0, 3.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI); diff --git a/voxygen/src/anim/src/character/jump.rs b/voxygen/src/anim/src/character/jump.rs index b529d5e9f7..27db8b89b4 100644 --- a/voxygen/src/anim/src/character/jump.rs +++ b/voxygen/src/anim/src/character/jump.rs @@ -126,21 +126,21 @@ impl Animation for JumpAnimation { next.glider.scale = Vec3::one() * 0.0; match active_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.main.position = Vec3::new(-4.0, -5.0, 7.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.main.position = Vec3::new(-0.0, -5.0, 3.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(2.0, -5.0, -1.0); next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, -5.0, 6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, @@ -151,12 +151,12 @@ impl Animation for JumpAnimation { } match second_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.second.position = Vec3::new(4.0, -6.0, 7.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.second.position = Vec3::new(0.0, -4.0, 3.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI); diff --git a/voxygen/src/anim/src/character/leapmelee.rs b/voxygen/src/anim/src/character/leapmelee.rs index e31ea1af95..89fc320472 100644 --- a/voxygen/src/anim/src/character/leapmelee.rs +++ b/voxygen/src/anim/src/character/leapmelee.rs @@ -39,7 +39,7 @@ impl Animation for LeapAnimation { _ => (0.0, 0.0, 0.0, 0.0), }; - if let Some(ToolKind::Hammer(_)) = active_tool_kind { + if let Some(ToolKind::Hammer) = active_tool_kind { next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3); next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2); @@ -82,7 +82,7 @@ impl Animation for LeapAnimation { s_a.foot.2 + 5.0 + movement3 * -5.0, ); next.foot_r.orientation = Quaternion::rotation_x(0.9 + movement3 * -1.7); - } else if let Some(ToolKind::Axe(_)) = active_tool_kind { + } else if let Some(ToolKind::Axe) = active_tool_kind { next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.ahl.3); next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2); diff --git a/voxygen/src/anim/src/character/repeater.rs b/voxygen/src/anim/src/character/repeater.rs index 2f5c754f07..bf6d204d0a 100644 --- a/voxygen/src/anim/src/character/repeater.rs +++ b/voxygen/src/anim/src/character/repeater.rs @@ -42,7 +42,7 @@ impl Animation for RepeaterAnimation { fn fire(x: f32) -> f32 { (x * 18.0).sin() } - if let Some(ToolKind::Bow(_)) = active_tool_kind { + if let Some(ToolKind::Bow) = active_tool_kind { next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3); next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2); diff --git a/voxygen/src/anim/src/character/run.rs b/voxygen/src/anim/src/character/run.rs index 115628ac0a..f807d1e9f0 100644 --- a/voxygen/src/anim/src/character/run.rs +++ b/voxygen/src/anim/src/character/run.rs @@ -187,21 +187,21 @@ impl Animation for RunAnimation { next.glider.scale = Vec3::one() * 0.0; match active_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.main.position = Vec3::new(-4.0, -5.0, 7.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.main.position = Vec3::new(-0.0, -5.0, 3.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(2.0, -5.0, -1.0); next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, -5.0, 6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, @@ -213,12 +213,12 @@ impl Animation for RunAnimation { } match second_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.second.position = Vec3::new(4.0, -6.0, 7.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.second.position = Vec3::new(0.0, -4.0, 3.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI); diff --git a/voxygen/src/anim/src/character/shoot.rs b/voxygen/src/anim/src/character/shoot.rs index 9d5e3f5ab8..fc2aa952b5 100644 --- a/voxygen/src/anim/src/character/shoot.rs +++ b/voxygen/src/anim/src/character/shoot.rs @@ -55,7 +55,7 @@ impl Animation for ShootAnimation { next.shorts.orientation = next.chest.orientation * -0.08; match active_tool_kind { - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2); next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3); @@ -72,7 +72,7 @@ impl Animation for ShootAnimation { * Quaternion::rotation_y(s_a.stc.4) * Quaternion::rotation_z(s_a.stc.5 + exp * 1.5); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.hand_l.position = Vec3::new( s_a.bhl.0 - exp * 2.0, s_a.bhl.1 - exp * 4.0, diff --git a/voxygen/src/anim/src/character/spin.rs b/voxygen/src/anim/src/character/spin.rs index 1988c5d04b..15159c53d4 100644 --- a/voxygen/src/anim/src/character/spin.rs +++ b/voxygen/src/anim/src/character/spin.rs @@ -54,7 +54,7 @@ impl Animation for SpinAnimation { next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); - if let Some(ToolKind::Sword(_)) = active_tool_kind { + if let Some(ToolKind::Sword) = active_tool_kind { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -98,8 +98,7 @@ impl Animation for SpinAnimation { next.torso.orientation = Quaternion::rotation_z(movement2 * 6.28); } - if let Some(ToolKind::Axe(_) | ToolKind::Hammer(_) | ToolKind::Dagger(_)) = active_tool_kind - { + if let Some(ToolKind::Axe | ToolKind::Hammer | ToolKind::Dagger) = active_tool_kind { next.hand_l.position = Vec3::new(-0.75, -1.0, -2.5); next.hand_l.orientation = Quaternion::rotation_x(1.27); next.hand_r.position = Vec3::new(0.75, -1.5, -5.5); diff --git a/voxygen/src/anim/src/character/spinmelee.rs b/voxygen/src/anim/src/character/spinmelee.rs index 84b7ac69d0..590c47ccdf 100644 --- a/voxygen/src/anim/src/character/spinmelee.rs +++ b/voxygen/src/anim/src/character/spinmelee.rs @@ -62,7 +62,7 @@ impl Animation for SpinMeleeAnimation { let quick = (anim_time as f32 * lab as f32 * 8.0).sin(); match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -90,7 +90,7 @@ impl Animation for SpinMeleeAnimation { next.belt.orientation = Quaternion::rotation_x(0.1); next.shorts.orientation = Quaternion::rotation_x(0.2); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { next.hand_l.position = Vec3::new(-0.5, 0.0, 4.0); next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(PI); diff --git a/voxygen/src/anim/src/character/stand.rs b/voxygen/src/anim/src/character/stand.rs index 4920c14d6b..b9cb4be619 100644 --- a/voxygen/src/anim/src/character/stand.rs +++ b/voxygen/src/anim/src/character/stand.rs @@ -96,21 +96,21 @@ impl Animation for StandAnimation { next.glider.scale = Vec3::one() * 0.0; next.hold.position = Vec3::new(0.4, -0.3, -5.8); match active_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.main.position = Vec3::new(-4.0, -5.0, 7.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.main.position = Vec3::new(-0.0, -5.0, 3.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, -5.0, 6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(2.0, -5.0, -1.0); next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); }, @@ -121,12 +121,12 @@ impl Animation for StandAnimation { } match second_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.second.position = Vec3::new(4.0, -6.0, 7.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.second.position = Vec3::new(0.0, -4.0, 3.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI); diff --git a/voxygen/src/anim/src/character/swim.rs b/voxygen/src/anim/src/character/swim.rs index c0504ae876..71a8142ec3 100644 --- a/voxygen/src/anim/src/character/swim.rs +++ b/voxygen/src/anim/src/character/swim.rs @@ -168,21 +168,21 @@ impl Animation for SwimAnimation { next.glider.scale = Vec3::one() * 0.0; match active_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.main.position = Vec3::new(-4.0, -5.0, 7.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.main.position = Vec3::new(-0.0, -5.0, 3.0); next.main.orientation = Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.main.position = Vec3::new(2.0, -5.0, -1.0); next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, -5.0, 6.0); next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); }, @@ -193,12 +193,12 @@ impl Animation for SwimAnimation { } match second_tool_kind { - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.second.position = Vec3::new(4.0, -6.0, 7.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.second.position = Vec3::new(0.0, -4.0, 3.0); next.second.orientation = Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI); diff --git a/voxygen/src/anim/src/character/swimwield.rs b/voxygen/src/anim/src/character/swimwield.rs index f72e83d819..bf7a77e272 100644 --- a/voxygen/src/anim/src/character/swimwield.rs +++ b/voxygen/src/anim/src/character/swimwield.rs @@ -124,7 +124,7 @@ impl Animation for SwimWieldAnimation { next.shorts.orientation = Quaternion::rotation_z(0.3); } match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.hand_l.position = Vec3::new(-0.75, -1.0, -2.5); next.hand_l.orientation = Quaternion::rotation_x(1.47) * Quaternion::rotation_y(-0.2); @@ -143,7 +143,7 @@ impl Animation for SwimWieldAnimation { * Quaternion::rotation_y(0.0) * Quaternion::rotation_z(u_slowalt * 0.08); }, - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { let hand_scale = 1.12; next.control.position = Vec3::new(0.0, 0.0, 0.0); @@ -174,7 +174,7 @@ impl Animation for SwimWieldAnimation { next.control_r.position = Vec3::new(7.0, 0.0, 0.0); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { if velocity < 0.5 { next.head.position = Vec3::new(0.0, -3.5 + s_a.head.0, s_a.head.1 + u_slow * 0.1); @@ -216,7 +216,7 @@ impl Animation for SwimWieldAnimation { next.control.position = Vec3::new(-3.0, 11.0, 3.0); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.hand_l.position = Vec3::new(-12.0, 0.0, 0.0); next.hand_l.orientation = Quaternion::rotation_x(-0.0) * Quaternion::rotation_y(0.0); @@ -234,7 +234,7 @@ impl Animation for SwimWieldAnimation { * Quaternion::rotation_y(0.0) * Quaternion::rotation_z(u_slowalt * 0.08); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { next.hand_l.position = Vec3::new(1.5, 0.5, -4.0); next.hand_l.orientation = Quaternion::rotation_x(1.47) * Quaternion::rotation_y(-0.3); @@ -254,7 +254,7 @@ impl Animation for SwimWieldAnimation { * Quaternion::rotation_y(-0.2) * Quaternion::rotation_z(u_slowalt * 0.1); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { let hand_scale = 1.12; next.control.position = Vec3::new(0.0, 0.0, 0.0); @@ -285,7 +285,7 @@ impl Animation for SwimWieldAnimation { next.control_r.position = Vec3::new(7.0, 0.0, 0.0); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.hand_l.position = Vec3::new(2.0, 1.5, 0.0); next.hand_l.orientation = Quaternion::rotation_x(1.20) * Quaternion::rotation_y(-0.6) @@ -311,7 +311,7 @@ impl Animation for SwimWieldAnimation { next.control.orientation = Quaternion::rotation_x(u_slow * 0.2) * Quaternion::rotation_z(u_slowalt * 0.1); }, - Some(ToolKind::Debug(_)) => { + Some(ToolKind::Debug) => { next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0); next.hand_l.orientation = Quaternion::rotation_x(1.27) * Quaternion::rotation_y(0.0) diff --git a/voxygen/src/anim/src/character/wield.rs b/voxygen/src/anim/src/character/wield.rs index 50c93a92d0..3075c24b53 100644 --- a/voxygen/src/anim/src/character/wield.rs +++ b/voxygen/src/anim/src/character/wield.rs @@ -183,7 +183,7 @@ impl Animation for WieldAnimation { next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1); } match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -198,7 +198,7 @@ impl Animation for WieldAnimation { next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + u_slow * 0.15) * Quaternion::rotation_z(u_slowalt * 0.08); }, - Some(ToolKind::Dagger(_)) => { + Some(ToolKind::Dagger) => { next.control.position = Vec3::new(0.0, 0.0, 0.0); next.hand_l.position = Vec3::new(0.0, 0.0, 0.0); @@ -225,7 +225,7 @@ impl Animation for WieldAnimation { next.control_r.position = Vec3::new(7.0, 0.0, 0.0); }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); @@ -258,7 +258,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(s_a.ac.4) * Quaternion::rotation_z(s_a.ac.5); }, - Some(ToolKind::Hammer(_)) => { + Some(ToolKind::Hammer) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2); @@ -277,7 +277,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(s_a.hc.4 + speed * -0.04) * Quaternion::rotation_z(s_a.hc.5 + u_slowalt * 0.07); }, - Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { if speed > 0.5 && velocity.z == 0.0 { next.hand_r.position = Vec3::new( 4.0 + s_a.hand.0 + foothoril * 1.3, @@ -304,7 +304,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(s_a.stc.4) * Quaternion::rotation_z(s_a.stc.5 + u_slowalt * 0.1); }, - Some(ToolKind::Shield(_)) => { + Some(ToolKind::Shield) => { next.control.position = Vec3::new(0.0, 0.0, 0.0); next.hand_l.position = Vec3::new(0.0, 0.0, 0.0); @@ -323,7 +323,7 @@ impl Animation for WieldAnimation { next.control_r.position = Vec3::new(7.0, 0.0, 0.0); }, - Some(ToolKind::Bow(_)) => { + Some(ToolKind::Bow) => { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_x(0.0); next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2); @@ -340,13 +340,13 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(s_a.bc.4) * Quaternion::rotation_z(s_a.bc.5 + u_slowalt * 0.1); }, - Some(ToolKind::Debug(_)) => { + Some(ToolKind::Debug) => { next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0); next.hand_l.orientation = Quaternion::rotation_x(1.27); next.main.position = Vec3::new(-5.0, 5.0, 23.0); next.main.orientation = Quaternion::rotation_x(PI); }, - Some(ToolKind::Farming(_)) => { + Some(ToolKind::Farming) => { if speed < 0.5 { next.head.orientation = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x(-0.2 + head_look.y.abs()); diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 8d2e393663..3a5fac6700 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -34,10 +34,7 @@ fn maps_wield_while_equipping() { Some(&loadout), ); - assert_eq!( - result, - SfxEvent::Wield(ToolKind::Axe("BasicAxe".to_string())) - ); + assert_eq!(result, SfxEvent::Wield(ToolKind::Axe)); } #[test] @@ -63,10 +60,7 @@ fn maps_unwield() { Some(&loadout), ); - assert_eq!( - result, - SfxEvent::Unwield(ToolKind::Bow("ShortBow0".to_string())) - ); + assert_eq!(result, SfxEvent::Unwield(ToolKind::Bow)); } #[test] @@ -107,10 +101,7 @@ fn maps_basic_melee() { assert_eq!( result, - SfxEvent::Attack( - CharacterAbilityType::BasicMelee, - ToolKind::Axe("BasicAxe".to_string()) - ) + SfxEvent::Attack(CharacterAbilityType::BasicMelee, ToolKind::Axe) ); } @@ -170,7 +161,7 @@ fn matches_ability_stage() { result, SfxEvent::Attack( CharacterAbilityType::ComboMelee(states::utils::StageSection::Swing, 1), - ToolKind::Sword("BasicSword".to_string()) + ToolKind::Sword ) ); } @@ -231,7 +222,7 @@ fn ignores_different_ability_stage() { result, SfxEvent::Attack( CharacterAbilityType::ComboMelee(states::utils::StageSection::Swing, 2), - ToolKind::Sword("BasicSword".to_string()) + ToolKind::Sword ) ); } diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index d86484ac8f..d9fed33b44 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -272,7 +272,7 @@ impl<'a> Widget for Crafting<'a> { let quality_col = get_quality_col(&*recipe.output.0); Button::image( self.item_imgs - .img_id_or_not_found_img((&*recipe.output.0.kind()).into()), + .img_id_or_not_found_img((&*recipe.output.0).into()), ) .w_h(55.0, 55.0) .label(&output_text) @@ -433,20 +433,17 @@ impl<'a> Widget for Crafting<'a> { frame.set(state.ids.ingredient_frame[i], ui); //Item Image let (title, desc) = super::util::item_text(&**item_def); - Button::image( - self.item_imgs - .img_id_or_not_found_img((&*item_def.kind()).into()), - ) - .w_h(22.0, 22.0) - .middle_of(state.ids.ingredient_frame[i]) - .with_tooltip( - self.tooltip_manager, - title, - &*desc, - &item_tooltip, - quality_col, - ) - .set(state.ids.ingredient_img[i], ui); + Button::image(self.item_imgs.img_id_or_not_found_img((&**item_def).into())) + .w_h(22.0, 22.0) + .middle_of(state.ids.ingredient_frame[i]) + .with_tooltip( + self.tooltip_manager, + title, + &*desc, + &item_tooltip, + quality_col, + ) + .set(state.ids.ingredient_img[i], ui); // Ingredients text and amount // Don't show inventory amounts above 999 to avoid the widget clipping let over9k = "99+"; diff --git a/voxygen/src/hud/hotbar.rs b/voxygen/src/hud/hotbar.rs index 7be45e7de9..069c79e95e 100644 --- a/voxygen/src/hud/hotbar.rs +++ b/voxygen/src/hud/hotbar.rs @@ -78,12 +78,12 @@ impl State { use common::comp::item::{tool::ToolKind, ItemKind}; if let ItemKind::Tool(kind) = kind { match &kind.kind { - ToolKind::Staff(_) => true, - ToolKind::Debug(_) => true, - ToolKind::Sword(_) => true, - ToolKind::Hammer(_) => true, - ToolKind::Axe(_) => true, - ToolKind::Bow(_) => true, + ToolKind::Staff => true, + ToolKind::Debug => true, + ToolKind::Sword => true, + ToolKind::Hammer => true, + ToolKind::Axe => true, + ToolKind::Bow => true, _ => false, } } else { diff --git a/voxygen/src/hud/item_imgs.rs b/voxygen/src/hud/item_imgs.rs index b86fa53eb8..9ec179e3a0 100644 --- a/voxygen/src/hud/item_imgs.rs +++ b/voxygen/src/hud/item_imgs.rs @@ -3,8 +3,7 @@ use common::{ assets::{self, watch::ReloadIndicator, Asset}, comp::item::{ armor::{Armor, ArmorKind}, - tool::{Tool, ToolKind}, - Glider, ItemKind, Lantern, Throwable, Utility, + Glider, ItemDesc, ItemKind, Lantern, Throwable, Utility, }, figure::Segment, }; @@ -19,7 +18,7 @@ use vek::*; #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum ItemKey { - Tool(ToolKind), + Tool(String), Lantern(String), Glider(String), Armor(ArmorKind), @@ -30,10 +29,13 @@ pub enum ItemKey { Empty, } -impl From<&ItemKind> for ItemKey { - fn from(item_kind: &ItemKind) -> Self { +impl From<&T> for ItemKey { + fn from(item_desc: &T) -> Self { + let item_kind = item_desc.kind(); + let item_definition_id = item_desc.item_definition_id(); + match item_kind { - ItemKind::Tool(Tool { kind, .. }) => ItemKey::Tool(kind.clone()), + ItemKind::Tool(_) => ItemKey::Tool(item_definition_id.to_owned()), ItemKind::Lantern(Lantern { kind, .. }) => ItemKey::Lantern(kind.clone()), ItemKind::Glider(Glider { kind, .. }) => ItemKey::Glider(kind.clone()), ItemKind::Armor(Armor { kind, .. }) => ItemKey::Armor(kind.clone()), @@ -140,13 +142,13 @@ impl ItemImgs { } } - pub fn img_id(&self, item_kind: ItemKey) -> Option { - match self.map.get(&item_kind) { + pub fn img_id(&self, item_key: ItemKey) -> Option { + match self.map.get(&item_key) { Some(id) => Some(*id), // There was no specification in the ron None => { warn!( - ?item_kind, + ?item_key, "missing specified image file (note: hot-reloading won't work here)", ); None @@ -154,8 +156,8 @@ impl ItemImgs { } } - pub fn img_id_or_not_found_img(&self, item_kind: ItemKey) -> Id { - self.img_id(item_kind).unwrap_or(self.not_found) + pub fn img_id_or_not_found_img(&self, item_key: ItemKey) -> Id { + self.img_id(item_key).unwrap_or(self.not_found) } } diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 0cebc454d3..e8afb91e18 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -526,28 +526,28 @@ impl<'a> Widget for Skillbar<'a> { .map(|i| i.item.kind()) .and_then(|kind| match kind { ItemKind::Tool(Tool { kind, .. }) => match kind { - ToolKind::Hammer(_) => Some(( + ToolKind::Hammer => Some(( "Smash of Doom", "\nAn AOE attack with knockback. \nLeaps to position of \ cursor.", )), - ToolKind::Axe(_) => { + ToolKind::Axe => { Some(("Spin Leap", "\nA slashing running spin leap.")) }, - ToolKind::Staff(_) => Some(( + ToolKind::Staff => Some(( "Firebomb", "\nWhirls a big fireball into the air. \nExplodes the ground \ and does\na big amount of damage", )), - ToolKind::Sword(_) => Some(( + ToolKind::Sword => Some(( "Whirlwind", "\nMove forward while spinning with \n your sword.", )), - ToolKind::Bow(_) => Some(( + ToolKind::Bow => Some(( "Burst", "\nLaunches a burst of arrows at the top \nof a running leap.", )), - ToolKind::Debug(_) => Some(( + ToolKind::Debug => Some(( "Possessing Arrow", "\nShoots a poisonous arrow.\nLets you control your target.", )), @@ -623,15 +623,15 @@ impl<'a> Widget for Skillbar<'a> { Button::image( match self.loadout.active_item.as_ref().map(|i| i.item.kind()) { Some(ItemKind::Tool(Tool { kind, .. })) => match kind { - ToolKind::Sword(_) => self.imgs.twohsword_m1, - ToolKind::Dagger(_) => self.imgs.onehdagger_m1, - ToolKind::Shield(_) => self.imgs.onehshield_m1, - ToolKind::Hammer(_) => self.imgs.twohhammer_m1, - ToolKind::Axe(_) => self.imgs.twohaxe_m1, - ToolKind::Bow(_) => self.imgs.bow_m1, - ToolKind::Sceptre(_) => self.imgs.heal_0, - ToolKind::Staff(_) => self.imgs.fireball, - ToolKind::Debug(_) => self.imgs.flyingrod_m1, + ToolKind::Sword => self.imgs.twohsword_m1, + ToolKind::Dagger => self.imgs.onehdagger_m1, + ToolKind::Shield => self.imgs.onehshield_m1, + ToolKind::Hammer => self.imgs.twohhammer_m1, + ToolKind::Axe => self.imgs.twohaxe_m1, + ToolKind::Bow => self.imgs.bow_m1, + ToolKind::Sceptre => self.imgs.heal_0, + ToolKind::Staff => self.imgs.fireball, + ToolKind::Debug => self.imgs.flyingrod_m1, _ => self.imgs.nothing, }, _ => self.imgs.nothing, @@ -670,36 +670,36 @@ impl<'a> Widget for Skillbar<'a> { .middle_of(state.ids.m2_slot) .set(state.ids.m2_slot_bg, ui); Button::image(match tool_kind { - Some(ToolKind::Sword(_)) => self.imgs.twohsword_m2, - Some(ToolKind::Dagger(_)) => self.imgs.onehdagger_m2, - Some(ToolKind::Shield(_)) => self.imgs.onehshield_m2, - Some(ToolKind::Hammer(_)) => self.imgs.hammergolf, - Some(ToolKind::Axe(_)) => self.imgs.axespin, - Some(ToolKind::Bow(_)) => self.imgs.bow_m2, - Some(ToolKind::Sceptre(_)) => self.imgs.heal_bomb, - Some(ToolKind::Staff(_)) => self.imgs.flamethrower, - Some(ToolKind::Debug(_)) => self.imgs.flyingrod_m2, + Some(ToolKind::Sword) => self.imgs.twohsword_m2, + Some(ToolKind::Dagger) => self.imgs.onehdagger_m2, + Some(ToolKind::Shield) => self.imgs.onehshield_m2, + Some(ToolKind::Hammer) => self.imgs.hammergolf, + Some(ToolKind::Axe) => self.imgs.axespin, + Some(ToolKind::Bow) => self.imgs.bow_m2, + Some(ToolKind::Sceptre) => self.imgs.heal_bomb, + Some(ToolKind::Staff) => self.imgs.flamethrower, + Some(ToolKind::Debug) => self.imgs.flyingrod_m2, _ => self.imgs.nothing, }) .w_h(36.0, 36.0) .middle_of(state.ids.m2_slot_bg) .image_color(match tool_kind { // TODO Automate this to grey out unavailable M2 skills - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { if self.energy.current() as f64 >= 200.0 { Color::Rgba(1.0, 1.0, 1.0, 1.0) } else { Color::Rgba(0.3, 0.3, 0.3, 0.8) } }, - Some(ToolKind::Sceptre(_)) => { + Some(ToolKind::Sceptre) => { if self.energy.current() as f64 >= 400.0 { Color::Rgba(1.0, 1.0, 1.0, 1.0) } else { Color::Rgba(0.3, 0.3, 0.3, 0.8) } }, - Some(ToolKind::Axe(_)) => { + Some(ToolKind::Axe) => { if self.energy.current() as f64 >= 100.0 { Color::Rgba(1.0, 1.0, 1.0, 1.0) } else { diff --git a/voxygen/src/hud/slots.rs b/voxygen/src/hud/slots.rs index 56bd3dda56..f6ae54482c 100644 --- a/voxygen/src/hud/slots.rs +++ b/voxygen/src/hud/slots.rs @@ -32,7 +32,7 @@ impl SlotKey for InventorySlot { type ImageKey = ItemKey; fn image_key(&self, source: &Inventory) -> Option<(Self::ImageKey, Option)> { - source.get(self.0).map(|i| (i.kind().into(), None)) + source.get(self.0).map(|i| (i.into(), None)) } fn amount(&self, source: &Inventory) -> Option { @@ -69,7 +69,7 @@ impl SlotKey for EquipSlot { EquipSlot::Glider => source.glider.as_ref(), }; - item.map(|i| (i.kind().into(), None)) + item.map(|i| (i.into(), None)) } fn amount(&self, _: &Loadout) -> Option { None } @@ -103,7 +103,7 @@ impl<'a> SlotKey, HotbarImageSource<'a>> for HotbarSlot { hotbar.get(*self).and_then(|contents| match contents { hotbar::SlotContents::Inventory(idx) => inventory .get(idx) - .map(|item| HotbarImage::Item(item.kind().into())) + .map(|item| HotbarImage::Item(item.into())) .map(|i| (i, None)), hotbar::SlotContents::Ability3 => loadout .active_item @@ -112,12 +112,12 @@ impl<'a> SlotKey, HotbarImageSource<'a>> for HotbarSlot { .and_then(|kind| { match kind { ItemKind::Tool(Tool { kind, .. }) => match kind { - ToolKind::Staff(_) => Some(HotbarImage::FireAoe), - ToolKind::Hammer(_) => Some(HotbarImage::HammerLeap), - ToolKind::Axe(_) => Some(HotbarImage::AxeLeapSlash), - ToolKind::Bow(_) => Some(HotbarImage::BowJumpBurst), - ToolKind::Debug(_) => Some(HotbarImage::SnakeArrow), - ToolKind::Sword(_) => Some(HotbarImage::SwordWhirlwind), + ToolKind::Staff => Some(HotbarImage::FireAoe), + ToolKind::Hammer => Some(HotbarImage::HammerLeap), + ToolKind::Axe => Some(HotbarImage::AxeLeapSlash), + ToolKind::Bow => Some(HotbarImage::BowJumpBurst), + ToolKind::Debug => Some(HotbarImage::SnakeArrow), + ToolKind::Sword => Some(HotbarImage::SwordWhirlwind), _ => None, }, _ => None, diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index ec2156add5..f59a154fcd 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -84,17 +84,17 @@ fn armor_desc(armor: &Armor, desc: &str) -> String { fn tool_desc(tool: &Tool, desc: &str) -> String { // TODO: localization let kind = match tool.kind { - ToolKind::Sword(_) => "Sword", - ToolKind::Axe(_) => "Axe", - ToolKind::Hammer(_) => "Hammer", - ToolKind::Bow(_) => "Bow", - ToolKind::Dagger(_) => "Dagger", - ToolKind::Staff(_) => "Staff", - ToolKind::Sceptre(_) => "Sceptre", - ToolKind::Shield(_) => "Shield", - ToolKind::NpcWeapon(_) => "Npc Weapon", - ToolKind::Debug(_) => "Debug", - ToolKind::Farming(_) => "Farming Tool", + ToolKind::Sword => "Sword", + ToolKind::Axe => "Axe", + ToolKind::Hammer => "Hammer", + ToolKind::Bow => "Bow", + ToolKind::Dagger => "Dagger", + ToolKind::Staff => "Staff", + ToolKind::Sceptre => "Sceptre", + ToolKind::Shield => "Shield", + ToolKind::Unique(_) => "Unique", + ToolKind::Debug => "Debug", + ToolKind::Farming => "Farming Tool", ToolKind::Empty => "Empty", }; let power = tool.base_power(); diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs index 60e48498cf..b405c5b56e 100644 --- a/voxygen/src/scene/figure/cache.rs +++ b/voxygen/src/scene/figure/cache.rs @@ -12,7 +12,6 @@ use common::{ comp::{ item::{ armor::{Armor, ArmorKind}, - tool::ToolKind, ItemKind, }, CharacterState, Loadout, @@ -69,8 +68,8 @@ pub struct FigureKey { /// person or when the character is in a tool-using state). #[derive(Eq, Hash, PartialEq)] pub(super) struct CharacterToolKey { - pub active: Option, - pub second: Option, + pub active: Option, + pub second: Option, } /// Character data that exists in third person only. @@ -180,20 +179,14 @@ impl CharacterCacheKey { }, tool: if are_tools_visible { Some(CharacterToolKey { - active: if let Some(ItemKind::Tool(tool)) = - loadout.active_item.as_ref().map(|i| i.item.kind()) - { - Some(tool.kind.clone()) - } else { - None - }, - second: if let Some(ItemKind::Tool(tool)) = - loadout.second_item.as_ref().map(|i| i.item.kind()) - { - Some(tool.kind.clone()) - } else { - None - }, + active: loadout + .active_item + .as_ref() + .map(|i| i.item.item_definition_id().to_owned()), + second: loadout + .second_item + .as_ref() + .map(|i| i.item.item_definition_id().to_owned()), }) } else { None diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 77d6bcf7ca..751af13c1a 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -9,7 +9,6 @@ use common::{ fish_medium, fish_small, golem::{self, BodyType as GBodyType, Species as GSpecies}, humanoid::{self, Body, BodyType, EyeColor, Skin, Species}, - item::tool::ToolKind, object, quadruped_low::{self, BodyType as QLBodyType, Species as QLSpecies}, quadruped_medium::{self, BodyType as QMBodyType, Species as QMSpecies}, @@ -327,7 +326,7 @@ struct HumArmorPantsSpec(ArmorVoxSpecMap); #[derive(Deserialize)] struct HumArmorFootSpec(ArmorVoxSpecMap); #[derive(Deserialize)] -struct HumMainWeaponSpec(HashMap); +struct HumMainWeaponSpec(HashMap); #[derive(Deserialize)] struct HumArmorLanternSpec(ArmorVoxSpecMap); #[derive(Deserialize)] @@ -826,11 +825,11 @@ impl HumArmorFootSpec { } impl HumMainWeaponSpec { - fn mesh_main_weapon(&self, tool_kind: &ToolKind, flipped: bool) -> BoneMeshes { - let spec = match self.0.get(tool_kind) { + fn mesh_main_weapon(&self, item_definition_id: &str, flipped: bool) -> BoneMeshes { + let spec = match self.0.get(item_definition_id) { Some(spec) => spec, None => { - error!(?tool_kind, "No tool/weapon specification exists"); + error!(?item_definition_id, "No tool/weapon specification exists"); return load_mesh("not_found", Vec3::new(-1.5, -1.5, -7.0)); }, }; diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 414c0bd3f1..b4bf9b8a06 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -1024,7 +1024,7 @@ impl FigureMgr { }, CharacterState::LeapMelee(s) => { let stage_progress = match active_tool_kind { - Some(ToolKind::Axe(_) | ToolKind::Hammer(_)) => { + Some(ToolKind::Axe | ToolKind::Hammer) => { let stage_time = s.timer.as_secs_f64(); match s.stage_section { StageSection::Buildup => { @@ -1064,7 +1064,7 @@ impl FigureMgr { }, CharacterState::SpinMelee(s) => { let stage_progress = match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { let stage_time = s.timer.as_secs_f64(); match s.stage_section { StageSection::Buildup => { @@ -2439,7 +2439,7 @@ impl FigureMgr { }, CharacterState::SpinMelee(s) => { let stage_progress = match active_tool_kind { - Some(ToolKind::Sword(_)) => { + Some(ToolKind::Sword) => { let stage_time = s.timer.as_secs_f64(); match s.stage_section { StageSection::Buildup => { @@ -2475,7 +2475,7 @@ impl FigureMgr { }, CharacterState::LeapMelee(s) => { let stage_progress = match active_tool_kind { - Some(ToolKind::Axe(_) | ToolKind::Hammer(_)) => { + Some(ToolKind::Axe | ToolKind::Hammer) => { let stage_time = s.timer.as_secs_f64(); match s.stage_section { StageSection::Buildup => {