diff --git a/assets/common/items/debug/cultist_purp_2h_boss-0.ron b/assets/common/items/debug/admin_sword.ron similarity index 93% rename from assets/common/items/debug/cultist_purp_2h_boss-0.ron rename to assets/common/items/debug/admin_sword.ron index 9a19cd112e..20cf2eae24 100644 --- a/assets/common/items/debug/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 0, power: 1000.0, diff --git a/assets/common/items/debug/boost.ron b/assets/common/items/debug/debug_stick.ron similarity index 94% rename from assets/common/items/debug/boost.ron rename to assets/common/items/debug/debug_stick.ron index 8e8c101fb3..7ae3c6044d 100644 --- a/assets/common/items/debug/boost.ron +++ b/assets/common/items/debug/debug_stick.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Debug, + hands: TwoHand, stats: ( equip_time_millis: 0, power: 1.00, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 3b90d3e039..fd312e2f52 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 5e6e83e2dc..177b429616 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, + hands: TwoHand, 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 8691e128c9..f6bd586a7a 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 7ac33bfd81..2b1103d795 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, + hands: TwoHand, 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 6433e1abad..4dc5ffa268 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index ff6531eaa1..13bc4f47e4 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 300, power: 3.0, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 0cedaf4332..1c9c6db06b 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, + hands: TwoHand, 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 ff2d7b57b2..6be290640c 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 29c7356f44..f4952d61d3 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Sword, + hands: TwoHand, 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 445d28722a..c62a3f3cfd 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index 5f662cb20f..3f4f4c3ddb 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(BeastClaws), + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index e4f62f5350..942f95115e 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowBasic), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index e081aa67be..9e38496121 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowBreathe), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index 0d92fce499..ea0414a384 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowQuick), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index 22b62a3f98..edc1781afe 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowRanged), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index 144fe62c11..58309079c2 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadLowTail), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 275165aff2..9412e5fb5f 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedBasic), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 4c7f9faa1e..66326ba98a 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedCharge), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index d33f264582..d214c1635c 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedHoof), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index 17702a94bf..dd86b1bebc 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedJump), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index 69b3223b96..daacf96d39 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadMedQuick), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index f965504c06..770acda813 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(QuadSmallBasic), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index cf6a6489c9..2af80459e6 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(StoneGolemFist), + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index e91b354e74..cd94ec39e2 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(TheropodBasic), + hands: TwoHand, stats: ( equip_time_millis: 10, power: 1.00, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index 7921c82e88..1e2f3f933f 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(TheropodBird), + hands: TwoHand, stats: ( equip_time_millis: 10, 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 78cb547034..791e7dd40a 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index d19166eb4c..45e3a4ea0f 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 2977a50d46..31a163f6ae 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.6, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index f0c0ffdefe..f7a87cf37a 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "A fine quality metal alloy axe.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index 64c0950eb8..a367894890 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index e971a68d64..205cc29215 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "The lustrous bluish gray axe provides a certain stylish class to the weapon.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.8, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index d19c0ccc65..25be0787c6 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Heavy iron hammered into rough blades, a simple tool for killing.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 2ebfa4ab01..81ad5e8d52 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Heavy iron axe, likely created for ritual execution.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index fedd993900..3ef6efd283 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "The iron axe head is split into two distinct curves, giving it a unique appearance.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index f185f924fe..0882e61ca5 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "Tried and true iron armaments, mass produced for killing.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 9116c5b252..18e85f33f7 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "This axe has a heavy iron head used to cleave nearly anything.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index 2b0a8f112b..eabfa21d67 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index fb4d59b791..aad41d4fda 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -3,6 +3,7 @@ ItemDef( description: "A simple dual bitted iron forged axe.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 6e31acfec8..d57201f062 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -3,6 +3,7 @@ ItemDef( description: "Double bitted axe head, decorated iron construction.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index 0c4a57cd86..fab3a01765 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -3,6 +3,7 @@ ItemDef( description: "Several sharp axe heads forged with points to mimic animal fangs.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index 9c1cb27ff4..ad9d5b3f7c 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -3,6 +3,7 @@ ItemDef( description: "Strikes from this axe look like wolf bites in flesh.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.2, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 65ec9531ca..1b9343c316 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Etched axe head decorated with malachite on the blades to provide magical properties.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index 9997734d56..0dbb5bffbb 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "A rough cut axe created by orcs to cleave beasts in two.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.6, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 7ee597fadd..3d5da1de6f 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -3,6 +3,7 @@ ItemDef( description: "Every dent tells the story of a chopped tree.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.5, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index df30c3151b..e95e0a73ca 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Well crafted metal alloy axe that slices more cleanly than its iron counterparts.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index 65da695813..447b3c706e 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Double bitted, well polished, and spiked axe head.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 9d85cfd445..3f5bc83dbd 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "A simple metal alloy axe.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 65ed471467..4790c17ebf 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "The blade of this steel axe is forged in a manner to resemble a crescent moon.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 62f9a6edc8..83fc7d01bd 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "The blade of this axe resembles a full moon.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index 8b49ff350b..50d2850d94 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index 4a7fbc9a28..e06358fa07 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -3,6 +3,7 @@ ItemDef( description: "This axe is designed to mimic the playing card suit, swiftly slicing through the air.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.4, 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 b0004c1b4e..4a73c4f954 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Rough cut axe of dwarven origin, it\'s very old, but still usable.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.8, 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 4d5195801a..caee3f011e 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Light elven axe, scratched from eons of use. Still usable in some manner.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.8, 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 a6ea3196a0..7104e29f71 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "There\'s nothing too remarkable about this old axe.", kind: Tool(( kind: Axe, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.8, 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 cef489a30f..6674327d0f 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.8, 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 c04e4ff556..a521494fcd 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.8, diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron index c5b9248292..7d5261affe 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/horn_longbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "You don\'t recognize the creature these horns belong to.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.5, diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron index 34770e7633..b9c5f3e655 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/iron_longbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Has an insignia on it.", kind: Tool(( kind: Bow, + hands: TwoHand, 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 dd3521572d..3f8b500ba7 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "There\'s a new leaf starting to grow.", kind: Tool(( kind: Bow, + hands: TwoHand, 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 e8167e7f1f..44b3a4dc9f 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "The wood still seems alive.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, 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 5bb6e26768..0eee4678e6 100644 --- a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron +++ b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Infused with Velorite power.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron index f9cc9b0e4b..af94638957 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/rare_longbow.ron @@ -3,6 +3,7 @@ ItemDef( description: "You can sense power resting in the bow.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 2.0, diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron index 7fb71a72f9..aec91c6401 100644 --- a/assets/common/items/weapons/bow/starter_bow.ron +++ b/assets/common/items/weapons/bow/starter_bow.ron @@ -3,6 +3,7 @@ ItemDef( description: "Someone carved their initials into it.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.5, diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron index e528d61154..740fc61e62 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood_longbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron index b3cb675fa5..32b0699d14 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/wood_longbow-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s hard to pull all the way back.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron index 9df405f453..13e0535410 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Strips of leather are wrapped around the handle.", kind: Tool(( kind: Bow, + hands: TwoHand, 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 d323263c73..f8fb135c91 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Works on the ground too.", kind: Tool(( kind: Bow, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.75, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 5179da5408..2d3d30da5d 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Opens letters quickly.", kind: Tool(( kind: Dagger, + hands: OneHand, stats: ( equip_time_millis: 0, power: 1.8, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index 617932f662..f664662b78 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -3,6 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Dagger, + hands: OneHand, stats: ( equip_time_millis: 0, power: 2.0, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 316eb88e9a..7be9a95796 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -3,6 +3,7 @@ ItemDef( description: "Easily concealed.", kind: Tool(( kind: Dagger, + hands: OneHand, stats: ( equip_time_millis: 300, power: 1.0, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 442cc89aab..3ee1a2838e 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -3,6 +3,7 @@ ItemDef( description: "This item may grant abilities, but is invisible", kind: Tool(( kind: Empty, + hands: OneHand, stats: ( equip_time_millis: 200, power: 1.0, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 44d71ea76e..5b2762a5a7 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "A heavy hammer forged from a simple metal alloy.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.0, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index 88564cc4bf..278fa804a2 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "The entire head of this club is forged from bronze alloy.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.0, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 05ea199ce6..4678c420db 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.6, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 3f591b292d..7919e80ec7 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "The decorative hooked head of this mace is formed from a bluish gray metal.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.6, 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 0367daafe4..ad1253c33a 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 2.0, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 4c6f509d06..ddfc1078be 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -3,6 +3,7 @@ ItemDef( description: "The head is barely secured.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.5, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index f3257e1a33..980f6fadd5 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Breaks bones like sticks and stones.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.5, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index d7ad1d0772..06afa97520 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "This heavy, solid chunk iron hammer head is simple and brutal in its design.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 9e0620fd48..0c2a7f3f37 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "This heavy, square iron hammer is designed for squashing heads like watermelons.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 55d7ada738..cbb78a8f5c 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "A decorative iron mace, great for smashing.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index 8308b3bf68..f0cbfa041e 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "The decorative iron mace has a crowning tip on top.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index 446430580b..83b4ae8ad5 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 915d806b3f..2b11a8177e 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -3,6 +3,7 @@ ItemDef( description: "A hybrid fusion of a warhammer and a polearm.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 6ae5516593..97987c0339 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -3,6 +3,7 @@ ItemDef( description: "A rough shaped iron hammer with spikes for added destruction.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index 354110e363..f2d77db194 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 4f65a8b0ed..16d1da5f40 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -3,6 +3,7 @@ ItemDef( description: "This hammer has a spike on the opposite end, making it dangerous when swung either direction.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 2b59a4e030..7c8fb2efb5 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -1,17 +1,16 @@ ItemDef( name: "Mjolnir", - description: "It's crackling with lightning.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 4.00, - poise_strength: 2.0, - speed: 0.5 - ), - ) - ), + description: "It\'s crackling with lightning.", + kind: Tool(( + kind: Hammer, + hands: TwoHand, + stats: ( + equip_time_millis: 500, + power: 4.0, + poise_strength: 2.0, + speed: 0.5, + ), + )), quality: Legendary, tags: [], ) diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index 5aed246180..6044a0afae 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -3,6 +3,7 @@ ItemDef( description: "You feel an evil presence in the hammer.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.8, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 84a0212e8e..4151293086 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -3,6 +3,7 @@ ItemDef( description: "There are strange runes inscribed into it.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.8, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 0e6f45ac4e..a3eeff214b 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -3,6 +3,7 @@ ItemDef( description: "\'Property of...\' The rest is missing.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.5, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index d34d4c1415..316dbad324 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "While lighter and more durable than its iron counterparts, it is nonetheless just as deadly.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 0a9d90e20d..0721f05ff2 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 083baa5e07..48bad3c269 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "A heavy and wide baton made of a durable metal alloy, decorated with spikes.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index d8da2588bd..25679693fd 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "A heavy, spiked steel ball tip provides a great smashing weapon.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 644cb869bb..0dd2895884 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "This destructive hammer was likely wielded by a vicious killer.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index f798885c17..3411c1c07d 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -3,6 +3,7 @@ ItemDef( description: "A spiked ball designed to resemble the stars lining the night sky.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index f2650a467d..996c1e5bb3 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Bloodied stone tied to a branch, simple but functional as a weapon.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index 939f040b78..d975cca1ee 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "A rough stone, crumbling on the striking surfaces. Still usable as a weapon.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index d0d2595ee2..345e60f909 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "A rock tied to a stick, still good for smashing, but not very strong.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index 04c9204247..f12e84737a 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -3,6 +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, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.7, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 0cdb3f1c0e..b19d87f53d 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Hardened wood, subjected to many different elements to provide a enough strength to be a weapon.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 edbc8c334f..14a7da11da 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -3,6 +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, + hands: TwoHand, 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 8f68eb2930..259edfd10d 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -3,6 +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, + hands: TwoHand, 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 dda968a16d..851d992dfb 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "An unremarkable mace, that has seen a lot of use.", kind: Tool(( kind: Hammer, + hands: TwoHand, 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 0af9b74aa5..1326a8fa78 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "A heavy orc crafted hammer, missing chunks from heavy use.", kind: Tool(( kind: Hammer, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.85, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 569d542e4b..b709dbc2d9 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -1,17 +1,16 @@ ItemDef( name: "Infused Fork", - description: "Shamanistic energies brought this piece of wood to life again.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 2.0, - poise_strength: 1.5, - speed: 0.8 - ), - ) - ), + description: "Shamanistic energies brought this piece of wood to life again.", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_strength: 1.5, + speed: 0.8, + ), + )), quality: High, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index 1bcb6a9186..af8004f7ce 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -1,17 +1,16 @@ ItemDef( name: "Soothing Loop", - description: "Do you really want to live forever?", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 1.2, - poise_strength: 1.5, - speed: 1.5 - ), - ) - ), + description: "Do you really want to live forever?", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_strength: 1.5, + speed: 1.5, + ), + )), quality: High, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index 55f0f4c8eb..c4d517a038 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -1,17 +1,16 @@ ItemDef( name: "Crescent Saviour", - description: "Trusty companion by day and night.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 1.6, - poise_strength: 1.5, - speed: 0.5 - ), - ) - ), + description: "Trusty companion by day and night.", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 1.6, + poise_strength: 1.5, + speed: 0.5, + ), + )), quality: Common, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 81cc14bb31..55887a8dce 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -1,17 +1,16 @@ ItemDef( name: "The Root of Evil", - description: "'Everything comes at a price...'", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 4.0, - poise_strength: 1.5, - speed: 0.5 - ), - ) - ), + description: "\'Everything comes at a price...\'", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 4.0, + poise_strength: 1.5, + speed: 0.5, + ), + )), quality: Legendary, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index 58de4d9e49..f0a056484e 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -1,17 +1,16 @@ ItemDef( name: "Twitching Root", - description: "Sparkles from living energy.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 3.5, - poise_strength: 1.5, - speed: 0.4 - ), - ) - ), + description: "Sparkles from living energy.", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 3.5, + poise_strength: 1.5, + speed: 0.4, + ), + )), quality: Moderate, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index b892b01d27..8f87a6ccdf 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -1,17 +1,16 @@ ItemDef( name: "Velorite Sceptre", - description: "Heals your allies with the mystical Velorite aura.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 1.2, - poise_strength: 1.5, - speed: 1.6 - ), - ) - ), + description: "Heals your allies with the mystical Velorite aura.", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_strength: 1.5, + speed: 1.6, + ), + )), quality: Epic, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index 879edc92b5..3ce85733fe 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -1,17 +1,16 @@ ItemDef( name: "Sceptre of Regeneration", - description: "Heals your allies with the power of nature.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 0.91, - poise_strength: 0.5, - speed: 1.1 - ), - ) - ), + description: "Heals your allies with the power of nature.", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 0.91, + poise_strength: 0.5, + speed: 1.1, + ), + )), quality: Moderate, tags: [], ) diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index bb862f5ac8..e4464ff19e 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -3,6 +3,7 @@ ItemDef( description: "Heals your allies with the power of nature.", kind: Tool(( kind: Sceptre, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 0.5, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index 529639f1bd..199deffb4f 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -1,18 +1,16 @@ ItemDef( name: "Gnarling Pride", - description: "Territory marker of a Gnarling tribe. - Infused with healing powers.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 1.0, - poise_strength: 1.5, - speed: 1.2 - ), - ) - ), + description: "Territory marker of a Gnarling tribe.\r\n Infused with healing powers.", + kind: Tool(( + kind: Sceptre, + hands: TwoHand, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_strength: 1.5, + speed: 1.2, + ), + )), quality: Moderate, tags: [], ) diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index c295f5f02b..61ab248937 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Should withstand a few more hits, hopefully...", kind: Tool(( kind: Shield, + hands: OneHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index 168d5fe37a..151f274516 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -3,6 +3,7 @@ ItemDef( description: "The amethyst faintly glows.", kind: Tool(( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 300, power: 1.5, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 1c1066379b..9b3afe8840 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -3,6 +3,7 @@ ItemDef( description: "There\'s a red gem suspended in the bones.", kind: Tool(( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 300, power: 1.0, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 6394258a83..d6f0b1a358 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -3,6 +3,7 @@ ItemDef( description: "The fire gives off no heat.", kind: Tool(( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 300, power: 2.0, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index e0f4d16761..6113530222 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Walking stick with a sharpened end.", kind: Tool(( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 200, power: 0.5, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index a231366190..d256ab6e8c 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -3,6 +3,7 @@ ItemDef( description: "Smells like resin and magic.", kind: Tool(( kind: Staff, + hands: TwoHand, stats: ( equip_time_millis: 300, power: 0.5, 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 017a90786e..7cb2ff1d13 100644 --- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 2.0, diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron index 303d2ebdbb..c460a58783 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "Radiates a freezing aura.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.7, diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron index bf1c6c6752..40b6764ae2 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "Forged from a single piece of eternal ice.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.95, 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 83f84776f2..b57a2d2490 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "The blade has been chipped quite a few times.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.8, 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 a58721d010..79add07682 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "The blade has been chipped quite a few times.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.8, 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 4c638e3e1d..0039aafe22 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "The blade has been chipped quite a few times.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.8, 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 83ed49dbeb..8f7cd8c5e9 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been polished and sharpened recently.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, 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 ab941163ac..4674c05611 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been polished and sharpened recently.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, 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 c8d906c694..1f90ae26aa 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been polished and sharpened recently.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.4, 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 6cd0df19e3..86dada5368 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "The sword\'s almost a work of art.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.7, 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 6cd0df19e3..86dada5368 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "The sword\'s almost a work of art.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.7, 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 45b21e0054..ce1c1337ff 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "The sword\'s almost a work of art.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.7, 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 df0a11c561..bd1b6a39ca 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.1, 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 df0a11c561..bd1b6a39ca 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.1, 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 533f314e3a..9a2503df42 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been well used.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.1, 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 6dc87df30c..8a6d1c302f 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 6dc87df30c..8a6d1c302f 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 6dc87df30c..8a6d1c302f 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 6dc87df30c..8a6d1c302f 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 6dc87df30c..8a6d1c302f 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 6dc87df30c..8a6d1c302f 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s slightly cracked.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.6, 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 caba633326..475c5c4562 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, 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 caba633326..475c5c4562 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, 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 caba633326..475c5c4562 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, 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 fd58f8cee2..860ebc6d2f 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, 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 caba633326..475c5c4562 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, 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 3146f176bd..876bb89542 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron @@ -3,6 +3,7 @@ ItemDef( description: "It shines when you hold it up to the light.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.2, 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 bf0602dfef..90b3e8b40f 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, 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 766d34a0b7..b7debe3489 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, 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 bf0602dfef..90b3e8b40f 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, 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 bf0602dfef..90b3e8b40f 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, 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 766d34a0b7..b7debe3489 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, 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 766d34a0b7..b7debe3489 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s probably the weapon of some noble.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, 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 05103fb88d..e9cccaceae 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.9, 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 05103fb88d..e9cccaceae 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.9, 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 7b94fed5f0..1072b4485d 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron @@ -3,6 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.9, 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 05103fb88d..e9cccaceae 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron @@ -3,6 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.9, 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 05103fb88d..e9cccaceae 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron @@ -3,6 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.9, 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 05103fb88d..e9cccaceae 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron @@ -3,6 +3,7 @@ ItemDef( description: "It was well maintained by it\'s previous owner.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 0.9, diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron index 1788776740..a0ce167a16 100644 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ b/assets/common/items/weapons/sword/short_sword_0.ron @@ -3,6 +3,7 @@ ItemDef( description: "There\'s blood encrusted on the blade.", kind: Tool(( kind: Sword, + hands: TwoHand, 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 ce4d00d23a..2f1e206ab1 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter_sword.ron @@ -3,6 +3,7 @@ ItemDef( description: "Held together by Rust and hope.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 300, power: 0.5, diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index 968781c53d..6a63bc3cea 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -3,6 +3,7 @@ ItemDef( description: "The resin glows.", kind: Tool(( kind: Sword, + hands: TwoHand, 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 966abd2a9b..f702125cae 100644 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s a big sword, and sharp too.", kind: Tool(( kind: Sword, + hands: TwoHand, stats: ( equip_time_millis: 500, power: 1.5, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index 7b806a4a51..fd9c8f2beb 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s beginning to fall apart.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 739dff74f4..553ec71071 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -3,6 +3,7 @@ ItemDef( description: "Smells of fish.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index e8dc9aa885..a488bf9648 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s stained with dirt.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 0d951852fa..02d9a85bdf 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -3,6 +3,7 @@ ItemDef( description: "It has a chipped edge.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index e3198c8e33..b01baa6833 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -3,6 +3,7 @@ ItemDef( description: "One of the prongs is broken.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 7daf778520..89cb00382d 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -3,6 +3,7 @@ ItemDef( description: "Held together with twine.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 4b58f4d110..7b9a978c50 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s covered in manure.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 08893389ac..2c17245178 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -3,6 +3,7 @@ ItemDef( description: "It\'s been recently cleaned.", kind: Tool(( kind: Farming, + hands: TwoHand, stats: ( equip_time_millis: 400, power: 1.0, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 2f2ce8aa90..26f4edfb57 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -77,10 +77,6 @@ "voxel.weapon.bow.longbow_horn-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - 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, @@ -98,10 +94,6 @@ "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, - ), Tool("common.items.weapons.dagger.basic_0"): VoxTrans( "voxel.weapon.dagger.dagger_basic-0", (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1, @@ -127,18 +119,10 @@ "voxel.weapon.sword.rusty_2h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3, ), - 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("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, @@ -291,16 +275,8 @@ "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-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.debug.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.npc_weapons.sword.cultist_purp_2h_boss-0"): VoxTrans( - "voxel.weapon.sword.cultist_purp_2h-0", + Tool("common.items.debug.admin_sword"): VoxTrans( + "voxel.weapon.sword.frost_cleaver-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), // Axes @@ -308,10 +284,6 @@ "voxel.weapon.axe.2haxe_rusty", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - 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, @@ -432,10 +404,6 @@ "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("common.items.weapons.hammer.hammer_1"): VoxTrans( "voxel.weapon.hammer.2hhammer_rusty", @@ -445,10 +413,6 @@ "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, @@ -581,10 +545,6 @@ "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("common.items.weapons.staff.staff_1"): VoxTrans( "voxel.weapon.staff.firestaff_starter", @@ -598,10 +558,6 @@ "voxel.weapon.staff.firestaff_bone", (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2, ), - 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, @@ -610,10 +566,6 @@ "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 Sceptres Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans( "voxel.weapon.sceptre.wood-simple", @@ -656,10 +608,6 @@ "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, - ), // Lanterns Lantern("Black0"): Png( "element.icons.lantern_black-0", @@ -706,38 +654,6 @@ "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, - ), // Other Utility(Collar): Png( @@ -1669,11 +1585,7 @@ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), // Debug Items - 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( + Tool("common.items.debug.debug_stick"): 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 a12e8e6bf2..841c582eb6 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -3,10 +3,6 @@ vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), color: None ), - "common.items.npc_weapons.sword.starter_sword": ( - vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)), - color: None - ), "common.items.weapons.sword.wood_sword": ( vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)), color: None @@ -15,10 +11,6 @@ vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), color: None ), - "common.items.npc_weapons.sword.zweihander_sword_0": ( - vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)), - color: None - ), "common.items.weapons.sword.short_sword_0": ( vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)), color: None @@ -171,18 +163,6 @@ vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), color: None ), - "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 - ), - "common.items.debug.cultist_purp_2h_boss-0": ( - vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)), - color: None - ), - "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 - ), "common.items.weapons.sword.frost_cleaver_2h-0": ( vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)), color: None @@ -192,10 +172,6 @@ color: None ), // Axes - "common.items.npc_weapons.axe.starter_axe": ( - vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), - color: None - ), "common.items.weapons.axe.starter_axe": ( vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), color: None @@ -316,10 +292,6 @@ vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), color: None ), - "common.items.npc_weapons.axe.malachite_axe-0": ( - vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), - color: None - ), "common.items.weapons.axe.malachite_axe-0": ( vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), color: None @@ -333,10 +305,6 @@ vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), color: None ), - "common.items.npc_weapons.hammer.starter_hammer": ( - vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)), - color: None - ), "common.items.weapons.hammer.wood_hammer-0": ( vox_spec: ("weapon.hammer.2hhammer_wood-0", (-3.5, -5.5, -4.5)), color: None @@ -469,10 +437,6 @@ vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)), color: None ), - "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 @@ -482,10 +446,6 @@ vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), color: None ), - "common.items.npc_weapons.dagger.starter_dagger": ( - vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)), - color: None - ), "common.items.weapons.dagger.basic_0": ( vox_spec: ("weapon.dagger.dagger_basic-0", (-1.5, -3.0, -3.0)), color: None @@ -499,10 +459,6 @@ vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)), color: None ), - "common.items.npc_weapons.shield.shield_1": ( - vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)), - color: None - ), // Bows "common.items.weapons.bow.starter_bow": ( vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)), @@ -536,10 +492,6 @@ vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), color: None ), - "common.items.npc_weapons.bow.horn_longbow-0": ( - vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), - color: None - ), "common.items.weapons.bow.iron_longbow-0": ( vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)), color: None @@ -585,38 +537,6 @@ vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)), color: None ), - "common.items.npc_weapons.tool.broom": ( - vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.hoe": ( - vox_spec: ("weapon.tool.hoe_green", (-2.5, -4.5, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.pitchfork": ( - vox_spec: ("weapon.tool.pitchfork-0", (-1.0, -3.5, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.fishing_rod": ( - vox_spec: ("weapon.tool.fishing_rod_blue-0", (-2.5, -4.5, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.rake": ( - vox_spec: ("weapon.tool.rake-0", (-1.0, -5.5, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.pickaxe": ( - vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.shovel-0": ( - vox_spec: ("weapon.tool.shovel_green", (-1.0, -2.5, -4.0)), - color: None - ), - "common.items.npc_weapons.tool.shovel-1": ( - vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)), - color: None - ), // Staves "common.items.weapons.staff.staff_1": ( vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)), @@ -630,10 +550,6 @@ vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)), color: None ), - "common.items.npc_weapons.staff.bone_staff": ( - vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)), - color: None - ), "common.items.weapons.staff.amethyst_staff": ( vox_spec: ("weapon.staff.firestaff_amethyst", (-1.5, -4.0, -4.0)), color: None @@ -642,10 +558,6 @@ vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)), color: None ), - "common.items.npc_weapons.staff.cultist_staff": ( - vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)), - color: None - ), // Healing sceptre "common.items.weapons.sceptre.starter_sceptre": ( vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)), @@ -684,15 +596,11 @@ color: None ), // Misc - "common.items.debug.boost": ( + "common.items.debug.debug_stick": ( vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), color: None ), - "common.items.debug.possess": ( - vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)), - color: None - ), - "common.items.debug.cultist_purp_2h_boss-0": ( + "common.items.debug.admin_sword": ( vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), color: None ), @@ -701,8 +609,4 @@ vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), color: None ), - "common.items.npc_weapons.empty.empty": ( - vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), - color: None - ), }) diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 88137b4718..6bcb4fd6b4 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -193,22 +193,22 @@ fn all_items() -> Result<(), Box> { fn main() { let args = Cli::from_args(); - if args.function.eq_ignore_ascii_case("armor_stats") { + if args.function.eq_ignore_ascii_case("armor-stats") { if let Err(e) = armor_stats() { println!("Error: {}\n", e) } - } else if args.function.eq_ignore_ascii_case("weapon_stats") { + } else if args.function.eq_ignore_ascii_case("weapon-stats") { if let Err(e) = weapon_stats() { println!("Error: {}\n", e) } - } else if args.function.eq_ignore_ascii_case("all_items") { + } else if args.function.eq_ignore_ascii_case("all-items") { if let Err(e) = all_items() { println!("Error: {}\n", e) } } else { println!( "Invalid argument, available \ - arguments:\n\"armor_stats\"\n\"weapon_stats\"\n\"all_items\"" + arguments:\n\"armor-stats\"\n\"weapon-stats\"\n\"all-items\"" ) } } diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 6e403316fb..98e3a13966 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -307,7 +307,7 @@ fn weapon_stats() -> Result<(), Box> { fn main() { let args = Cli::from_args(); - if args.function.eq_ignore_ascii_case("armor_stats") { + if args.function.eq_ignore_ascii_case("armor-stats") { if get_input( " ------------------------------------------------------------------------------- @@ -337,7 +337,7 @@ Would you like to continue? (y/n) println!("Error: {}\n", e) } } - } else if args.function.eq_ignore_ascii_case("weapon_stats") { + } else if args.function.eq_ignore_ascii_case("weapon-stats") { if get_input( " ------------------------------------------------------------------------------- @@ -368,7 +368,7 @@ Would you like to continue? (y/n) } } } else { - println!("Invalid argument, available arguments:\n\"armor_stats\"\n\"weapon_stats\"\n\"") + println!("Invalid argument, available arguments:\n\"armor-stats\"\n\"weapon-stats\"\n\"") } } diff --git a/common/src/comp/inventory/test.rs b/common/src/comp/inventory/test.rs index acb566cc06..8438b6b08d 100644 --- a/common/src/comp/inventory/test.rs +++ b/common/src/comp/inventory/test.rs @@ -5,10 +5,9 @@ use crate::comp::{ }; use lazy_static::lazy_static; lazy_static! { - static ref TEST_ITEMS: Vec = vec![ - Item::new_from_asset_expect("common.items.debug.boost"), - Item::new_from_asset_expect("common.items.debug.possess") - ]; + static ref TEST_ITEMS: Vec = vec![Item::new_from_asset_expect( + "common.items.debug.debug_stick" + ),]; } /// Attempting to push into a full inventory should return the same item. diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs index ddfdc50261..f9e33cb3f8 100644 --- a/server/src/events/interaction.rs +++ b/server/src/events/interaction.rs @@ -226,7 +226,7 @@ pub fn handle_possess(server: &Server, possessor_uid: Uid, possesse_uid: Uid) { .expect("Could not read inventory component while possessing") .or_insert(Inventory::new_empty()); - let debug_item = comp::Item::new_from_asset_expect("common.items.debug.possess"); + let debug_item = comp::Item::new_from_asset_expect("common.items.debug.debug_stick"); if let item::ItemKind::Tool(_) = debug_item.kind() { inventory .swap( diff --git a/server/src/migrations/2021-02-12-054315_purge_duplicate_items/down.sql b/server/src/migrations/2021-02-12-054315_purge_duplicate_items/down.sql new file mode 100644 index 0000000000..291a97c5ce --- /dev/null +++ b/server/src/migrations/2021-02-12-054315_purge_duplicate_items/down.sql @@ -0,0 +1 @@ +-- This file should undo anything in `up.sql` \ No newline at end of file diff --git a/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql b/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql new file mode 100644 index 0000000000..939703c0eb --- /dev/null +++ b/server/src/migrations/2021-02-12-054315_purge_duplicate_items/up.sql @@ -0,0 +1,50 @@ +UPDATE item +SET item_definition_id = 'common.items.debug.admin_sword' WHERE item_definition_id = 'common.items.debug.cultist_purp_2h_boss-0'; +UPDATE item +SET item_definition_id = 'common.items.debug.debug_stick' WHERE item_definition_id = 'common.items.debug.boost'; +UPDATE item +SET item_definition_id = 'common.items.debug.debug_stick' WHERE item_definition_id = 'common.items.debug.possess'; +UPDATE item +SET item_definition_id = 'common.items.weapons.malachite_axe-0' WHERE item_definition_id = 'common.items.npc_weapons.malachite_axe-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.axe.starter_axe' WHERE item_definition_id = 'common.items.npc_weapons.axe.starter_axe'; +UPDATE item +SET item_definition_id = 'common.items.weapons.bow.horn_longbow' WHERE item_definition_id = 'common.items.npc_weapons.bow.horn_longbow'; +UPDATE item +SET item_definition_id = 'common.items.weapons.dagger.starter_dagger' WHERE item_definition_id = 'common.items.npc_weapons.dagger.starter_dagger'; +UPDATE item +SET item_definition_id = 'common.items.weapons.empty.empty' WHERE item_definition_id = 'common.items.npc_weapons.empty.empty'; +UPDATE item +SET item_definition_id = 'common.items.weapons.hammer.cultist_purp_2h-0' WHERE item_definition_id = 'common.items.npc_weapons.hammer.cultist_purp_2h-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.hammer.starter_hammer' WHERE item_definition_id = 'common.items.npc_weapons.hammer.starter_hammer'; +UPDATE item +SET item_definition_id = 'common.items.weapons.shield.shield_1' WHERE item_definition_id = 'common.items.npc_weapons.shield.shield_1'; +UPDATE item +SET item_definition_id = 'common.items.weapons.staff.bone_staff' WHERE item_definition_id = 'common.items.npc_weapons.staff.bone_staff'; +UPDATE item +SET item_definition_id = 'common.items.weapons.staff.cultist_staff' WHERE item_definition_id = 'common.items.npc_weapons.staff.cultist_staff'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.cultist_purp_2h-0' WHERE item_definition_id = 'common.items.npc_weapons.sword.cultist_purp_2h_boss-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.cultust_purp_2h-0' WHERE item_definition_id = 'common.items.npc_weapons.sword.cultust_purp_2h-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.starter_sword' WHERE item_definition_id = 'common.items.npc_weapons.sword.starter_sword'; +UPDATE item +SET item_definition_id = 'common.items.weapons.sword.zweihander_sword_0' WHERE item_definition_id = 'common.items.npc_weapons.sword.zweihander_sword_0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.broom' WHERE item_definition_id = 'common.items.npc_weapons.tool.broom'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.fishing_rod' WHERE item_definition_id = 'common.items.npc_weapons.tool.fishing_rod'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.hoe' WHERE item_definition_id = 'common.items.npc_weapons.tool.hoe'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.pickaxe' WHERE item_definition_id = 'common.items.npc_weapons.tool.pickaxe'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.pitchfork' WHERE item_definition_id = 'common.items.npc_weapons.tool.pitchfork'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.rake' WHERE item_definition_id = 'common.items.npc_weapons.tool.rake'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.shovel-0' WHERE item_definition_id = 'common.items.npc_weapons.tool.shovel-0'; +UPDATE item +SET item_definition_id = 'common.items.weapons.tool.shovel-1' WHERE item_definition_id = 'common.items.npc_weapons.tool.shovel-1'; \ No newline at end of file diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 9b9b5a3518..41e9184715 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -699,7 +699,7 @@ impl Floor { ) .with_loot_drop(comp::Item::new_from_asset_expect(chosen)) .with_main_tool(comp::Item::new_from_asset_expect( - "common.items.npc_weapons.staff.cultist_staff", + "common.items.weapons.staff.cultist_staff", )), _ => entity .with_name("Cultist Warlord") diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 6281b6eb65..35fdeea176 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -941,14 +941,14 @@ impl Settlement { _ => entity .with_main_tool(Item::new_from_asset_expect( match dynamic_rng.gen_range(0..7) { - 0 => "common.items.npc_weapons.tool.broom", - 1 => "common.items.npc_weapons.tool.hoe", - 2 => "common.items.npc_weapons.tool.pickaxe", - 3 => "common.items.npc_weapons.tool.pitchfork", - 4 => "common.items.npc_weapons.tool.rake", - 5 => "common.items.npc_weapons.tool.shovel-0", - _ => "common.items.npc_weapons.tool.shovel-1", - //_ => "common.items.npc_weapons.bow.starter_bow", TODO: Re-Add this when we have a better way of distributing npc_weapons here + 0 => "common.items.weapons.tool.broom", + 1 => "common.items.weapons.tool.hoe", + 2 => "common.items.weapons.tool.pickaxe", + 3 => "common.items.weapons.tool.pitchfork", + 4 => "common.items.weapons.tool.rake", + 5 => "common.items.weapons.tool.shovel-0", + _ => "common.items.weapons.tool.shovel-1", + //_ => "common.items.weapons.bow.starter_bow", TODO: Re-Add this when we have a better way of distributing npc_weapons here }, )) .with_loadout_config(loadout_builder::LoadoutConfig::Villager)