Merge branch 'sam/dual-wielding' into 'master'

Dual wielding backend

See merge request veloren/veloren!1787

.cargo/config

@@ -4,7 +4,8 @@ rustflags = [
 ]
 
 [alias]
-generate = "run --package tools --"
+csv-export = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_export"
+csv-import = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_import"
 test-server = "-Zpackage-features run --bin veloren-server-cli --no-default-features -- -b"
 tracy-server = "-Zunstable-options -Zpackage-features run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
 test-voxygen = "-Zpackage-features run --bin veloren-voxygen --no-default-features --features gl,simd"

assets/common/abilities/weapon_ability_manifest.ron

@@ -4,149 +4,149 @@
     Sword: (
         primary: "common.abilities.sword.triplestrike",
         secondary: "common.abilities.sword.dash",
-        skills: [
-            "common.abilities.sword.spin",
+        abilities: [
+            (Some(Sword(UnlockSpin)), "common.abilities.sword.spin"),
         ],
     ),
     Axe: (
         primary: "common.abilities.axe.doublestrike",
         secondary: "common.abilities.axe.spin",
-        skills: [
-            "common.abilities.axe.leap",
+        abilities: [
+            (Some(Axe(UnlockLeap)), "common.abilities.axe.leap"),
         ],
     ),
     Hammer: (
         primary: "common.abilities.hammer.singlestrike",
         secondary: "common.abilities.hammer.charged",
-        skills: [
-            "common.abilities.hammer.leap",
+        abilities: [
+            (Some(Hammer(UnlockLeap)), "common.abilities.hammer.leap"),
         ],
     ),
     Bow: (
         primary: "common.abilities.bow.basic",
         secondary: "common.abilities.bow.charged",
-        skills: [
-            "common.abilities.bow.repeater",
+        abilities: [
+            (Some(Bow(UnlockRepeater)), "common.abilities.bow.repeater"),
         ],
     ),
     Staff: (
         primary: "common.abilities.staff.firebomb",
         secondary: "common.abilities.staff.flamethrower",
-        skills: [
-            "common.abilities.staff.fireshockwave",
+        abilities: [
+            (Some(Staff(UnlockShockwave)), "common.abilities.staff.fireshockwave"),
         ],
     ),
     Sceptre: (
         primary: "common.abilities.sceptre.healingbeam",
         secondary: "common.abilities.sceptre.healingbomb",
-        skills: [],
+        abilities: [],
     ),
     Dagger: (
         primary: "common.abilities.dagger.tempbasic",
         secondary: "common.abilities.dagger.tempbasic",
-        skills: [],
+        abilities: [],
     ),
     Shield: (
         primary: "common.abilities.shield.tempbasic",
         secondary: "common.abilities.shield.block",
-        skills: [],
+        abilities: [],
     ),
     Unique(StoneGolemFist): (
         primary: "common.abilities.unique.stonegolemfist.basic",
         secondary: "common.abilities.unique.stonegolemfist.shockwave",
-        skills: [
-            "common.abilities.unique.stonegolemfist.spin",
+        abilities: [
+            (None, "common.abilities.unique.stonegolemfist.spin"),
         ],
     ),
     Unique(BeastClaws): (
         primary: "common.abilities.unique.beastclaws.basic",
         secondary: "common.abilities.unique.beastclaws.basic",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadMedQuick): (
         primary: "common.abilities.unique.quadmedquick.triplestrike",
         secondary: "common.abilities.unique.quadmedquick.dash",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadMedJump): (
         primary: "common.abilities.unique.quadmedjump.leap",
         secondary: "common.abilities.unique.quadmedjump.doublestrike",
-        skills: [
-            "common.abilities.unique.quadmedjump.quickleap"
+        abilities: [
+            (None, "common.abilities.unique.quadmedjump.quickleap"),
         ],
     ),
     Unique(QuadMedCharge): (
         primary: "common.abilities.unique.quadmedcharge.doublestrike",
         secondary: "common.abilities.unique.quadmedcharge.dash",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadMedHoof): (
         primary: "common.abilities.unique.quadmedhoof.basic",
         secondary: "common.abilities.unique.quadmedhoof.basic",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadMedBasic): (
         primary: "common.abilities.unique.quadmedbasic.singlestrike",
         secondary: "common.abilities.unique.quadmedbasic.triplestrike",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadLowRanged): (
         primary: "common.abilities.unique.quadlowranged.singlestrike",
         secondary: "common.abilities.unique.quadlowranged.firebomb",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadLowBreathe): (
         primary: "common.abilities.unique.quadlowbreathe.flamethrower",
         secondary: "common.abilities.unique.quadlowbreathe.triplestrike",
-        skills: [
-            "common.abilities.unique.quadlowbreathe.dash",
+        abilities: [
+            (None, "common.abilities.unique.quadlowbreathe.dash"),
         ],
     ),
     Unique(QuadLowTail): (
         primary: "common.abilities.unique.quadlowtail.charged",
         secondary: "common.abilities.unique.quadlowtail.triplestrike",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadLowQuick): (
         primary: "common.abilities.unique.quadlowquick.dash",
         secondary: "common.abilities.unique.quadlowquick.quadstrike",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadLowBasic): (
         primary: "common.abilities.unique.quadlowbasic.triplestrike",
         secondary: "common.abilities.unique.quadlowbasic.singlestrike",
-        skills: [],
+        abilities: [],
     ),
     Unique(QuadSmallBasic): (
         primary: "common.abilities.unique.quadsmallbasic.singlestrike",
         secondary: "common.abilities.unique.quadsmallbasic.singlestrike",
-        skills: [],
+        abilities: [],
     ),
     Unique(TheropodBasic): (
         primary: "common.abilities.unique.theropodbasic.triplestrike",
         secondary: "common.abilities.unique.theropodbasic.triplestrike",
-        skills: [],
+        abilities: [],
     ),
     Unique(TheropodBird): (
         primary: "common.abilities.unique.theropodbird.triplestrike",
         secondary: "common.abilities.unique.theropodbird.triplestrike",
-        skills: [],
+        abilities: [],
     ),
     Debug: (
         primary: "common.abilities.debug.forwardboost",
         secondary: "common.abilities.debug.upboost",
-        skills: [
-            "common.abilities.debug.possess",
+        abilities: [
+            (None, "common.abilities.debug.possess"),
         ],
     ),
     Farming: (
         primary: "common.abilities.farming.basic",
         secondary: "common.abilities.farming.basic",
-        skills: [],
+        abilities: [],
     ),
     Empty: (
         primary: "common.abilities.empty.basic",
         secondary: "common.abilities.empty.basic",
-        skills: [],
+        abilities: [],
     ),
 })

assets/common/items/debug/admin_stick.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Debug,
+            hands: Two,
             stats: (
                 equip_time_millis: 0,
                 power: 1.00,

assets/common/items/debug/admin_sword.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
        (
             kind: Sword,    
+            hands: Two,
             stats: (
                 equip_time_millis: 0,
                 power: 1000.0,

assets/common/items/npc_weapons/axe/malachite_axe-0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Malachite Axe",
-    description: "An axe infused with malachite.",
-    kind: Tool(
-        (
-            kind: Axe,    
-            stats: (
-                equip_time_millis: 400,
-                power: 0.50,
-                poise_strength: 0.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/axe/starter_axe.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Notched Axe",
-    description: "Every dent tells the story of a chopped tree.",
-    kind: Tool(
-        (
-            kind: Axe,    
-            stats: (
-                equip_time_millis: 400,
-                power: 0.50,
-                poise_strength: 0.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/bow/horn_longbow-0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Horn Bow",
-    description: "You don't recognize the creature these horns belong to.",  
-    kind: Tool(
-        (
-            kind: Bow,    
-            stats: (
-                equip_time_millis: 400,
-                power: 0.5,
-                poise_strength: 0.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/bow/saurok_bow.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Bow,
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/dagger/starter_dagger.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Rusty Dagger",
-    description: "Easily concealed.",
-    kind: Tool(
-        (
-            kind: Dagger,    
-            stats: (
-                equip_time_millis: 300,
-                power: 1.00,
-                poise_strength: 1.00,
-                speed: 1.0
-            ),
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/empty/empty.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Empty",
-    description: "You expected a description?",
-    kind: Tool (
-        (
-            kind: Empty,
-            stats: (
-                equip_time_millis: 200,
-                power: 1.00,
-                poise_strength: 1.00,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Magical Cultist Warhammer",
-    description: "This belonged to an evil Cult Leader.",
-    kind: Tool(
-       (
-            kind: Hammer,    
-            stats: (
-                equip_time_millis: 500,
-                power: 0.5,
-                poise_strength: 0.5,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/hammer/cyclops_hammer.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Hammer,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/hammer/ogre_hammer.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Hammer,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/hammer/starter_hammer.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Sturdy Old Hammer",
-    description: "'Property of...' The rest is missing.",
-    kind: Tool(
-        (
-            kind: Hammer,    
-            stats: (
-                equip_time_millis: 500,
-                power: 0.50,
-                poise_strength: 0.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/hammer/troll_hammer.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Hammer,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/hammer/wendigo_hammer.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Hammer,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/shield/shield_1.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "A Tattered Targe",
-    description: "Should withstand a few more hits, hopefully...",
-    kind: Tool (
-        (
-            kind: Shield,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.00,
-                poise_strength: 1.00,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/staff/bone_staff.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Bone Staff",
-    description: "There's a red gem suspended in the bones.",
-    kind: Tool(
-        (
-            kind: Staff,    
-            stats: (
-                equip_time_millis: 300,
-                power: 0.8,
-                poise_strength: 0.8,
-                speed: 1.0
-            ),
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/staff/cultist_staff.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Cultist Staff",
-    description: "The fire gives off no heat.",
-    kind: Tool(
-        (
-            kind: Staff,    
-            stats: (
-                equip_time_millis: 300,
-                power: 0.8,
-                poise_strength: 0.8,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/staff/mindflayer_staff.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Staff,
+            hands: Two,
             stats: (
                 equip_time_millis: 300,
                 power: 3.0,

assets/common/items/npc_weapons/staff/ogre_staff.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Staff,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/staff/saurok_staff.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Staff,
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Magical Cultist Greatsword",
-    description: "This belonged to an evil Cult Leader.",
-    kind: Tool(
-       (
-            kind: Sword,    
-            stats: (
-                equip_time_millis: 500,
-                power: 0.5,
-                poise_strength: 0.5,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Magical Cultist Greatsword",
-    description: "This belonged to an evil Cult Leader.",
-    kind: Tool(
-       (
-            kind: Sword,    
-            stats: (
-                equip_time_millis: 500,
-                power: 1.0,
-                poise_strength: 1.0,
-                speed: 1.0
-            ),
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/sword/dullahan_sword.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Sword,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/sword/saurok_sword.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Sword,    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/sword/starter_sword.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Battered Sword",
-    description: "Held together by Rust and hope.",
-    kind: Tool(
-        (
-            kind: Sword,    
-            stats: (
-                equip_time_millis: 300,
-                power: 0.50,
-                poise_strength: 0.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/sword/zweihander_sword_0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Sturdy Zweihander",
-    description: "It's a big sword, and sharp too.",
-    kind: Tool(
-       (
-            kind: Sword,    
-            stats: (
-                equip_time_millis: 500,
-                power: 0.75,
-                poise_strength: 0.75,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/broom.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Broom",
-    description: "It's beginning to fall apart.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.5,
-                poise_strength: 1.5,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/fishing_rod.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Fishing Rod",
-    description: "Smells of fish.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.5,
-                poise_strength: 1.5,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/hoe.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Hoe",
-    description: "It's stained with dirt.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.50,
-                poise_strength: 1.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/pickaxe.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Pickaxe",
-    description: "It has a chipped edge.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.50,
-                poise_strength: 1.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/pitchfork.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Pitchfork",
-    description: "One of the prongs is broken.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.50,
-                poise_strength: 1.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/rake.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Rake",
-    description: "Held together with twine.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.50,
-                poise_strength: 1.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/shovel-0.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Shovel",
-    description: "It's covered in manure.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.50,
-                poise_strength: 1.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/tool/shovel-1.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Shovel",
-    description: "It's been recently cleaned.",
-    kind: Tool (
-        (
-            kind: Farming,
-            stats: (
-                equip_time_millis: 400,
-                power: 1.50,
-                poise_strength: 1.50,
-                speed: 1.0
-            ),            
-        )
-    ),
-    quality: Low,
-    tags: [],
-)

assets/common/items/npc_weapons/unique/beast_claws.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(BeastClaws),
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadlowbasic.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadLowBasic),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadlowbreathe.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadLowBreathe),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadlowquick.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadLowQuick),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadlowranged.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadLowRanged),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadlowtail.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadLowTail),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadmedbasic.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadMedBasic),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadmedcharge.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadMedCharge),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadmedhoof.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadMedHoof),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadmedjump.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadMedJump),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadmedquick.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadMedQuick),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/quadsmallbasic.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadSmallBasic),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/stone_golems_fist.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(StoneGolemFist),    
+            hands: Two,
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,

assets/common/items/npc_weapons/unique/theropodbasic.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(TheropodBasic),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

assets/common/items/npc_weapons/unique/theropodbird.ron

@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(TheropodBird),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.6,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.6,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.6,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.0,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.0,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.8,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.2,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 2.0,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.6,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.5,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 1.4,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.8,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.8,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.8,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.8,

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: Two,
         stats: (
             equip_time_millis: 400,
             power: 0.8,

assets/common/items/weapons/axe_1h/bloodsteel-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Crimson Tomahawk",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.5,
+            poise_strength: 1.0,
+            speed: 1.3,
+        ),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/bloodsteel-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Nsapo Axe",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 2.0,
+            poise_strength: 1.0,
+            speed: 0.8,
+        ),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/bronze-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Bronze Hatchet",
+    description: "Forged from bronze.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/bronze-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Bronze Kilonda",
+    description: "Forged from bronze.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.1,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/cobalt-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Mooncleaver",
+    description: "Forged from cobalt.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/cobalt-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Skullsplitter",
+    description: "Forged from cobalt.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.75,
+            poise_strength: 1.0,
+            speed: 0.85,
+        ),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/iron-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Bearded Axe",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.1,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/iron-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Beetle Axe",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.3,
+            poise_strength: 1.0,
+            speed: 0.9,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/iron-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Iron Tomahawk",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.2,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/iron-3.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Orcish Axe",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.2,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/orichalcum-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Orichalcum Axe",
+    description: "Forged with orichalcum.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 2.0,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/steel-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Doloire",
+    description: "Forged from steel.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.5,
+            poise_strength: 1.0,
+            speed: 0.9,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/steel-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Hatchet",
+    description: "Forged from steel.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.4,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/steel-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Kilonda",
+    description: "Forged from steel.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.3,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/stone-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Flint Axe",
+    description: "Chiseled from stone.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.8,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/stone-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Stone Cleaver",
+    description: "Chiseled from stone.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.7,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Common,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/wood-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Wooden Cleaver",
+    description: "Carved from wood.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.8,
+            poise_strength: 1.0,
+            speed: 0.8,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/weapons/axe_1h/wood-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Wooden Hatchet",
+    description: "Carved from wood.",
+    kind: Tool((
+        kind: Axe,
+        hands: One,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.5,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)