From f94169ed22131cee82a339c894253a723240e1f1 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 23 Mar 2021 21:56:25 -0400
Subject: [PATCH 01/11] initial wield testing

---
 .../voxygen/voxel/biped_weapon_manifest.ron   |  80 ++--
 common/src/states/utils.rs                    |   5 +-
 voxygen/anim/src/character/stand.rs           |   1 +
 voxygen/anim/src/character/wield.rs           | 394 ++++++++++--------
 voxygen/anim/src/dyn_lib.rs                   |  32 +-
 voxygen/src/scene/figure/mod.rs               |   1 +
 6 files changed, 289 insertions(+), 224 deletions(-)

diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index 55afa7452d..7f9c395e8b 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -165,91 +165,91 @@
     ),
     // 1h Swords
     "common.items.weapons.sword_1h.bloodsteel-0": (
-        vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bloodsteel-1": (
-        vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bloodsteel-2": (
-        vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-0": (
-        vox_spec: ("weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bronze-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-1": (
-        vox_spec: ("weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bronze-1", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-2": (
-        vox_spec: ("weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.bronze-2", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-0": (
-        vox_spec: ("weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-1": (
-        vox_spec: ("weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-1", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-2": (
-        vox_spec: ("weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-2", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.cobalt-3": (
-        vox_spec: ("weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.cobalt-3", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-0": (
-        vox_spec: ("weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-1": (
-        vox_spec: ("weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-1", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-2": (
-        vox_spec: ("weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-2", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-3": (
-        vox_spec: ("weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-3", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.iron-4": (
-        vox_spec: ("weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.iron-4", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.obsidian-0": (
-        vox_spec: ("weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.obsidian-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.orichalcum-0": (
-        vox_spec: ("weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.orichalcum-1": (
-        vox_spec: ("weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-0": (
-        vox_spec: ("weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-0", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-1": (
-        vox_spec: ("weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-1", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-2": (
-        vox_spec: ("weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-2", (-2.0, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.steel-3": (
-        vox_spec: ("weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword_1h.steel-3", (-2.0, -4.5, -3.0)),
         color: None
     ),
     // Axes
@@ -391,75 +391,75 @@
     ),
     // 1h Axes
     "common.items.weapons.axe_1h.bloodsteel-0": (
-        vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -7.5, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.bloodsteel-1": (
-        vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.bronze-0": (
-        vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.bronze-1": (
-        vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.cobalt-0": (
-        vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.cobalt-1": (
-        vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-0": (
-        vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-1": (
-        vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-2": (
-        vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-3": (
-        vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.orichalcum-0": (
-        vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.steel-0": (
-        vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.steel-1": (
-        vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.steel-2": (
-        vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.stone-0": (
-        vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.stone-1": (
-        vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.wood-0": (
-        vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.wood-1": (
-        vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -5.0, -3.0)),
         color: None
     ),
     // Hammers
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index b0c7328013..647a2401ef 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -484,8 +484,11 @@ fn handle_ability(data: &JoinData, update: &mut StateUpdate, input: InputKind) {
 
     // Mouse1 and Skill1 always use the MainHand slot
     let always_main_hand = matches!(input, InputKind::Primary | InputKind::Ability(0));
+    let no_main_hand = hands(EquipSlot::Mainhand).is_none();
     // skill_index used to select ability for the AbilityKey::Skill2 input
-    let (equip_slot, skill_index) = if always_main_hand {
+    let (equip_slot, skill_index) = if no_main_hand {
+        (Some(EquipSlot::Offhand), 1)
+    } else if always_main_hand {
         (Some(EquipSlot::Mainhand), 0)
     } else {
         let hands = (hands(EquipSlot::Mainhand), hands(EquipSlot::Offhand));
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index 30e4e2407d..ddc700c346 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -141,6 +141,7 @@ impl Animation for StandAnimation {
         next.lantern.orientation = Quaternion::rotation_x(0.1) * Quaternion::rotation_y(0.1);
 
         next.torso.position = Vec3::new(0.0, 0.0, 0.0) * s_a.scaler;
+        next.second.scale = Vec3::one();
 
         next.second.scale = match hands {
             (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs
index 2c14114c97..d1500bf318 100644
--- a/voxygen/anim/src/character/wield.rs
+++ b/voxygen/anim/src/character/wield.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, util::Dir};
+use common::{
+    comp::item::{Hands, ToolKind},
+    util::Dir,
+};
 use std::{f32::consts::PI, ops::Mul};
 
 pub struct WieldAnimation;
@@ -10,6 +13,7 @@ pub struct WieldAnimation;
 type WieldAnimationDependency = (
     Option<ToolKind>,
     Option<ToolKind>,
+    (Option<Hands>, Option<Hands>),
     Vec3<f32>,
     Vec3<f32>,
     Dir,
@@ -30,6 +34,7 @@ impl Animation for WieldAnimation {
         (
             active_tool_kind,
             _second_tool_kind,
+            hands,
             orientation,
             last_ori,
             look_dir,
@@ -87,6 +92,12 @@ impl Animation for WieldAnimation {
         } * 1.25)
             * 4.0;
         let jump = if velocity.z == 0.0 { 0.0 } else { 1.0 };
+
+        // next.second.scale = match hands {
+        //     (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
+        //    (_, _) => Vec3::zero(),
+        // };
+
         if speed > 0.2 && velocity.z == 0.0 {
             next.chest.orientation = Quaternion::rotation_z(short * 0.1 + strafe * 0.7)
                 * Quaternion::rotation_y(strafe * 0.2)
@@ -141,190 +152,237 @@ impl Animation for WieldAnimation {
             next.back.orientation = Quaternion::rotation_x(-0.2);
             next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
         }
-        match active_tool_kind {
-            Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
+        match hands {
+            (Some(Hands::Two), _) => match active_tool_kind {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
 
-                next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2 + direction * -5.0);
-                next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + u_slow * 0.15)
-                    * Quaternion::rotation_z(u_slowalt * 0.08);
-            },
-            Some(ToolKind::Dagger) => {
-                next.control.position = Vec3::new(0.0, 0.0, 0.0);
-
-                next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
-                next.hand_l.orientation = Quaternion::rotation_x(0.0 * PI)
-                    * Quaternion::rotation_y(0.0 * PI)
-                    * Quaternion::rotation_z(0.0 * PI);
-
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0 * PI)
-                    * Quaternion::rotation_y(0.0 * PI)
-                    * Quaternion::rotation_z(0.0 * PI);
-
-                next.control_l.position = Vec3::new(-7.0, 0.0, 0.0);
-
-                next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
-                next.hand_r.orientation = Quaternion::rotation_x(0.0 * PI)
-                    * Quaternion::rotation_y(0.0 * PI)
-                    * Quaternion::rotation_z(0.0 * PI);
-
-                next.second.position = Vec3::new(0.0, 0.0, 0.0);
-                next.second.orientation = Quaternion::rotation_x(0.0 * PI)
-                    * Quaternion::rotation_y(0.0 * PI)
-                    * Quaternion::rotation_z(0.0 * PI);
-
-                next.control_r.position = Vec3::new(7.0, 0.0, 0.0);
-            },
-            Some(ToolKind::Axe) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-
-                if speed < 0.5 {
-                    next.head.position =
-                        Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1 + u_slow * 0.1);
-                    next.head.orientation = Quaternion::rotation_z(head_look.x)
-                        * Quaternion::rotation_x(0.35 + head_look.y.abs() + look_dir.z * 0.7);
-                    next.chest.orientation = Quaternion::rotation_x(-0.35)
-                        * Quaternion::rotation_y(u_slowalt * 0.04)
-                        * Quaternion::rotation_z(0.15);
-                    next.belt.position = Vec3::new(0.0, 1.0 + s_a.belt.0, s_a.belt.1);
-                    next.belt.orientation = Quaternion::rotation_x(0.15)
-                        * Quaternion::rotation_y(u_slowalt * 0.03)
-                        * Quaternion::rotation_z(0.15);
-                    next.shorts.position = Vec3::new(0.0, 1.0 + s_a.shorts.0, s_a.shorts.1);
-                    next.shorts.orientation =
-                        Quaternion::rotation_x(0.15) * Quaternion::rotation_z(0.25);
-                } else {
-                }
-                next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
-                next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
-
-                next.control.position = Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2 + direction * -5.0);
-                next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
-                    * Quaternion::rotation_y(s_a.ac.4)
-                    * Quaternion::rotation_z(s_a.ac.5);
-            },
-            Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-                next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
-                next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
-
-                next.control.position = Vec3::new(
-                    s_a.hc.0,
-                    s_a.hc.1 + speed * 0.2,
-                    s_a.hc.2 + speed * 0.8 + direction * -5.0,
-                );
-                next.control.orientation = Quaternion::rotation_x(s_a.hc.3 + u_slow * 0.15)
-                    * Quaternion::rotation_y(s_a.hc.4 + speed * -0.04)
-                    * Quaternion::rotation_z(s_a.hc.5 + u_slowalt * 0.07);
-            },
-            Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
-                if speed > 0.5 && velocity.z == 0.0 {
-                    next.hand_r.position = Vec3::new(
-                        7.0 + s_a.hand.0 + foothoril * 1.3,
-                        -4.0 + s_a.hand.1 + foothoril * -7.0,
-                        1.0 + s_a.hand.2 - foothoril * 5.5,
-                    );
-                    next.hand_r.orientation = Quaternion::rotation_x(0.6 + footrotl * -1.2)
-                        * Quaternion::rotation_y(footrotl * -0.4);
-                } else {
-                    next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
+                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
                     next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
-                };
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_y(0.0);
+                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
 
-                next.control.position =
-                    Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2 + direction * -5.0);
+                    next.control.position =
+                        Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2 + direction * -5.0);
+                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + u_slow * 0.15)
+                        * Quaternion::rotation_z(u_slowalt * 0.08);
+                },
+                Some(ToolKind::Dagger) => {
+                    next.control.position = Vec3::new(0.0, 0.0, 0.0);
 
-                next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
-                next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
+                    next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(0.0 * PI)
+                        * Quaternion::rotation_y(0.0 * PI)
+                        * Quaternion::rotation_z(0.0 * PI);
 
-                next.control.orientation = Quaternion::rotation_x(s_a.stc.3 + u_slow * 0.1)
-                    * Quaternion::rotation_y(s_a.stc.4)
-                    * Quaternion::rotation_z(s_a.stc.5 + u_slowalt * 0.1);
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0 * PI)
+                        * Quaternion::rotation_y(0.0 * PI)
+                        * Quaternion::rotation_z(0.0 * PI);
+
+                    next.control_l.position = Vec3::new(-7.0, 0.0, 0.0);
+
+                    next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.hand_r.orientation = Quaternion::rotation_x(0.0 * PI)
+                        * Quaternion::rotation_y(0.0 * PI)
+                        * Quaternion::rotation_z(0.0 * PI);
+
+                    next.second.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.second.orientation = Quaternion::rotation_x(0.0 * PI)
+                        * Quaternion::rotation_y(0.0 * PI)
+                        * Quaternion::rotation_z(0.0 * PI);
+
+                    next.control_r.position = Vec3::new(7.0, 0.0, 0.0);
+                },
+                Some(ToolKind::Axe) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
+
+                    if speed < 0.5 {
+                        next.head.position =
+                            Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1 + u_slow * 0.1);
+                        next.head.orientation = Quaternion::rotation_z(head_look.x)
+                            * Quaternion::rotation_x(0.35 + head_look.y.abs() + look_dir.z * 0.7);
+                        next.chest.orientation = Quaternion::rotation_x(-0.35)
+                            * Quaternion::rotation_y(u_slowalt * 0.04)
+                            * Quaternion::rotation_z(0.15);
+                        next.belt.position = Vec3::new(0.0, 1.0 + s_a.belt.0, s_a.belt.1);
+                        next.belt.orientation = Quaternion::rotation_x(0.15)
+                            * Quaternion::rotation_y(u_slowalt * 0.03)
+                            * Quaternion::rotation_z(0.15);
+                        next.shorts.position = Vec3::new(0.0, 1.0 + s_a.shorts.0, s_a.shorts.1);
+                        next.shorts.orientation =
+                            Quaternion::rotation_x(0.15) * Quaternion::rotation_z(0.25);
+                    } else {
+                    }
+                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
+                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
+
+                    next.control.position =
+                        Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2 + direction * -5.0);
+                    next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
+                        * Quaternion::rotation_y(s_a.ac.4)
+                        * Quaternion::rotation_z(s_a.ac.5);
+                },
+                Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
+                    next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
+                    next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.hc.0,
+                        s_a.hc.1 + speed * 0.2,
+                        s_a.hc.2 + speed * 0.8 + direction * -5.0,
+                    );
+                    next.control.orientation = Quaternion::rotation_x(s_a.hc.3 + u_slow * 0.15)
+                        * Quaternion::rotation_y(s_a.hc.4 + speed * -0.04)
+                        * Quaternion::rotation_z(s_a.hc.5 + u_slowalt * 0.07);
+                },
+                Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
+                    if speed > 0.5 && velocity.z == 0.0 {
+                        next.hand_r.position = Vec3::new(
+                            7.0 + s_a.hand.0 + foothoril * 1.3,
+                            -4.0 + s_a.hand.1 + foothoril * -7.0,
+                            1.0 + s_a.hand.2 - foothoril * 5.5,
+                        );
+                        next.hand_r.orientation = Quaternion::rotation_x(0.6 + footrotl * -1.2)
+                            * Quaternion::rotation_y(footrotl * -0.4);
+                    } else {
+                        next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
+                    };
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_y(0.0);
+
+                    next.control.position =
+                        Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2 + direction * -5.0);
+
+                    next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
+                    next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
+
+                    next.control.orientation = Quaternion::rotation_x(s_a.stc.3 + u_slow * 0.1)
+                        * Quaternion::rotation_y(s_a.stc.4)
+                        * Quaternion::rotation_z(s_a.stc.5 + u_slowalt * 0.1);
+                },
+                Some(ToolKind::Shield) => {
+                    next.control.position = Vec3::new(0.0, 0.0, 0.0);
+
+                    next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(0.0 * PI);
+
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0 * PI);
+
+                    next.control_l.position = Vec3::new(-7.0, 0.0, 0.0);
+
+                    next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.hand_r.orientation = Quaternion::rotation_x(0.0);
+
+                    next.second.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.second.orientation = Quaternion::rotation_x(0.0 * PI);
+
+                    next.control_r.position = Vec3::new(7.0, 0.0, 0.0);
+                },
+                Some(ToolKind::Bow) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
+                    next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
+                    next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
+                    next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2);
+                    next.hand_r.orientation = Quaternion::rotation_x(s_a.bhr.3);
+
+                    next.hold.position = Vec3::new(0.0, -1.0, -5.2);
+                    next.hold.orientation = Quaternion::rotation_x(-1.57);
+                    next.hold.scale = Vec3::one() * 1.0;
+
+                    next.control.position =
+                        Vec3::new(s_a.bc.0, s_a.bc.1, s_a.bc.2 + direction * -5.0);
+                    next.control.orientation = Quaternion::rotation_x(u_slow * 0.06)
+                        * Quaternion::rotation_y(s_a.bc.4)
+                        * Quaternion::rotation_z(s_a.bc.5 + u_slowalt * 0.1);
+                },
+                Some(ToolKind::Debug) => {
+                    next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.27);
+                    next.main.position = Vec3::new(-5.0, 5.0, 23.0);
+                    next.main.orientation = Quaternion::rotation_x(PI);
+                },
+                Some(ToolKind::Farming) => {
+                    if speed < 0.5 {
+                        next.head.orientation = Quaternion::rotation_z(head_look.x)
+                            * Quaternion::rotation_x(-0.2 + head_look.y.abs() + look_dir.z * 0.7);
+                    }
+                    next.hand_l.position = Vec3::new(9.0, 1.0, 1.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57);
+                    next.hand_r.position = Vec3::new(9.0, 1.0, 11.0);
+                    next.hand_r.orientation = Quaternion::rotation_x(1.57);
+                    next.main.position = Vec3::new(7.5, 7.5, 13.2);
+                    next.main.orientation = Quaternion::rotation_y(3.14);
+
+                    next.control.position = Vec3::new(-11.0 + slow * 2.0, 1.8, 4.0);
+                    next.control.orientation = Quaternion::rotation_x(u_slow * 0.1)
+                        * Quaternion::rotation_y(0.6 + u_slow * 0.1)
+                        * Quaternion::rotation_z(u_slowalt * 0.1);
+                },
+                _ => {},
             },
-            Some(ToolKind::Shield) => {
-                next.control.position = Vec3::new(0.0, 0.0, 0.0);
-
-                next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
-                next.hand_l.orientation = Quaternion::rotation_x(0.0 * PI);
-
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), _) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0 * PI);
-
-                next.control_l.position = Vec3::new(-7.0, 0.0, 0.0);
-
-                next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
-                next.hand_r.orientation = Quaternion::rotation_x(0.0);
-
                 next.second.position = Vec3::new(0.0, 0.0, 0.0);
-                next.second.orientation = Quaternion::rotation_x(0.0 * PI);
+                next.main.orientation = Quaternion::rotation_z(PI);
+                next.second.orientation = Quaternion::rotation_z(PI);
 
-                next.control_r.position = Vec3::new(7.0, 0.0, 0.0);
+                next.control_l.position = Vec3::new(-8.0, 9.0, 4.0);
+                next.control_l.orientation = Quaternion::rotation_x(-0.3);
+                next.hand_l.position = Vec3::new(0.0, 0.5, -4.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.57)
             },
-            Some(ToolKind::Bow) => {
+            (_, _) => {},
+        };
+        match hands {
+            (_, Some(Hands::One)) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-                next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
-                next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
-                next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2);
-                next.hand_r.orientation = Quaternion::rotation_x(s_a.bhr.3);
+                next.second.position = Vec3::new(0.0, 0.0, 0.0);
+                next.main.orientation = Quaternion::rotation_z(PI);
+                next.second.orientation = Quaternion::rotation_z(PI);
 
-                next.hold.position = Vec3::new(0.0, -1.0, -5.2);
-                next.hold.orientation = Quaternion::rotation_x(-1.57);
-                next.hold.scale = Vec3::one() * 1.0;
+                next.control_r.position = Vec3::new(8.0, 9.0, 4.0);
+                next.control_r.orientation = Quaternion::rotation_x(-0.3);
 
-                next.control.position = Vec3::new(s_a.bc.0, s_a.bc.1, s_a.bc.2 + direction * -5.0);
-                next.control.orientation = Quaternion::rotation_x(u_slow * 0.06)
-                    * Quaternion::rotation_y(s_a.bc.4)
-                    * Quaternion::rotation_z(s_a.bc.5 + u_slowalt * 0.1);
+                next.hand_r.position = Vec3::new(0.0, 0.5, -4.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.57)
             },
-            Some(ToolKind::Debug) => {
-                next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
-                next.hand_l.orientation = Quaternion::rotation_x(1.27);
-                next.main.position = Vec3::new(-5.0, 5.0, 23.0);
-                next.main.orientation = Quaternion::rotation_x(PI);
+            (_, _) => {},
+        };
+        match hands {
+            (None, _) => {
+                next.hand_l.position = Vec3::new(0.0, 0.0, 20.0);
             },
-            Some(ToolKind::Farming) => {
-                if speed < 0.5 {
-                    next.head.orientation = Quaternion::rotation_z(head_look.x)
-                        * Quaternion::rotation_x(-0.2 + head_look.y.abs() + look_dir.z * 0.7);
-                }
-                next.hand_l.position = Vec3::new(9.0, 1.0, 1.0);
-                next.hand_l.orientation = Quaternion::rotation_x(1.57);
-                next.hand_r.position = Vec3::new(9.0, 1.0, 11.0);
-                next.hand_r.orientation = Quaternion::rotation_x(1.57);
-                next.main.position = Vec3::new(7.5, 7.5, 13.2);
-                next.main.orientation = Quaternion::rotation_y(3.14);
+            (_, _) => {},
+        };
 
-                next.control.position = Vec3::new(-11.0 + slow * 2.0, 1.8, 4.0);
-                next.control.orientation = Quaternion::rotation_x(u_slow * 0.1)
-                    * Quaternion::rotation_y(0.6 + u_slow * 0.1)
-                    * Quaternion::rotation_z(u_slowalt * 0.1);
+        match hands {
+            (_, None) => {
+                next.hand_r.position = Vec3::new(0.0, 0.0, 20.0);
             },
-            _ => {},
-        }
-
+            (_, _) => {},
+        };
         next
     }
 }
diff --git a/voxygen/anim/src/dyn_lib.rs b/voxygen/anim/src/dyn_lib.rs
index 8c7feaf030..e1adea401d 100644
--- a/voxygen/anim/src/dyn_lib.rs
+++ b/voxygen/anim/src/dyn_lib.rs
@@ -146,23 +146,25 @@ pub fn init() {
     // Start reloader that watcher signals
     // "Debounces" events since I can't find the option to do this in the latest
     // `notify`
-    std::thread::Builder::new("voxygen_anim_watcher".to_owned()).spawn(move || {
-        let mut modified_paths = std::collections::HashSet::new();
-        while let Ok(path) = reload_recv.recv() {
-            modified_paths.insert(path);
-            // Wait for any additional modify events before reloading
-            while let Ok(path) = reload_recv.recv_timeout(Duration::from_millis(300)) {
+    std::thread::Builder::new()
+        .name("voxygen_anim_watcher".to_owned())
+        .spawn(move || {
+            let mut modified_paths = std::collections::HashSet::new();
+            while let Ok(path) = reload_recv.recv() {
                 modified_paths.insert(path);
+                // Wait for any additional modify events before reloading
+                while let Ok(path) = reload_recv.recv_timeout(Duration::from_millis(300)) {
+                    modified_paths.insert(path);
+                }
+
+                info!(
+                    ?modified_paths,
+                    "Hot reloading animations because files in `anim` modified."
+                );
+
+                hotreload();
             }
-
-            info!(
-                ?modified_paths,
-                "Hot reloading animations because files in `anim` modified."
-            );
-
-            hotreload();
-        }
-    });
+        });
 
     // Let the watcher live forever
     std::mem::forget(watcher);
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 59fb55bfc8..4ccb63e590 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -1453,6 +1453,7 @@ impl FigureMgr {
                                     (
                                         active_tool_kind,
                                         second_tool_kind,
+                                        hands,
                                         // TODO: Update to use the quaternion.
                                         ori * anim::vek::Vec3::<f32>::unit_y(),
                                         state.last_ori * anim::vek::Vec3::<f32>::unit_y(),

From 72e62701f8b73b804d7033e5af87a3724f6dd85c Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Tue, 23 Mar 2021 22:04:21 -0400
Subject: [PATCH 02/11] Fixed offhand weapons, when nothing was in the mainhand

---
 voxygen/src/hud/hotbar.rs   | 19 ++++++++++---
 voxygen/src/hud/skillbar.rs | 53 +++++++++++++++++++++----------------
 voxygen/src/hud/slots.rs    | 29 +++++++++++++++-----
 3 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/voxygen/src/hud/hotbar.rs b/voxygen/src/hud/hotbar.rs
index a717c96b01..09e7bde197 100644
--- a/voxygen/src/hud/hotbar.rs
+++ b/voxygen/src/hud/hotbar.rs
@@ -78,8 +78,20 @@ impl State {
         let inventory = inventories.get(client.entity());
         let stats = client.state().ecs().read_storage::<common::comp::Stats>();
         let stat = stats.get(client.entity());
-        let should_be_present = if let (Some(inventory), Some(stat)) = (inventory, stat) {
-            inventory.equipped(EquipSlot::Mainhand).map_or(false, |i| {
+        
+        let hands = |equip_slot| match inventory.and_then(|i| i.equipped(equip_slot).map(|i| i.kind())) {
+            Some(ItemKind::Tool(tool)) => Some(tool.hands),
+            _ => None,
+        };
+
+        let equip_slot = match (hands(EquipSlot::Mainhand), hands(EquipSlot::Offhand)) {
+            (Some(_), _) => Some(EquipSlot::Mainhand),
+            (_, Some(_)) => Some(EquipSlot::Offhand),
+            _ => None,
+        };
+
+        let should_be_present = if let (Some(inventory), Some(stat), Some(equip_slot)) = (inventory, stat, equip_slot) {
+            inventory.equipped(equip_slot).map_or(false, |i| {
                 i.item_config_expect()
                     .abilities
                     .abilities
@@ -126,8 +138,9 @@ impl State {
 
             let (equip_slot, skill_index) = match (active_tool_hands, second_tool_hands) {
                 (Some(Hands::Two), _) => (Some(EquipSlot::Mainhand), 1),
-                (_, Some(Hands::One)) => (Some(EquipSlot::Offhand), 0),
+                (Some(_), Some(Hands::One)) => (Some(EquipSlot::Offhand), 0),
                 (Some(Hands::One), _) => (Some(EquipSlot::Mainhand), 1),
+                (None, Some(_)) => (Some(EquipSlot::Offhand), 1),
                 (_, _) => (None, 0),
             };
 
diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs
index a8c6f75b87..1ad00ee7dc 100644
--- a/voxygen/src/hud/skillbar.rs
+++ b/voxygen/src/hud/skillbar.rs
@@ -563,8 +563,9 @@ impl<'a> Widget for Skillbar<'a> {
 
                         let equip_slot = match (active_tool_hands, second_tool_hands) {
                             (Some(Hands::Two), _) => Some(EquipSlot::Mainhand),
-                            (_, Some(Hands::One)) => Some(EquipSlot::Offhand),
+                            (Some(_), Some(Hands::One)) => Some(EquipSlot::Offhand),
                             (Some(Hands::One), _) => Some(EquipSlot::Mainhand),
+                            (None, Some(_)) => Some(EquipSlot::Offhand),
                             (_, _) => None,
                         };
 
@@ -661,27 +662,32 @@ impl<'a> Widget for Skillbar<'a> {
             .w_h(40.0, 40.0)
             .right_from(state.ids.slot5, slot_offset)
             .set(state.ids.m1_slot_bg, ui);
-        Button::image(
-            match self
-                .inventory
-                .equipped(EquipSlot::Mainhand)
-                .map(|i| i.kind())
-            {
-                Some(ItemKind::Tool(Tool { kind, .. })) => match kind {
-                    ToolKind::Sword => self.imgs.twohsword_m1,
-                    ToolKind::Dagger => self.imgs.onehdagger_m1,
-                    ToolKind::Shield => self.imgs.onehshield_m1,
-                    ToolKind::Hammer => self.imgs.twohhammer_m1,
-                    ToolKind::Axe => self.imgs.twohaxe_m1,
-                    ToolKind::Bow => self.imgs.bow_m1,
-                    ToolKind::Sceptre => self.imgs.skill_sceptre_lifesteal,
-                    ToolKind::Staff => self.imgs.fireball,
-                    ToolKind::Debug => self.imgs.flyingrod_m1,
-                    _ => self.imgs.nothing,
-                },
-                _ => self.imgs.nothing,
-            },
-        ) // Insert Icon here
+
+        let active_tool = get_item_and_tool(self.inventory, EquipSlot::Mainhand);
+        let second_tool = get_item_and_tool(self.inventory, EquipSlot::Offhand);
+
+        let tool = match (
+            active_tool.map(|(_, x)| x.hands),
+            second_tool.map(|(_, x)| x.hands),
+        ) {
+            (Some(_), _) => active_tool,
+            (_, Some(_)) => second_tool,
+            (_, _) => None,
+        };
+        
+        
+        Button::image(match tool.map(|(_, t)| t.kind) {
+            Some(ToolKind::Sword) => self.imgs.twohsword_m1,
+            Some(ToolKind::Dagger) => self.imgs.onehdagger_m1,
+            Some(ToolKind::Shield) => self.imgs.onehshield_m1,
+            Some(ToolKind::Hammer) => self.imgs.twohhammer_m1,
+            Some(ToolKind::Axe) => self.imgs.twohaxe_m1,
+            Some(ToolKind::Bow) => self.imgs.bow_m1,
+            Some(ToolKind::Sceptre) => self.imgs.skill_sceptre_lifesteal,
+            Some(ToolKind::Staff) => self.imgs.fireball,
+            Some(ToolKind::Debug) => self.imgs.flyingrod_m1,
+            _ => self.imgs.nothing,
+        }) // Insert Icon here
         .w_h(36.0, 36.0)
         .middle_of(state.ids.m1_slot_bg)
         .set(state.ids.m1_content, ui);
@@ -709,8 +715,9 @@ impl<'a> Widget for Skillbar<'a> {
             second_tool.map(|(_, x)| x.hands),
         ) {
             (Some(Hands::Two), _) => active_tool,
-            (_, Some(Hands::One)) => second_tool,
+            (Some(_), Some(Hands::One)) => second_tool,
             (Some(Hands::One), _) => active_tool,
+            (None, Some(_)) => second_tool,
             (_, _) => None,
         };
 
diff --git a/voxygen/src/hud/slots.rs b/voxygen/src/hud/slots.rs
index fe28b7e1a1..7db771bd30 100644
--- a/voxygen/src/hud/slots.rs
+++ b/voxygen/src/hud/slots.rs
@@ -144,14 +144,30 @@ impl<'a> SlotKey<HotbarSource<'a>, HotbarImageSource<'a>> for HotbarSlot {
                 .map(|item| HotbarImage::Item(item.into()))
                 .map(|i| (i, None)),
             hotbar::SlotContents::Ability3 => {
-                let tool = match inventory
-                    .equipped(EquipSlot::Mainhand)
-                    .map(|i| (i, i.kind()))
-                {
-                    Some((item, ItemKind::Tool(tool))) => Some((item, tool)),
+                let hands = |equip_slot| match inventory.equipped(equip_slot).map(|i| i.kind()) {
+                    Some(ItemKind::Tool(tool)) => Some(tool.hands),
                     _ => None,
                 };
 
+                let active_tool_hands = hands(EquipSlot::Mainhand);
+                let second_tool_hands = hands(EquipSlot::Offhand);
+
+                let equip_slot = match (active_tool_hands, second_tool_hands) {
+                    (Some(_), _) => Some(EquipSlot::Mainhand),
+                    (None, Some(_)) => Some(EquipSlot::Offhand),
+                    (_, _) => None,
+                };
+
+                let tool = equip_slot.and_then(|es| 
+                    match inventory
+                        .equipped(es)
+                        .map(|i| (i, i.kind()))
+                    {
+                        Some((item, ItemKind::Tool(tool))) => Some((item, tool)),
+                        _ => None,
+                    }
+                );
+
                 tool.and_then(|(item, tool)| {
                     hotbar_image(tool.kind).map(|i| {
                         (
@@ -184,8 +200,9 @@ impl<'a> SlotKey<HotbarSource<'a>, HotbarImageSource<'a>> for HotbarSlot {
 
                 let (equip_slot, skill_index) = match (active_tool_hands, second_tool_hands) {
                     (Some(Hands::Two), _) => (Some(EquipSlot::Mainhand), 1),
-                    (_, Some(Hands::One)) => (Some(EquipSlot::Offhand), 0),
+                    (Some(_), Some(Hands::One)) => (Some(EquipSlot::Offhand), 0),
                     (Some(Hands::One), _) => (Some(EquipSlot::Mainhand), 1),
+                    (None, Some(_)) => (Some(EquipSlot::Offhand), 1),
                     (_, _) => (None, 0),
                 };
 

From 9bbfe163c4ff0f0b5dde0d4003fd4dd071db704e Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Wed, 24 Mar 2021 00:54:25 -0400
Subject: [PATCH 03/11] You can now roll without a weapon equipped.

---
 common/src/comp/inventory/item/mod.rs |  2 +-
 common/src/states/utils.rs            | 14 +++-----------
 voxygen/src/hud/hotbar.rs             | 15 +++++++++------
 voxygen/src/hud/skillbar.rs           |  3 +--
 voxygen/src/hud/slots.rs              | 10 +++-------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index 1bcf4d9738..27d2995432 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -246,7 +246,6 @@ impl PartialEq for ItemDef {
 pub struct ItemConfig {
     pub abilities: AbilitySet<CharacterAbility>,
     pub block_ability: Option<CharacterAbility>,
-    pub dodge_ability: Option<CharacterAbility>,
 }
 
 #[derive(Debug)]
@@ -270,6 +269,7 @@ impl TryFrom<(&ItemKind, &[Item], &AbilityMap, &MaterialStatManifest)> for ItemC
             })
         } else {
             Err(ItemConfigError::BadItemKind)
+            };
         }
     }
 }
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 647a2401ef..72d3162524 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -570,17 +570,9 @@ pub fn attempt_input(data: &JoinData, update: &mut StateUpdate) {
 /// attempts to perform their dodge ability
 pub fn handle_dodge_input(data: &JoinData, update: &mut StateUpdate) {
     if input_is_pressed(data, InputKind::Roll) && data.body.is_humanoid() {
-        if let Some(ability) = data
-            .inventory
-            .equipped(EquipSlot::Mainhand)
-            .and_then(|i| {
-                i.item_config_expect()
-                    .dodge_ability
-                    .as_ref()
-                    .map(|a| a.clone().adjusted_by_skills(&data.stats.skill_set, None))
-            })
-            .filter(|ability| ability.requirements_paid(data, update))
-        {
+        let ability =
+            CharacterAbility::default_roll().adjusted_by_skills(&data.stats.skill_set, None);
+        if ability.requirements_paid(data, update) {
             update.character = CharacterState::from((
                 &ability,
                 AbilityInfo::from_input(data, false, InputKind::Roll),
diff --git a/voxygen/src/hud/hotbar.rs b/voxygen/src/hud/hotbar.rs
index 09e7bde197..38c6b83119 100644
--- a/voxygen/src/hud/hotbar.rs
+++ b/voxygen/src/hud/hotbar.rs
@@ -78,11 +78,12 @@ impl State {
         let inventory = inventories.get(client.entity());
         let stats = client.state().ecs().read_storage::<common::comp::Stats>();
         let stat = stats.get(client.entity());
-        
-        let hands = |equip_slot| match inventory.and_then(|i| i.equipped(equip_slot).map(|i| i.kind())) {
-            Some(ItemKind::Tool(tool)) => Some(tool.hands),
-            _ => None,
-        };
+
+        let hands =
+            |equip_slot| match inventory.and_then(|i| i.equipped(equip_slot).map(|i| i.kind())) {
+                Some(ItemKind::Tool(tool)) => Some(tool.hands),
+                _ => None,
+            };
 
         let equip_slot = match (hands(EquipSlot::Mainhand), hands(EquipSlot::Offhand)) {
             (Some(_), _) => Some(EquipSlot::Mainhand),
@@ -90,7 +91,9 @@ impl State {
             _ => None,
         };
 
-        let should_be_present = if let (Some(inventory), Some(stat), Some(equip_slot)) = (inventory, stat, equip_slot) {
+        let should_be_present = if let (Some(inventory), Some(stat), Some(equip_slot)) =
+            (inventory, stat, equip_slot)
+        {
             inventory.equipped(equip_slot).map_or(false, |i| {
                 i.item_config_expect()
                     .abilities
diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs
index 1ad00ee7dc..7d5146c949 100644
--- a/voxygen/src/hud/skillbar.rs
+++ b/voxygen/src/hud/skillbar.rs
@@ -674,8 +674,7 @@ impl<'a> Widget for Skillbar<'a> {
             (_, Some(_)) => second_tool,
             (_, _) => None,
         };
-        
-        
+
         Button::image(match tool.map(|(_, t)| t.kind) {
             Some(ToolKind::Sword) => self.imgs.twohsword_m1,
             Some(ToolKind::Dagger) => self.imgs.onehdagger_m1,
diff --git a/voxygen/src/hud/slots.rs b/voxygen/src/hud/slots.rs
index 7db771bd30..4af2858f8c 100644
--- a/voxygen/src/hud/slots.rs
+++ b/voxygen/src/hud/slots.rs
@@ -158,15 +158,11 @@ impl<'a> SlotKey<HotbarSource<'a>, HotbarImageSource<'a>> for HotbarSlot {
                     (_, _) => None,
                 };
 
-                let tool = equip_slot.and_then(|es| 
-                    match inventory
-                        .equipped(es)
-                        .map(|i| (i, i.kind()))
-                    {
+                let tool =
+                    equip_slot.and_then(|es| match inventory.equipped(es).map(|i| (i, i.kind())) {
                         Some((item, ItemKind::Tool(tool))) => Some((item, tool)),
                         _ => None,
-                    }
-                );
+                    });
 
                 tool.and_then(|(item, tool)| {
                     hotbar_image(tool.kind).map(|i| {

From 1b7af50388f33309a391546b0d4f789d2ac826ae Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sat, 27 Mar 2021 00:40:18 -0400
Subject: [PATCH 04/11] alpha attacks

---
 .../voxygen/voxel/biped_weapon_manifest.ron   |  12 +-
 .../voxel/weapon/axe_1h/bloodsteel-0.vox      | Bin 1372 -> 1372 bytes
 .../voxel/weapon/axe_1h/bloodsteel-1.vox      | Bin 1420 -> 1420 bytes
 .../voxygen/voxel/weapon/axe_1h/bronze-0.vox  | Bin 1380 -> 1380 bytes
 .../voxygen/voxel/weapon/axe_1h/bronze-1.vox  | Bin 1392 -> 1392 bytes
 .../voxygen/voxel/weapon/axe_1h/cobalt-1.vox  | Bin 1544 -> 1544 bytes
 assets/voxygen/voxel/weapon/axe_1h/iron-0.vox | Bin 1380 -> 1380 bytes
 assets/voxygen/voxel/weapon/axe_1h/iron-2.vox | Bin 1356 -> 1356 bytes
 assets/voxygen/voxel/weapon/axe_1h/iron-3.vox | Bin 1480 -> 1480 bytes
 .../voxygen/voxel/weapon/axe_1h/steel-0.vox   | Bin 1456 -> 1880 bytes
 .../voxygen/voxel/weapon/axe_1h/steel-1.vox   | Bin 1424 -> 1424 bytes
 .../voxygen/voxel/weapon/axe_1h/steel-2.vox   | Bin 1444 -> 1444 bytes
 .../voxygen/voxel/weapon/axe_1h/stone-0.vox   | Bin 1508 -> 1508 bytes
 .../voxygen/voxel/weapon/axe_1h/stone-1.vox   | Bin 1396 -> 1396 bytes
 assets/voxygen/voxel/weapon/axe_1h/wood-0.vox | Bin 1488 -> 1488 bytes
 assets/voxygen/voxel/weapon/axe_1h/wood-1.vox | Bin 1404 -> 1404 bytes
 .../voxel/weapon/hammer_1h/bloodsteel-1.vox   | Bin 1552 -> 1552 bytes
 .../voxygen/voxel/weapon/hammer_1h/iron-0.vox | Bin 1820 -> 1820 bytes
 .../voxel/weapon/hammer_1h/steel-0.vox        | Bin 1880 -> 1880 bytes
 .../voxel/weapon/hammer_1h/stone-0.vox        | Bin 1672 -> 1672 bytes
 .../voxel/weapon/hammer_1h/stone-1.vox        | Bin 1656 -> 1656 bytes
 .../voxygen/voxel/weapon/hammer_1h/wood-0.vox | Bin 1816 -> 1816 bytes
 .../voxel/weapon/sword_1h/bloodsteel-0.vox    | Bin 1348 -> 1348 bytes
 .../voxel/weapon/sword_1h/bronze-0.vox        | Bin 1284 -> 1284 bytes
 .../voxel/weapon/sword_1h/bronze-1.vox        | Bin 1308 -> 1308 bytes
 .../voxygen/voxel/weapon/sword_1h/iron-0.vox  | Bin 1300 -> 1300 bytes
 .../voxygen/voxel/weapon/sword_1h/iron-1.vox  | Bin 1300 -> 1300 bytes
 .../voxygen/voxel/weapon/sword_1h/iron-3.vox  | Bin 1272 -> 1272 bytes
 .../voxygen/voxel/weapon/sword_1h/steel-2.vox | Bin 1332 -> 1332 bytes
 voxygen/anim/src/character/alpha.rs           | 244 ++++++++++++++----
 voxygen/anim/src/character/stand.rs           |   2 +-
 voxygen/anim/src/character/wield.rs           |  39 ++-
 voxygen/src/scene/figure/mod.rs               |   3 +
 33 files changed, 214 insertions(+), 86 deletions(-)

diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index 7f9c395e8b..9233487f66 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -165,15 +165,15 @@
     ),
     // 1h Swords
     "common.items.weapons.sword_1h.bloodsteel-0": (
-        vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -3.0)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-0", (-2.5, -3.5, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bloodsteel-1": (
-        vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -3.0)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-1", (-1.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bloodsteel-2": (
-        vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -3.0)),
+        vox_spec: ("weapon.sword_1h.bloodsteel-2", (-1.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.sword_1h.bronze-0": (
@@ -391,11 +391,11 @@
     ),
     // 1h Axes
     "common.items.weapons.axe_1h.bloodsteel-0": (
-        vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -7.5, -3.0)),
+        vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.bloodsteel-1": (
-        vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.bronze-0": (
@@ -609,7 +609,7 @@
     ),*/
     // 1h Hammers
     "common.items.weapons.hammer_1h.bloodsteel-0": (
-        vox_spec: ("weapon.hammer_1h.bloodsteel-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.bloodsteel-0", (-2.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.bloodsteel-1": (
diff --git a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox
index 94b837ceda9abf67169a07783eafffb8912ddc3d..527b0d36f7d00096926f0cd5de5fae13eef695bd 100644
GIT binary patch
delta 279
zcmW-b*^R?63`F^;)A9k>fVT;&h5gOH<ATycdf9eT%#QOhm_yW%pZ00*-xuY;ONV^G
z((!ykI`Q;`_{8Id&6_iCFs~+dmv-qd>kr|=!%0{+Y+9XZMKHl#TCkhLox8eS-J|x7
z{RL<V7c>Q}W7Zv0sdW?FrM=2my(_zYyh{gV!$FX*^G;D#C-EpAcj~eeb!gO4Maa@w
VGfBwuNvKVOrLB}<C;dJ6iT@z~5q|&x

delta 279
zcmW+w+Yy5>46~fX4he7vcXSD|LVx=Y48#iErR#K<D*e#u5l8m7e9QZJyYDb>aNFT?
zgV_O32P~cNc*5d^Jgw@}3ZE7st5F;EpZUkb1q%n#ydsZ_`nZ4)LXDb`&Z+0hZe@4n
z-r8<BxC9rxFenXKn!2!5nh<K#mgzI!nROp~>A-B*k?3XG0A@0hE4glvc|+u(kw<}0
WYUNBIls*trIEb<U!-nvA;SqnjB@!0^

diff --git a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-1.vox b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-1.vox
index 032eaa671f7a5a3f33032ca7213a94b910adc072..51b0c4bf3d61ed843563f120286a5fbb5d96c486 100644
GIT binary patch
delta 335
zcmW-c%W=dY5Jaa({KNojR0T<h6nyesn~^txJvbL9=#~#%Jp*rkZ+qL%=L_+K#s!2Y
z&=`jc@N~~N_k_9&Qcp!aK?$W=7qoWy_eO3bzb(YaL~2x>h#wQK9q?3W9kC6>Isj!)
zy%6__tsXA`EXG1I7Ul^N4igTOC3IEcUzrG{gR$IscnoZGUk*qiU&t3O$5;!OD~H^^
z@jsRUM-RC}jI5D0vW(Tf2pcak!gc_e%Vb`(({~Qq2Q)EHCtPMT8}PShUXvz#?eM?f
GXzmYqw-g!x

delta 335
zcmW-c%W(uD3`EuZ2LWrSf+U6%eDZxZBX0tGa4t^JJw9}`1W&)WzV+wx72}BzH)41q
zHpbyX^mNZR_e5|PQaw$qCn%vzs2ibn`S(W7lD8XpEJ&m30zMX88?cmV9cUA%6Vb4z
zxqxHA*YQFGi?Jcf!n}}#!-T_R3*7|aUs*7vgR$JXc}#e^Ed!~LFXRiCV;l;XD?@Jg
z{70E^bdx)hl2x)wmT}N8!pcjOunxq`Wil^1=m!TK6Cp8ACtPMTov^oOUXvDV?XbV!
GXzmZ~>lCa2

diff --git a/assets/voxygen/voxel/weapon/axe_1h/bronze-0.vox b/assets/voxygen/voxel/weapon/axe_1h/bronze-0.vox
index ef7d1405047f58f55fdd8928cfaca574d59b08c9..e224dd6002b630107de1730424cf57bd171b97d6 100644
GIT binary patch
delta 295
zcmWm8%@Kky7=+<(zx<#f2?clx9eD6)8_vMci!IoTEm?>!hi7&(EP-G7mCy6-WtGa%
zR1aw$@|p8OA}*T}^0I4M4q4w^eG?4sbl8~z5ed1o@9Z1<#=fzqI~{grKy2GviIN*H
zG=8A+;kqhTE-Hs25<S;ld8W_1B0S%vgy|ulNY25Ax$(XYhlvh9)8KkYy33tCJdokW
U1(65vL|%q;WqeuX-<Nv)1KyGvs{jB1

delta 295
zcmWlT!I8rt5CnG?7WojM0Q{0N@Wanb!&Oo#7pLG{E+q$Ytw-0)!py?Ae(UG=9d%Qw
ztE`<W^QxGc7ZlR6%R$Q_TTV@5_cC^Yfd?M!(hLb4G{_I~oqQ+X$>ReLc4>yx_qQCQ
zPNDOG#=~t>YAmX!5;$J%kY@aRC_$8mO2G6~Oek}<)xzl8>R<&Ae(7|b>#3rL!pTD<
WG~HQ{xqt}tM(Ky}ZBzWcH1a<W=Nl#f

diff --git a/assets/voxygen/voxel/weapon/axe_1h/bronze-1.vox b/assets/voxygen/voxel/weapon/axe_1h/bronze-1.vox
index 73d151936f21a6a62d8a1c5437de10387c54216f..6f461e4c79d3c3cfb2f28ee107e8eec6fad06c8e 100644
GIT binary patch
delta 307
zcmWlT!IgtB3`8|DHUun_7R+U<*h1iO+D6jC_L9a@LcS04W+Z(*>9c;;|KFFdhqQLh
z^_I3S->7$d=yAvw>PJ`EZ&~ZE)`bkYH|FiM;i;XPP)4O)nj3t;2YkSjJ>UZ#PXQn2
zOPNrDh2Vk8(aOPvrHMSTkPnr5scg&>y+p6TWSE(HCYP>chq*B`4v}Td$-@n~;DkHw
g@RbMZ4<FalIch`W0jn(GdB2o54nJ>|_n+GI1xVx<F8}}l

delta 307
zcmWlT!EwVd3<Pl$LD~{QxdrNzDpH6vdZiJ!kY3W5OUUwZa|d8Cz-Rrezu#|P50!Pu
z+O4t;`9{6tQ_n;GpneW%zg7E4r4J!P$vg9Y+VtE{Ehr)NOV;57KHvkM>;WI}cn<hD
z-%11p3&8`8qm6?PmNGfB;D^*MX=A?7Tj&)ShpE(+T!yk8=Elr8L@vghJiQ_pobZGv
g_{Ib6i;vrxIBHY#f!bKY(|##!9Dd!>-;a9!2d4xV#Q*>R

diff --git a/assets/voxygen/voxel/weapon/axe_1h/cobalt-1.vox b/assets/voxygen/voxel/weapon/axe_1h/cobalt-1.vox
index 59fa78783ff3af075f259ec7f24962886dfe5b02..5ab68537485572af53f055355825436a9aa253c1 100644
GIT binary patch
delta 460
zcmWlTJ8r`;5C!)wKcXa(a(Xw?Jp$wo0UTIR6JNxw%iJZmOO;VEn0?$`lCS!zKkv_w
zH-)mv(<(2kLZXg1;_$5y9&&#u__thSJtSM*jd@!QJWzw3j^}wM59|+k#N(=T+2s>?
zB6r+*ciEouWmUc$8kR$9clUM|7<ixtI~^fGh5<_3rOJF|zA{f8sKHK0NRVNGQu)Bl
z!}F%nccq2i^4v9?p%b9Y<mphJIGb1`=b4KjkB8E@Yn%^_6&mzIg^w3@(i@aR#>b3#
z<36jqr}kywxqcdWsy74A?PmF-QS_^)el={^hYIa#*s$lB{!AaRNBWUIw)p#}9{&N1
Cl__`t

delta 460
zcmWlTJ8r`;5C!)wf1*T6PVYv#M}XWRfCCF^;)}R-nY-k6sWK`CvyZz=^3`7L=lz-U
zraWvaX;m3k<wPBE#Nk^xJXHLl?B6OP>!HC`FUGvB2A-+GPN(xclMDL=S6o-c%dRq#
zNAiqk-d(n*%Cah44*7Cu=yxyuE->&+4R$&~ga8ieyN1SmW4<v@ovFc2Cx{ThL5&Yg
zJUngEyelsBmgg=%!%P58<nd4#IU89dhlz_I)I+iEvgwdD=rA7=9~V3E4TeLNk5%R?
z_tmz0>|X{R+NXiXb~EtMZx%i}#eDTRUkw{}Z_uxX4SSgAPxJwMqMztvOTT}b<3BeX
BDW(7b

diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-0.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-0.vox
index cd660622b678406c321f747adb1a8c696ca6c134..832009c97248f9f310b01e267b9dbd72e3aa4cd5 100644
GIT binary patch
delta 295
zcmWm8xe>!K3`9{ZcuCaZQJ}~rP>BMCZo}=U1^42XT!=q|H^3|~B!2Z*Kd(DHc10v;
zZE}QlQ$#{uciFPJmQ66Y)5CfVNXRG)yED5pyED7=P7mufAfwFuH68M)-O3ZeL{JH8
zQ!E@)SwtE*Zs38TNyDK$G8;J#K9Y@xO5GK#nH$GjbC~Giy;{$8Njl|zO7K7pmpnch
SM4CiR3^D_F;eqd4Yy1O0(h#Ts

delta 295
zcmWm8y%B>j42EHSvSq;h<S3{zf@vryvqsioh3t}*GDu#E=cN0jv-PXL`gvXXu_?h(
zmZm^nRwX#JZ0hFK%e)E(4|>>LGaQ1=>`v@X>`v^`2R-br8G=pxHSUVBUD8M}5>$fP
zlsb;7EW&$^>v^DWD*Y}E%m$7_3}nMDtDCYl3*&fe4lDHVyLNZ3Q$>fu4;4hBrc;rh
S3^GkngF#_{=y>4!){_5gdJ!1_

diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-2.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-2.vox
index fb1c9465d70d19e7ac32d3aec5a0d32fd5ec1470..79b8bd073043cbec38303976a97095c1663053b3 100644
GIT binary patch
delta 271
zcmW-c*^R?63`F^;E0zzy22_R8Lehidg3>~I*)~$tj`Hy^qX7@`Tfg=5cvJ3pc|jIi
z$MXs4#FO6fg~tn9cW2#UJxuB@@A5xY58=YYNm(1V9L{neOt{Mn8yZ9wWoa;L@7&+y
zS;4HJDyW^ZHBwb!ZRBkyjb%42x!p->j$_csCS{W{)dcJ2rq5e<VaN*~Y9r?Ybd2jL
RKMCrIWA+pp@$bnN{{d&r5i|e*

delta 271
zcmW-c>kY#o41|3Kn}j^1L}CiELc0UWKv|)?bd3zvqdz{~aq<H{`N^Nx?dgD}6YgZK
zFmG^cFylL(uy`RYoBFcBmtCl8^hW<z_IS8pp+S~{H1F#34kAR2o=De7Kx8iPiF>Dd
z0~3RZL1vIEWG&Fl!d!rLgZ5<umkbA#&7lwK*~n~U#+oQqO!#@JO2p}jc1=CU1qY8&
S9;FSDJ)zGYLqYhyvBn>}iV?E_

diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-3.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-3.vox
index 4ae5006f9edfceeb3d126f81b1cae48323b42a35..4f3fa6ff6cfcbd97a77dd69ac4a6f8779f046fce 100644
GIT binary patch
delta 395
zcmWlU!EM7Z5Cm_JJdqS7IfkIO+=5~FnNpm$yKoEX#lKYGvNC!McDctTj-USNzuzxE
ztty~plP|0CvMZqAE1AukG_UgctTdlJqhR2H2Rn3t0+qXsj!pC?dK0~g9ts8?crbWr
z;837)xlxL`E7yxkTNMr8E^>SwH<giWBpb=_B5Qq9?R=uMMCVZy94zC(4^7}8?i!uJ
zb_;v)TiYEh8xP|TO%S>%>#p#tvfmWxshqBgd{@p-MKBNM1M`7-AulZU#iHO91vM5t
SIN>4bA=i)G9@6_yOa2Fw8WoxV

delta 395
zcmWlU%WcCj5JY!Y%bzI8F$A6E77WA3l;WJ-g<D83zNG?}m8ZkQ3}-pS^3y;4_xn{&
zs~qaGsVu9~vMa#xB5U)eI<G48S$RHtLczcT4|eDP4&tuSX%oGP-b8Prhk}6z9t>U@
zI5>#QMk(s9R4?+jDjL3BRPY)%`A9aBjb!*rW_^=7pXe;nc@zZ)OL*`@GZd)YZFC0P
zE$qc_ZFjI_Jd8gyL+GZYyTY$Zep3ujrQxcGyHY$AiFsn4nP=vOys+38i$bX=)W(7b
SCp=_5RP>`_57qadmiPyko)xYD

diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox
index 5197509dab83648ae26ab2ffcc7d542c91025026..16c3d93c65dae3949c1bb319b6f34b57a7d53454 100644
GIT binary patch
literal 1880
zcmeH`J!@1^5Qfj0nR_?M-h0=?1tp0fM6wo<h#)FKFhNOzU!eGv*cgAps+AyEC<>-f
z5rez1U}5J^NF|Y^SXkCSu!WsPT1jzz&K4IjSczRO%+A+2Gw-}}_U6^whu=BpF3&Dr
zLAmoK=dLd<T}Xn%7a;@42y*+*(qdIH_`V>bt|jIhVrbQEQNa#6#IV(RqS206kYL9>
zvAE|;X~UJWhL4h_kCUb=rA=R|tU1KTK@%tMu)Qbm(IJM`IO}*xI~pTV+L5^OU2K@z
zNVIQTBDA1oxaTd|aNJkn9`!WJIxecLiIm$42Jflm(~fswari<WTddM@E~PIxJvdyb
z0S>TwY;j-&y9RBcUQ+keRq#0@Z&_XY=fZjNaawm0>R^ZZ^io8klyjjUc_S8PHO>iG
zEbE9*T8_Trv$_apL(G!8_+Td+B3W0g-1P<zzVbuCqRb;w`QU>cFj=|n!u(;@{tWbs
z$oDw`j}5iO26tQp2XL!!D>kq#R@(9KB~jK@c#$|^$CZ|{2SGISjLL0Kea{{|`;eHq
z!~SAsgKvRj4Lre{g#AWgX7FoiN0c5qh#qRIvJYj)N)0V{Rg(=>dMdo4ox+JytDjG~
zpVghhRsT-1;koaz4bBY?jX90Hu?wTW(ci#q?9|w)!LL!z;M~Au;5FW$u?u70#;%N>
z#x4wAEJm2e*q^augF6fT;Mm~UnAw=`+Wg$Cv+(cee>uN<vd6)Hc?0tc^F`f>+C*MG
zP%ZrN+IYUcwO;sdns4)GtIrF6dF5_l|LYt5G&%X#TB{>7`TNlmyYh`g)4O619zDsY
z<8nWK<JQWq{GT{~etuk>`S$95{`Kin;eTA2%NHic3P0REQafJwqhq!F+}x$YpE`D`
tu*2E22dnwRi>Hg&y_u=P4*7-2@qBZ0s~<bFe<XkL@^!v^^62kp+%MfvxCH<J

literal 1456
zcmeH{OG{f}5Qb+?;yJm;loX;aqQz{?fs}-_B@~jhYNL`GFR6M`8W9yt0|rc?x+pG0
z!3r*_LPJYHw6tzQ!M4y%yXvM3yYUxv*FW)gzVtVA=LZk(%zI|O%Ph{L@!8%ZBFbk+
z9*WSL4x*_MYsjM#SvJ8bToY#JtdS~9Aj=Y1GeS(B5IZQU85CuMOlqqhWnDMf=;&iz
zFzh#27Yth;vm?a1sG*4`uqVg{_p#;)u-zMAn_w8yZ<wq}%-$fAH^hcVJdeq`H=qe*
zs5+rTsaw9eO-<zvmHVYmU|*0mUx0PBzhA!j0-B+6huqB}_w~s>;_1p$IK_8HNyQz4
zU9c(NCB931bsmYzTXixur8akfHG$o7Pj`qlhn(q>+!bVYisur~DSHJ(1@eWM{Zi8z
zWSc^He(^d(Y*Tg8Z&S!@?P|Wx(By-AS+cjsPTk$z2#3RnL?Rd%7(gr*Lo%5}DwRSy
zoo;J99>@6jIEuw0EXzW<T*l(!A}W<iyQf~SV`F2ZUAwilh27m<?C<YG#f?S-&1MrP
zCnq>NJ4370!uk0*GQEV+2%#7y%-<wbl7wd|!e)lBJ484fB{U0!vm)V>MaaaX7`_!l
zK9#^!`ZneU?_xfe!E$~O)yW*zX7X4sO<;4ri0!30>{XuN)#?IX*O&2jql)9rHN4wi
z$G1bm<tgFMX99i*Kd%E9QQ$Iz{^5R@(<TxN38ZQ%WM5>F+smQQC}8IO43=6;So^Yu
z@cl7FCM=lc6~v!D$DQ>Zq<4-mba0BX<8xRazGCI$cQoZKmvVnp-T&Cjpyc<X-qnTQ
sr4qVh6G%Kh#_GW@^b~rKY$j2=sG&J6eKqNODScP#Y6Aah0_qR&7s?V(1ONa4

diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-1.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-1.vox
index de4abf0568075915e15f208c6b666f82400bcc6e..c4fd376839597a969105d14d901e645cc05ec9e3 100644
GIT binary patch
delta 339
zcmW-d%Z<b!5JbD${C^`P4&-1`*z-hTr!vw+;9NGrE%s2*^=P2r$xnWMKK3<X!i31F
zkQ0z4|FgTG?gs1)wHILM4gGP$mJU70luYTv0C2;V0aH6H1%E>Q1;^Ugflwz<$jXA&
zu9Tqm4>;i18!{L3((PsY7aJ+xCR`g(@Gypz))kEb!U6&VHy%W$n{7q%c*?F1%20Om
zM4rg^eZrZKRe3Mnh0Ps~@|j8VgiZ8mz$gAr9I%m|@`YjeT2B_@gy+vW&;H*pn)w5~
CS`?}P

delta 339
zcmW-d%Z<b!5Jag4)BHzB9LT|>u;+=wPGzKtz`1OKTkN5r>(M~Llb`(jeC%t&g^6HJ
zQFB7gGXJx`;Qb9fZusMZI(kQMZ`jh|Et!xBeHc*OkTT$Ehow|cc)cL3Q3p(&&_Y%g
zeC<LRt^ETIIQE9j#k^$uu>FgT6xxKe0S_L=u%UI)#sFbK0|Pf6MCLc!isbP$yFMsK
z+07GqBH#BJ&U~yl?<KpixkD&qCe0Hz(We0<{!SdQk)A?f7`_%{CQg7qC(8ccFPi%U
DQd1Qy

diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-2.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-2.vox
index 117a39f70105b4e4da1e91c4fdbed9a30abfce75..097040386d877809a2ef6d1f6f5c7a6a90991931 100644
GIT binary patch
delta 355
zcmW-b%W=an5JQROS0ZJH86DJv)Pn2q)m9^JA(I;1K^n}X4;T>G1-S3}u0OYz)x%jk
z<lJs@yW|e{;k3)rLy8Ysd`jUd3#a5yS?e;7XLxqn$V;bFBj37xIFrxx;@QF+xXK@u
zo!T92{QZ(u%4Qa33=S|380^O}6MAA+U~xz}6sE4yHbsueZB>F(M$?l(uB%Gj<mawf
z@W%eUDWTJX2mHuRWXpY(AE9McE}QbaDxk}<sZ5ko99Z^W=nL~JMZ5!uAYCcBPznbS
Md3!kj{pvgX1FK&a0{{R3

delta 355
zcmW-b!F9th3_}G<qGU@>>OLR5L%c%g=r!>oS)s2pWP>i)uN?3ofCR)>d$pghr?(?`
zKUBlbO1P<nBfQyfa=)wOyF5Qs(nFq3m3YegDvx-EXQz#P(HTl7-&cEcAz$dl^MyI6
zjXxSYZ4I#T_fy^|n^~AKIKVkza304@=!sc{#Ub@jnpTCrD{_STCWEb@=`o<TDYRXA
zUKK0e*q?V9+7>*JM|L7xzc=L(S~jWf(!435!?G((lv12n&L8Lt^D9NX6NtdBlw2r<
N6NtPstiNA<rhi}r7FPfO

diff --git a/assets/voxygen/voxel/weapon/axe_1h/stone-0.vox b/assets/voxygen/voxel/weapon/axe_1h/stone-0.vox
index 7e904097b543d730c2e206106b6acb766b19b86c..97173070933ab6e709e4a4a1597b87d78625e05b 100644
GIT binary patch
delta 424
zcmW-d+jWF63`8~ZgI#RQ7LXs@M+$*M0q%kp(o1?t1zSii`*F`mvTTj~F7NX5eR<yG
zk1nN6dJre#*yWKtpaFFhB+k`k)?G&3HUoF#ocPvo*Y7tc`X}^B{_L9OQ<}+V>J5e1
z_DiV^<#s5ohin<HWfvH@FGEfY3J@VdUJgymDXY7y4yn>#hkM-x=F|dlgao<LUolV^
zT)JXm#@dzF>r^7i<xs|9nh(W!*R-DU6^AQ>F&GMF8p9fogBruAsSHC+ykYcN8O~tG
rtf3Z`VVJPUViAKM<vyD`CM<q&0f)|3mg=y3JAd(IFTVNrPc8lfWuPcA

delta 424
zcmW-d%XPyr3<R;@&lV}l1>|D(kwT=W0@#IHNH6In6}XU$e3-WY2oejv>%0DZzfyiG
z-G*{{D&L3`aU4pKJfHz}6tXziP_g0JsN2)PlW|UbX}s#!n}z;@-pTJnww%ff`9i&;
z5c>X-_bK&5z8xy-^t|o@15fKzA_heW;Gp%8t*1)cJ-4ac=x@_g+Xa@WMdAPsYV<b@
zR0h|fP?@m}X?vY=64gV(p)ZHRvdgwpX~W^hU<}5Jna;4z<B&VUsO35hwagoZzEY<%
s*fDFU#dR7cEU;L>;77U7=8g#qUtGYUvz2+9c5Rm)eA$C<{{2&r|0CBZ)&Kwi

diff --git a/assets/voxygen/voxel/weapon/axe_1h/stone-1.vox b/assets/voxygen/voxel/weapon/axe_1h/stone-1.vox
index 356392e80c77cad9adf716e6d53e84080938703d..771b608cab74ddce5b5bb745c6520c78d735ea5f 100644
GIT binary patch
delta 311
zcmWlU%W=an5JUH^NJ{*v2l1L3a*K<gMrV(@a0~7wt+{|82Mn+v2rfV6Q{LY%PXpfu
z#0P8#{?FkD7g!#+fNK^&Sq{vGV+Vo>?$Uy}4HjvV=2e}7XU%z#whM~<GK@OS>vZb<
zatW4t6Sj$oV?GIG63a;{7pY#vdJ<RpSvlpssxV(zQ%Sp_O%uB}ok_dAMLLLMQ%_UJ
qc0$#{{l<i)E8o9V&~>5f!LC48ali0>5ahAz2m3)<wf*mtJ^TR^Q5?ts

delta 311
zcmWkp%XI`H46}^Q@SPsux;5mMErNNR^QMb!A-$xvEg;&1o@60}d6#$j{d!rPur%TR
zgr@=fuzkY_4^J53%9(I5i-9OpT?Pmt)TjwDnFt?0az5BeSmvB3ByD)1U#56nVs)w4
z`=t~J^@gT}NJhS(WdY@alntpHs26b1&&)Azm4$gDHkPy--j<Nn8qcVWUZ7So8haW$
q(gm+vxZj9G=*;&A3py`!KG+%PEbbfD2b7+l{J}XO2e<$G!D;_sX&oE@

diff --git a/assets/voxygen/voxel/weapon/axe_1h/wood-0.vox b/assets/voxygen/voxel/weapon/axe_1h/wood-0.vox
index f8328492b264dd4b799717706c93e58383b5aee9..7a7f4a0c290fbb95ac7b50a0071e82b5719a820e 100644
GIT binary patch
delta 395
zcmWlV+jWF63<Z598~mmQ%u-4^NguS3UeZA-*pf2)F=z0VtYh(R@AmWcSUP2S$<va>
zQy#Hn$A%4yx=tx9vp|111DNv-!NXGg<QwOme(-|9C$1P`y%l$ukfGg=Qof`{6OE}}
zO5>6b&fo__5As6Z$Ul9c&SM6(&d|c3am)Em^HS`$QfKC*hs9KI<+1rR7Bw%pU^1%@
zg~nD5cY;n~;DINeD|lYPGFuj0aK+$_ztC{!+{p(Xm^+_kw(`<ep+ScM^QCZnOB?fd
J?*9I1#(#f27gYcN

delta 395
zcmWlV+mXZ|3<MbjHgCrOUWam-TpmtgbJ+|of(_}~A6;!mLWTUT-}?T!L!1g}$>LH7
zQx>pc!ybDq>Y9pf`QYex(}6d>!I@j~Prh;9=?BXgY~X^ymrH(!0SW4LOX*asG|{MX
zO8t~|&R_>a5AsZ2$)7%mjmLCqjiH%A{gUymamu$#YRnw;uvpBv@Ypmxi+amAW3o_g
z3YD!YZUl`&#~lwmmb0{6NNkyL#sz~_{zAo#b0hD#W9~f5xcrhUP@zGG@zQquDsIf*
Jx%>Ik2>+q#7i|Cl

diff --git a/assets/voxygen/voxel/weapon/axe_1h/wood-1.vox b/assets/voxygen/voxel/weapon/axe_1h/wood-1.vox
index 5ba57fbea8ffc9edbebdd7c392267dab64bf7661..ddb411ac7a475092e5607db48effa17409b55253 100644
GIT binary patch
delta 319
zcmW+y$&mvg5NnCc!xaKBF9Pt}DLDnFu(@n{eyrF>mxTI|if{hrpV!A<8$o3@2pfPc
z`^UJzIDs(0AoM~nbPF+W(1}wTCqljfEO=omo3sU_37*ou^L927%Z*Sbe9^lMgg!oq
zUCWomu3=$n8?oK+Ra(<flTlU}sGnt46`<bWL;7PO)eYBV*cGNvLy@5jtSq7oiW^T~
p+R<4jRR-NheNG-?5+uT!md<d~fH)O^3gFaBUB7e<*zX(N{{f4+5_kXr

delta 319
zcmW+y$(2JP46_V2`D`Ts|3m>fr=_%z7N(bJFNYCx@RN`i>G93q{PX&RYeQK{hPn*6
zEcr)YFrRQ6Fe64{B!&g#4GZK-O(!(pa4ZC(l&vNUo+j)R@11v)36vXJCPLx63}_!8
zpmX`6*f~s;wt;pdRBDYwjYgSaz<#D#Wq^9a9@HNTQa56wVP}{=#S0B-kjhdoL&?QX
rpW4x_PGyPnzSrl}LlOmwNR3NpxN(5o7{C}HvL~ItbPc56H+uX7+S3ye

diff --git a/assets/voxygen/voxel/weapon/hammer_1h/bloodsteel-1.vox b/assets/voxygen/voxel/weapon/hammer_1h/bloodsteel-1.vox
index 70fbf0fc3490e9762f05b0905336738f1396e3fc..3eea1d567983f58638b10f92e927617c338eed81 100644
GIT binary patch
delta 468
zcmW-c+gZgR5C+*BBnA>8(QbUViDN5iA-&k3gAel!{IKlu)TcgQcTO*f^wLO|VR6>Z
zdfH|#Kk9-NL)fRfVaE{hp&mG6h;peHykLkGL%iY1J8STY>vgMdLt`6O+EB2ib&aE2
zsjzn`>=({5CQ~x?y(jL<+D@B98}9p%fO&V_Pbqas*@rF_s0r#b^_h$sE%aUMeG1K-
zL-7L`#9Ozh!-D2m7*5ME)Q=&viC6O06GJ#dB<?wxQm1nOoTzi`)0`*gy?=JzrAHjp
o%{RVjMq~4>i!rJ3YY^iXU?9fCVAD!2Ot1VfvrhH2Y567cKS@3py8r+H

delta 468
zcmW-d!F7Z%3<a$(3D{sDHYDBTo+dV}(8BhT1~blK-Wb`kzIoMGeSO_to)+b)D3@bP
z*2#K!8g=_o8Wx7|Po?9)5c#1@JYk6WQqFk65DyITh6nGgAuF!etz5fe?XIm0+_t7T
znybRzOne)Aj;V>7a&LvRR<_dzvGvHkTfjJ5_S00mY45TM^aTA*zf+?}Vs5GTX$%WC
zEe{|_Zq1{14~AnSoOE>M(QORLN_}gE5J8B-xu7QcGy>p4U*H&Kza;nlvvV&q;-GKb
p@y##>d#=qUl1{uDY~mH*U=xYKhiB>w>1ST(tRMCC;pLYf6MwV?7gqoP

diff --git a/assets/voxygen/voxel/weapon/hammer_1h/iron-0.vox b/assets/voxygen/voxel/weapon/hammer_1h/iron-0.vox
index d4fc31bf8bb37dbdb84021dd50bb55a4b714a85b..7006e849d9a5ab29d8e836aec32d27b0b45c9e0b 100644
GIT binary patch
delta 738
zcmWlV%W>o|3`EiRP~4ToF;#QhST=~UtDKHfZ~)H23HtE>fq>AjL4J?#@%8_1_Eg!^
zi6E4miC8&SUoTI+d-;c_zr5nzGd{eMOjOY?a$~O1-_UQ&buv+Z$VB}muXy83<Uu~3
zx984bf5vuRPDDRvH1c-L*v8a$PVf9{WO`07siPkRXZlgpjk+<<KcUxl5aV*@oH;M_
z4SgF|_5;S4(f6CrV`iQI5<v1Zash!A18oQTxQwNQNQewW0Tc7W(EE<TV>&u74BL*$
z<H|g*gp-RCFcW6NFPOEM$FzQrO90equ!OOpty=&SVgVFDH4K7R$aNDI4i-*sL7lbF
za9$uV2+R_LgvSB~!&pEpAm+saVgbQ$XW=_|5=4$5X(W)O&IBr;4%FE?r~@d*#!U=k
zTOc$-BQ(NT30Qy~E;<ihCs^27OmG|q8pGFOT%Wc?7zu$82!Swi<F*1KmUEsIVR8;z
Vpao%;T8^P%w0anbv-C4!<S*w(B7Fb=

delta 738
zcmWlV(Q(``3`DUDkh(+?&(z#sYDp2cXWWijZ~^Wj4d(F!0s&#)g8Ugj<NNRJcq!v$
zA_)~|B3Ev!uXmR|oc?tA-I*V*{B#zX$VR`BJ9C}>hJIu2K_>DSnaJPd6>pr0I>^WC
zcI_PYSL(b>WSlci)-h9KO6PR&&t!V0SJW8?!I^$0wW-ZK|AbyTh;f-YGv`Ea^d48m
z0b|UJ{pRzWmFJ%VQ2fkVKw!y$cc9NJSW1Y5C@>T-F)s`qI|k2bbWRMtWAePJ&a2?m
z;xw2Av*0JpT+Cxe+~X1e1r3%6HjH%(U_vZ_0w`n9c!gRwVd2KY#Vx2S_nDm+Xc#oi
z3WI{j0s$jfKrA5U#R6gh!Ek5cyYVE5jG$-~kfN>vx&iG#J6kvE1{CAqCV_D*5E`Ko
z8eyygyaDcT(Yf(DjfFdlZE!jaG=Xolaec)SVI%}XAOyn54{o~w*;uagqzH?1J{D*}
Un59<7@PX0lVIa=h{*4^<A9H&l)c^nh

diff --git a/assets/voxygen/voxel/weapon/hammer_1h/steel-0.vox b/assets/voxygen/voxel/weapon/hammer_1h/steel-0.vox
index 875f307e10f691b19182c78d88e68ddd4b201fb6..16c3d93c65dae3949c1bb319b6f34b57a7d53454 100644
GIT binary patch
literal 1880
zcmeH`J!@1^5Qfj0nR_?M-h0=?1tp0fM6wo<h#)FKFhNOzU!eGv*cgAps+AyEC<>-f
z5rez1U}5J^NF|Y^SXkCSu!WsPT1jzz&K4IjSczRO%+A+2Gw-}}_U6^whu=BpF3&Dr
zLAmoK=dLd<T}Xn%7a;@42y*+*(qdIH_`V>bt|jIhVrbQEQNa#6#IV(RqS206kYL9>
zvAE|;X~UJWhL4h_kCUb=rA=R|tU1KTK@%tMu)Qbm(IJM`IO}*xI~pTV+L5^OU2K@z
zNVIQTBDA1oxaTd|aNJkn9`!WJIxecLiIm$42Jflm(~fswari<WTddM@E~PIxJvdyb
z0S>TwY;j-&y9RBcUQ+keRq#0@Z&_XY=fZjNaawm0>R^ZZ^io8klyjjUc_S8PHO>iG
zEbE9*T8_Trv$_apL(G!8_+Td+B3W0g-1P<zzVbuCqRb;w`QU>cFj=|n!u(;@{tWbs
z$oDw`j}5iO26tQp2XL!!D>kq#R@(9KB~jK@c#$|^$CZ|{2SGISjLL0Kea{{|`;eHq
z!~SAsgKvRj4Lre{g#AWgX7FoiN0c5qh#qRIvJYj)N)0V{Rg(=>dMdo4ox+JytDjG~
zpVghhRsT-1;koaz4bBY?jX90Hu?wTW(ci#q?9|w)!LL!z;M~Au;5FW$u?u70#;%N>
z#x4wAEJm2e*q^augF6fT;Mm~UnAw=`+Wg$Cv+(cee>uN<vd6)Hc?0tc^F`f>+C*MG
zP%ZrN+IYUcwO;sdns4)GtIrF6dF5_l|LYt5G&%X#TB{>7`TNlmyYh`g)4O619zDsY
z<8nWK<JQWq{GT{~etuk>`S$95{`Kin;eTA2%NHic3P0REQafJwqhq!F+}x$YpE`D`
tu*2E22dnwRi>Hg&y_u=P4*7-2@qBZ0s~<bFe<XkL@^!v^^62kp+%MfvxCH<J

literal 1880
zcmeH`J!@4#5QcYWW_Q(l?!6iVibfD3iG`vFq9TF@B?*3k;#agW{)DSmf?%O2XrUqo
z&xL@6oj<`!BBlt0_y<zhS)`Q|$7fG*5QCN2<-l`iXLokyojK=Ty?A~18|U2lQ<E1k
z?sRhQ^5oQ+B0D@AAiw}zzcDpAs4RFsgNmCq@ugu^bVWs2XPft=RIz21uxd4V9hVJ~
zw##IlGHB6{kgVNL+MP+(or$$&PdjDA_ndod%9gX}JBy<2#pv6M0itxjn`|NXmgOLu
zR{~bBf;BDXycK=%-1pSuZXlOPYa#h|>9w=y$>pf!&?NW{T_)XGhbC{t;JZ2pTColt
zPP#K8ugPn5zM>b<=4-#`n{;~4=eQh?W@-1N&eNT7LOyAij{1Rphc3ffuEiZAPFP#k
zCdI5!$CFQT4Ejxqp0C%%oJeQMq_t%9;HCS+sPCDHNcWvlH)K7&wIF$p_1tm~%z<;^
zJmquQv|zGvHLxG4Dcm>Nuws%{1Ad@}a5thwnM*=rqA$zyXO5<=g^=Gz2Az?d5&eli
z6MY8aV|^#jEcaaWl-x=UrLIz6(Wu;0awz?%FXoh*nq$$RXjASgHI?3#I?7y>zLa;Y
zXi)lbj#+_#f<b@?37q4dI^HuV7zBurICHL3dJs@B2oNEGbIcJ06bu4HNN{O<?3A<m
z?~#A1b=GI_zrKO-iSg$98Xg_42Dc41{?O=9^=bZ7<G<>^t{%U5()c&0Z#C<G)%Rg!
z<gdA23>>fC?l`pOyxetQ&EDPn532*QRqtQ9HofNjPn|zMK4@aTJ-<_Zc{J7d@2AJA
ziIJU+pYQG&J=pj=c8*pj$IdnWzWqm<b&fr;eXzQB_Gq(r`}n?QozEvmhN`b$=j**=
STL-GA&t6tH5AXdw#{B}m0JsGJ

diff --git a/assets/voxygen/voxel/weapon/hammer_1h/stone-0.vox b/assets/voxygen/voxel/weapon/hammer_1h/stone-0.vox
index 216ddfb97b1f0029655911266e5ab6b84a493956..7ef0edbc94419f52a5007829390d3f0bc37aa8eb 100644
GIT binary patch
delta 581
zcmW-eJ9dRI3`8xBOu!$?>?K7OL=oeY4bZ+ad&vfKo#LL6#%7S<)nEPR^NDns(&Zp9
zrv@#xMIZ9Ux#2g?soglQXvcRHBoq`VD5Iba1-+r5^Y+|^`O59%amUck;m!aRRw%?V
zTn9ebF$_=Q<<armv{mOmJ=!I!!>rwIZ8)_@`LgAykX5Eob80WQP_x3_GGyhsJ<h4<
z)4){;W(dNhbGp;BsjWKd3_nH!1tAc4Y2kGQB%TjQgvUb1OkgaawM1qZNO8;n<!7Ik
z_vxuYnQr^-iQYB_0N-vy4V8BKogS73LxN=#JXiXPU)e6W1AHNY{V&N9`JA?~C}`=&
hhPgGS=}g|43{b6$ka##&h=P|Bh#J2{{`>9k@dqxFNpS!G

delta 581
zcmW-eJ9dRI3`8xBOu!$?>?K7OL=oeY4bZ+ad&vfKo#LL6#%7S<)nEPR^YL_<(&Zqq
zpaw0?i#`;MbHi_(Q-^V0(T?vZNGK>!P)0!;3VK69=k3;p#mepD@xai|;m!aRRw(!}
zTn9enV;G*q%e~{bX{)wA-P@&HhvjyAZo{eF%a<)rg{(4#T2M#1g<3A$Ekn6HxBEHe
zeHyqb!3;r|bWRU?HnmlIoe{@KASVO@FD;^ufW-3wiSStHm<fypw3aZ2f#k;wkUje}
z+ox|0%JjV7zR~B60U);9P(!7iey4|}&X8b+f?K7p_?7K~JHQtb*#D9&Vdu2OqM)T8
h2{SdO=}g|43{b6$ka##&h=P|Bh#J2{@%!!X@du|=NsRyi

diff --git a/assets/voxygen/voxel/weapon/hammer_1h/stone-1.vox b/assets/voxygen/voxel/weapon/hammer_1h/stone-1.vox
index 3debf7736f206e452be71db2596a70f369017bcc..5625a48d948c1572b76a7913a9b37e4ba764a88c 100644
GIT binary patch
delta 565
zcmW-e!F9wi2t*MKvJ=V9lUzlPd)NZfOxkb@=_SqWF<&`+17n#1`PE<j=j+aoOMcGq
zb2uo@5phlj30>%*Bv0~x{OR(CXFOc-^b`>?(UVv&S4H25kUJ6bjR^TpguTtXY;F41
zMu62e3V3ZZhyu$tOQL1Ff~ZxCTGZm(px*m%h`mqS`YanY1PH96RWxI{!V+MKmi->3
zoU?EP#`dN@%7R-kDBM5^8m!3X24z1mJ1{#iJ20b$08v{#SYkoXis81t<6N$D^r7~h
zcjAn0#6sd6hy&AOI+F%yO`PN)a0UyII$M*2J2_?n0>>mk%M616iJtTh5V(_rui-v<
Zh)KQLRnqu3#x;|R9Ad>-`tP?-{Q+nf8d?AV

delta 565
zcmW-e!F7Z%3`8Z(7&gI>hp8gRJ!}DKCT(mB=_SqWG2c0SBn?I*nOA@HpRcDrE-%N>
za-0Qj$EkLV0vp}vV3CXbpL&$*Uedj+N6AD`LvO_8Dlh0O5p*Mh-iV-gBE&YHncJw`
zPC?XmCRA-hL_=sBDKu@Dh@Q2nO>Mqy)X~oZMIVuUWKx5`5QSD~H<nvj0zzo&&okF!
zBsUOjAMR&PxP^e^2C~s$Mm7(~*fHBN+cDcQqXvPgqjr{<(6cbi`5osp&(Vjvf_LVO
zpNK2T!hyD9x{qQ~f#<{`2SYKK!0v2K4z-YDCNLBx0#7px1U5bCEilwV4mF4S<Y6YQ
WiYpcTo8X$sO%9r|P5t+~hW`M3<Qaqj

diff --git a/assets/voxygen/voxel/weapon/hammer_1h/wood-0.vox b/assets/voxygen/voxel/weapon/hammer_1h/wood-0.vox
index 20882c3385f9b044b797d97e99687a6223bcff79..7d255c548e0f1fd802aac969a6a0ce596bfcae57 100644
GIT binary patch
delta 734
zcmWlX%aPtN41<3H^h>hkgQRk{iPVspY!_}J$L%8x=JNpqQ<O*o^iTU~f4?4`BYjS*
z^~gG%Wu)5hr_9vWGtcg5J-rXd-Bas~xJJYYDk$I>k!406V4q=fCg;+_<ait2z)HMO
zlXIP*_9s-P-vZ*XcAAn*8fYV48EEa!x5zazD+7>A8t9_HP3~>>a-A91Oas-CaWeFZ
zn4<>*9NbUX2t}+v2Y2hkv<(N2DcyfEDi`Ze-oyE-Z&Oi0p+W14lkcN1s&f(FsF9W-
zlu0YR!5h58JAA+gT;Kv%82E%iJbO<p)Mx#zyrz<(D3Px&EESdtrAmsSP7I}_Q7+@d
z5PsjHNZE*488$0!&hBpoYh+D|g&HVc-jyOu_qVB;(Wak#t=q8$_1K(V0DGpWV;f#*
z!Z1du1yE`Ml$!s;D7D`A2MkbZR%nzOrADbynts>3vkvaE-b@BS)GsT!luVphl1yh}
h6Pwt>4$cBcM64kN_I=264%;Fx8t@iZl>drb{s+8HA6@_e

delta 734
zcmWlX%aPtN41<3H^h>hkgQRk{iPVspY!_}J$L%8x=JNpqQ<O*o^iTU~f4?4|BXv%@
z^@uthWu)8iQf7MV8E1F4p4x}=?&)<#UL*1Z6%=rch%zG%u+I=VkyGg*a=Z;~U?pCt
z$+=HZ`x7qHZvpezJ55Oj4ZIPr477H~TjUxUl>x{F4SZ4HCigabxz5aMrhx0nJQ;dL
z%+Uh@PVNURgd*0<!QJ{WZNq_M%J-kl%EdYq_i()G+f-IiXwbUy<ooE0>s-t?YUE`I
zW%3Gd@CNVj4j=FV7r4L`20CGo&)yRYwXDAt*HlmxCDPS}rNUC7R6#M+iJ=rUie-El
z!tYxYDH<^=!)E2p+5N3#jjTzzPy@xEcclpP{cUPyw&^Ec>vn8GJvOHnz@91U+=f3i
zVHl&-1}L=wO3nXal-lq60|qEHD>O=tQlr!;O}%U0SqFDnZw3P(>X)5dN+wP$Nv1Qg
hiB0Tb1!sXHBG!-t`#$73hb@s84S0(yihso|{{z5sA4&iK

diff --git a/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox
index 3178f49d12ba17acd792c7c684c4c8340a007040..400c3ef067e9fe774ded9301f6e514aefbe426e6 100644
GIT binary patch
delta 197
zcmWm6u?@mN5Cp)#y**>hlL09aq6HEo(F|=6{C|#Vg%;cpu_eS3jBd3j?L5rG^LC;&
zI7Wn51cVjn3MkGI7V4(^af|rC^B3UNIK9pfL^T&(r?@o};J>(A;CneNNYT)Vr-oP+
kM6dOA0fqwGNEY?h7mH{viQ<B2RHibO&GZ*A#`ncCe=++YR{#J2

delta 197
zcmWm6u?@mN5Cp)#y**>hlL09aq6HEo(F|=6{C|#Vg%;cpu_eS3jBd3j?L5rG^LBzY
zI7XOP7=#t<3LwrA5$dM<am)C?^B3gRFul$XMl}~*hqyHp@V~fQ;CneN=%OKsrv_UU
kSg-YU0f&OvNEY?c7qe(C3F5+NRHibOE%X;4#`ncCe=BJqRR910

diff --git a/assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox b/assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox
index d1e22a0aceac13e090f6abc9106132497882294e..eec78d2f32ba7835398c1f349e63379df42eafb7 100644
GIT binary patch
delta 197
zcmW-Z!4bkR3<SNBOo)Lb&`r!xj_tIN7at0s6`JFX%;QFym2O|@mEMo1#vMI25uai!
zIy6Kx#65KOzjH^!E`1j=@wB0bhFV5~vqM4kjvOm?D%iQAlCevrJFI8)PO8L<`v?CY
o3-R1sAS;#{HWlRR<=MqcfyHIZ23Ifk%r3ia#Azcq51;R3KU;wqWdHyG

delta 197
zcmW-Zxe>!K3<S9V_5bch(zqNxEhuuL0^Ew5b8OJT4KNGb-u>ObpD(E{q)nnW)$d4?
zP(AR~<qG@XIT3eB*_8t~WTZ}rKTv0^4v3y;8(|1AMnn#nBE>;TXPrLcCi6G;-v!*5
lOdvb-3Fd%qR$ffJ2K;KWHRCrcmMkWFWZayoj8~uU?0-*07)Ag9

diff --git a/assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox b/assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox
index c87ce5f8f7bfdd3607cb8369cdeba0f4c542e666..60c15028231ce7ff0731d9a1f1e5aa74fecd9c6c 100644
GIT binary patch
delta 222
zcmW-b%MpVx5JN4k&BuVL2beUG9>BC<E@>eJ&_x<V&SB?yv|7n`yyN%vv2ek<9rO#(
zWzbewC_pHV;i5GK<O0LSzn9wgJFL<86`}5%3|HA5FehTAZb7|$dw{)k+h9>_)m1fh
w_)y-Y4$)>;>19N(PsHqMu~#4}H5@W*P{1UP3K->^PH@(w6E;gv(tZiaKk8i?qyPW_

delta 222
zcmW-b*%5;<5JN5Pn!{Z60Fx%t1DF=fPg+O;=^_nA&d1L4Xtk0*>66}%7vl|f2h3M^
zmtnSnvA|;q7H_gCFs>kW{=L+`Kfp%g8$#VT8L_fE!60IzZee<(Jz>3c+rcEZ>Z+PL
x5X+OMLvM4agpA(n6DfyU3<Y|n#)b?I3Yf%E0i%4=1zR-p1uoKOY2O*M{{ZV@8l?aL

diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-0.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-0.vox
index 1d0ebb98ea220146befab81580fba993d691f596..e20808b2ce070886e41e51970e06cf6ae28db843 100644
GIT binary patch
delta 214
zcmW-b%MpV>3`1A)e)vPm0VWNkqs=8P<Ul7WZv#Z(ppoav9(ilF=6!!zc*3d!^fNdW
z&=y$8K*)~D*zX``7*<}pR9+vjc*6Vwj>_W>o8*<;We^Lm+y6X>*W$Lq8r`K6Ok(Qr
uAwOWF;2`x<C$)N}(LyVAI}pF{QS4R_RODg-Qh`qgEoL%iCwKfr4E_fKk}7Wi

delta 214
zcmW-b%MpV>3`1A)e)vPm0VWNkqs=8P<Ul7WZv#Z(ppoav9(ilF=6!!LJi+RK`5879
zm@Qz)@F6=>X8jK13}WTAOXc+e#uM}lY*Ze1aFSPYmtk0V-Tvo6ycV|=Y;>1SSQ1kQ
uLVkdw;2`x<C$)N}(LyVAJAC{CQS4UWR1{)?PX$N^88a<rCwKOV82k?d)+%rS

diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-1.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-1.vox
index 744a4236adcde0d39c8a8559b524a8035f46e014..022e0a2ab54f4012edd1689519ebe10ad1ad01a4 100644
GIT binary patch
delta 214
zcmWlT$qmCW3<R|#<wHK@RAU=yARYOY7V>Z>DUVQ))nl<DH5l+tcltcv8ZT()u%$q@
z0-KrDfp`U}f4KmRWtYlgbHu@+4PytCvor;|{vaK>ff?y~&^fU)_x%snlTQV4BHywX
udPaXC&IA*evO`-!J!L|%o{(@sz&BfQq8=c6Kx~(KoYk2L*%7`CX8QxpEG$L<

delta 214
zcmWlT%MF7t5JWw@HemBLsRmFQNJpH~LJoA2@>WKS52Nv}pPu$gSNgrb5>7~Gz+9kf
z0VZZK_;5O{f4RUj$R?HbtHJdKX&AplIBQcN%MI<w^~^xmi_VdqxsNvx$)^H0l5g2F
tJ%fGVCW47e*&r>UNSRQq2h^QV@XZz+s0XO-P`^n%4s~WiHiUnJ$v?QhEFk~@

diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-3.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-3.vox
index cef7f59d9793d9e62825a4a46165d8281ab1d3c7..d9f33f1837ee43d7c09e4a837e6b5bdca9ee3738 100644
GIT binary patch
delta 114
zcmWm6y9t0m6hzUT_YoE}5j8auBTG=Q84Fpr0M|}z%G^v4#Ak50Fu~mZ_S@VE0+>c9
zM<^MIplpR0mJv|f($W^B7dU@GGC4_mKafVp#!6xs!5Ps1SUup{G!L8xWXD;`2f2L}
AfB*mh

delta 114
zcmWm6F$#k~6olcO_vQ%;rU`0mC8<1ufm|jB+3W#aZ{nrw?F2!5DL#IfVvcyk`7;O-
zR3<<(AdVTVeh{aeVCGx-_7B<)tuK)8AZ2-tv>eoVMVul92mT+M6WY4&L}dwK-JZMw
DwTl&a

diff --git a/assets/voxygen/voxel/weapon/sword_1h/steel-2.vox b/assets/voxygen/voxel/weapon/sword_1h/steel-2.vox
index e0af36a19de5b7043d68d044583bd1e024cbe2b8..2bbbde42572675d41862f8042fefb5bba0267f00 100644
GIT binary patch
delta 196
zcmW;F!3n}Z6a>)y^XG@K=uN$P5IgXiK)iUj2-^_W6ku$@7SdfHapJ;*;j_$)dCc$b
zOe=6S2=5UP_CWOl#o5rKAcn_ri)i7S8DMKMd`?e9NfiB{vWK`86JTxKP4K-OCM2~~
o;;Fcr-9;;=Y|6GShM4Xa#f0hx>je;I4d?lOyLO4`|GpRF52#)s*8l(j

delta 196
zcmW;F!3n}Z6a>(n`LjWS-qfoHu>-FO#EW-}unl2N0mc?=A>9R{6Bix~pJisO$NJTs
zh{9k)L{HGvQ`M8SP@~9&819FSa?4oHlv-eTA0Nsk(fmWs0SgouwX|+0#?JN=E4L(z
nRKm>><`p=@8OtIp`<`=w$=&4YOBrhq*YoXq>5|g_ea_Gioh~5D

diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs
index 7ebd7e0a43..0a4d6144a4 100644
--- a/voxygen/anim/src/character/alpha.rs
+++ b/voxygen/anim/src/character/alpha.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::StageSection,
+};
 use std::f32::consts::PI;
 
 pub struct AlphaAnimation;
@@ -11,6 +14,7 @@ impl Animation for AlphaAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         f32,
         f32,
         Option<StageSection>,
@@ -24,7 +28,7 @@ impl Animation for AlphaAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency,
+        (active_tool_kind, _second_tool_kind, hands, _velocity, _global_time, stage_section): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -38,30 +42,16 @@ impl Animation for AlphaAnimation {
             Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
             _ => (0.0, 0.0, 0.0),
         };
-
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
         next.torso.position = Vec3::new(0.0, 0.0, 0.1) * s_a.scaler;
         next.torso.orientation = Quaternion::rotation_z(0.0);
+
         match active_tool_kind {
             Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
                 next.main.orientation = Quaternion::rotation_x(0.0);
 
-                next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                next.control.position = Vec3::new(
-                    s_a.sc.0,
-                    s_a.sc.1 + move1 * -4.0 + move2 * 16.0 + move3 * -4.0,
-                    s_a.sc.2 + move1 * 1.0,
-                );
-                next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + move1 * -0.5)
-                    * Quaternion::rotation_y(s_a.sc.4 + move1 * -1.0 + move2 * -0.6 + move3 * 1.0)
-                    * Quaternion::rotation_z(s_a.sc.5 + move1 * -1.2 + move2 * 1.3);
-
                 next.chest.orientation =
                     Quaternion::rotation_z(move1 * 1.5 + (move2 * 1.75).sin() * -3.0 + move3 * 0.5);
 
@@ -75,15 +65,10 @@ impl Animation for AlphaAnimation {
                 next.control_l.orientation =
                     Quaternion::rotation_x(-1.4) * Quaternion::rotation_z(1.4);
             },
+
             Some(ToolKind::Axe) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
                 next.main.orientation = Quaternion::rotation_x(0.0);
-                next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
-                next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
 
                 next.head.position =
                     Vec3::new(0. + move2 * 2.0, s_a.head.0 + move2 * 2.0, s_a.head.1);
@@ -94,20 +79,6 @@ impl Animation for AlphaAnimation {
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                     _ => (0.0, 0.0, 0.0),
                 };
-                next.control.position = Vec3::new(
-                    s_a.ac.0 + move1 * -1.0 + move2 * -2.0 + move3 * 0.0,
-                    s_a.ac.1 + move1 * -3.0 + move2 * 3.0 + move3 * -3.5,
-                    s_a.ac.2 + move1 * 6.0 + move2 * -15.0 + move3 * -2.0,
-                );
-                next.control.orientation =
-                    Quaternion::rotation_x(s_a.ac.3 + move1 * 0.0 + move2 * -3.0 + move3 * 0.4)
-                        * Quaternion::rotation_y(
-                            s_a.ac.4 + move1 * -0.0 + move2 * -0.6 + move3 * 0.8,
-                        )
-                        * Quaternion::rotation_z(
-                            s_a.ac.5 + move1 * -2.0 + move2 * -1.0 + move3 * 2.5,
-                        );
-                next.control.scale = Vec3::one();
 
                 next.chest.orientation =
                     Quaternion::rotation_x(0.0 + move1 * 0.6 + move2 * -0.6 + move3 * 0.4)
@@ -116,6 +87,7 @@ impl Animation for AlphaAnimation {
                 next.head.orientation =
                     Quaternion::rotation_z(0.0 + move1 * -1.5 + move2 * 2.5 + move3 * -1.0);
             },
+
             Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
                 let (move1, move2, move3) = match stage_section {
                     Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
@@ -125,24 +97,7 @@ impl Animation for AlphaAnimation {
                 };
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
                 next.main.orientation = Quaternion::rotation_x(0.0);
-                next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + move2 * -7.0);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
-                next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
 
-                next.control.position = Vec3::new(
-                    s_a.hc.0 + (move1 * -13.0) * (1.0 - move3),
-                    s_a.hc.1 + (move2 * 5.0) * (1.0 - move3),
-                    s_a.hc.2,
-                );
-                next.control.orientation =
-                    Quaternion::rotation_x(s_a.hc.3 + (move1 * 1.5 + move2 * -2.5))
-                        * (1.0 - move3)
-                        * Quaternion::rotation_y(s_a.hc.4 + (move1 * 1.57))
-                        * (1.0 - move3)
-                        * Quaternion::rotation_z(s_a.hc.5 + (move2 * -0.5) * (1.0 - move3));
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
                 next.head.orientation =
                     Quaternion::rotation_x((move1 * 0.1 + move2 * 0.3) * (1.0 - move3))
@@ -162,6 +117,183 @@ impl Animation for AlphaAnimation {
             },
             _ => {},
         }
+
+        match hands {
+            (Some(Hands::Two), _) => match active_tool_kind {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.sc.0,
+                        s_a.sc.1 + move1 * -4.0 + move2 * 16.0 + move3 * -4.0,
+                        s_a.sc.2 + move1 * 1.0,
+                    );
+                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + move1 * -0.5)
+                        * Quaternion::rotation_y(
+                            s_a.sc.4 + move1 * -1.0 + move2 * -0.6 + move3 * 1.0,
+                        )
+                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -1.2 + move2 * 1.3);
+                },
+                Some(ToolKind::Axe) => {
+                    let (move1, move2, move3) = match stage_section {
+                        Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
+                        Some(StageSection::Swing) => (1.0, anim_time, 0.0),
+                        Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
+                        _ => (0.0, 0.0, 0.0),
+                    };
+                    next.control.position = Vec3::new(
+                        s_a.ac.0 + move1 * -1.0 + move2 * -2.0 + move3 * 0.0,
+                        s_a.ac.1 + move1 * -3.0 + move2 * 3.0 + move3 * -3.5,
+                        s_a.ac.2 + move1 * 6.0 + move2 * -15.0 + move3 * -2.0,
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.ac.3 + move1 * 0.0 + move2 * -3.0 + move3 * 0.4)
+                            * Quaternion::rotation_y(
+                                s_a.ac.4 + move1 * -0.0 + move2 * -0.6 + move3 * 0.8,
+                            )
+                            * Quaternion::rotation_z(
+                                s_a.ac.5 + move1 * -2.0 + move2 * -1.0 + move3 * 2.5,
+                            )
+                },
+                Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
+                    let (move1, move2, move3) = match stage_section {
+                        Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
+                        Some(StageSection::Swing) => (1.0, anim_time, 0.0),
+                        Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
+                        _ => (0.0, 0.0, 0.0),
+                    };
+                    next.hand_l.position =
+                        Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + move2 * -7.0);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
+                    next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.hc.0 + (move1 * -13.0) * (1.0 - move3),
+                        s_a.hc.1 + (move2 * 5.0) * (1.0 - move3),
+                        s_a.hc.2,
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.hc.3 + (move1 * 1.5 + move2 * -2.5))
+                            * (1.0 - move3)
+                            * Quaternion::rotation_y(s_a.hc.4 + (move1 * 1.57))
+                            * (1.0 - move3)
+                            * Quaternion::rotation_z(s_a.hc.5 + (move2 * -0.5) * (1.0 - move3));
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                match active_tool_kind {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
+                            * Quaternion::rotation_y(move1 * -1.2 + move2 * -1.5)
+                            * Quaternion::rotation_z(move2 * 1.5);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.control_l.position = Vec3::new(
+                            -7.0 + move2 * 5.0,
+                            8.0 + move1 * 3.0 + move2 * 7.0,
+                            2.0 + move1 * -6.0 + move2 * 10.0,
+                        );
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
+                            * Quaternion::rotation_y(move1 * -1.2 + move2 * -2.5)
+                            * Quaternion::rotation_z(move2 * 1.5);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Hammer)
+                    | Some(ToolKind::HammerSimple)
+                    | Some(ToolKind::Pick) => {
+                        next.control_l.position = Vec3::new(
+                            -7.0,
+                            8.0 + move1 * -4.0 + move2 * 4.0,
+                            2.0 + move1 * 16.0 + move2 * -19.0,
+                        );
+                        next.control_l.orientation =
+                            Quaternion::rotation_x(-0.3 + move1 * 1.3 + move2 * -2.3)
+                                * Quaternion::rotation_y(0.0)
+                                * Quaternion::rotation_z(0.0);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                match active_tool_kind {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.control_r.position = Vec3::new(7.0 + move2 * 8.0, 8.0, 2.0);
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
+                            * Quaternion::rotation_y(move1 * -1.8 + move2 * -1.5)
+                            * Quaternion::rotation_z(move2 * 1.5);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.control_r.position = Vec3::new(
+                            7.0 + move2 * 5.0,
+                            8.0 + move1 * 3.0 + move2 * 7.0,
+                            2.0 + move1 * -6.0 + move2 * 8.0,
+                        );
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
+                            * Quaternion::rotation_y(move1 * -1.8 + move2 * -1.5)
+                            * Quaternion::rotation_z(move2 * 1.5);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Hammer)
+                    | Some(ToolKind::HammerSimple)
+                    | Some(ToolKind::Pick) => {
+                        next.control_r.position = Vec3::new(
+                            7.0,
+                            8.0 + move1 * -4.0 + move2 * 4.0,
+                            2.0 + move1 * 16.0 + move2 * -21.0,
+                        );
+                        next.control_r.orientation =
+                            Quaternion::rotation_x(-0.3 + move1 * 1.3 + move2 * -2.3)
+                                * Quaternion::rotation_y(0.0)
+                                * Quaternion::rotation_z(0.0);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
         next
     }
 }
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index ddc700c346..5b78002502 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -144,7 +144,7 @@ impl Animation for StandAnimation {
         next.second.scale = Vec3::one();
 
         next.second.scale = match hands {
-            (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
+            (None, Some(Hands::One)) | (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
             (_, _) => Vec3::zero(),
         };
 
diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs
index d1500bf318..d1db54739c 100644
--- a/voxygen/anim/src/character/wield.rs
+++ b/voxygen/anim/src/character/wield.rs
@@ -97,7 +97,10 @@ impl Animation for WieldAnimation {
         //     (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
         //    (_, _) => Vec3::zero(),
         // };
-
+        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+        next.main.orientation = Quaternion::rotation_z(0.0);
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
         if speed > 0.2 && velocity.z == 0.0 {
             next.chest.orientation = Quaternion::rotation_z(short * 0.1 + strafe * 0.7)
                 * Quaternion::rotation_y(strafe * 0.2)
@@ -342,44 +345,34 @@ impl Animation for WieldAnimation {
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), _) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.second.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_z(PI);
-                next.second.orientation = Quaternion::rotation_z(PI);
-
-                next.control_l.position = Vec3::new(-8.0, 9.0, 4.0);
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
                 next.control_l.orientation = Quaternion::rotation_x(-0.3);
-                next.hand_l.position = Vec3::new(0.0, 0.5, -4.0);
+                next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                 next.hand_l.orientation = Quaternion::rotation_x(1.57)
             },
             (_, _) => {},
         };
         match hands {
-            (_, Some(Hands::One)) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.second.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_z(PI);
-                next.second.orientation = Quaternion::rotation_z(PI);
-
-                next.control_r.position = Vec3::new(8.0, 9.0, 4.0);
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
                 next.control_r.orientation = Quaternion::rotation_x(-0.3);
-
-                next.hand_r.position = Vec3::new(0.0, 0.5, -4.0);
+                next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
                 next.hand_r.orientation = Quaternion::rotation_x(1.57)
             },
             (_, _) => {},
         };
         match hands {
-            (None, _) => {
-                next.hand_l.position = Vec3::new(0.0, 0.0, 20.0);
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
             },
             (_, _) => {},
         };
-
         match hands {
-            (_, None) => {
-                next.hand_r.position = Vec3::new(0.0, 0.0, 20.0);
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
             },
             (_, _) => {},
         };
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 4ccb63e590..1f7d7b1738 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -899,6 +899,7 @@ impl FigureMgr {
                                 (
                                     active_tool_kind,
                                     second_tool_kind,
+                                    hands,
                                     rel_vel.magnitude(),
                                     time,
                                     Some(s.stage_section),
@@ -1057,6 +1058,7 @@ impl FigureMgr {
                                 (
                                     active_tool_kind,
                                     second_tool_kind,
+                                    hands,
                                     rel_vel.magnitude(),
                                     time,
                                     None,
@@ -1361,6 +1363,7 @@ impl FigureMgr {
                                     (
                                         active_tool_kind,
                                         second_tool_kind,
+                                        hands,
                                         rel_vel.magnitude(),
                                         time,
                                         Some(s.stage_section),

From 0419ca882ec9c40cbdf60cf79bcad5b52a5424ad Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 30 Mar 2021 00:58:22 -0400
Subject: [PATCH 05/11] more setups. chargeswing/dash anims

---
 assets/common/abilities/axe/leap.ron       |   2 +-
 assets/common/abilities/axe/spin.ron       |   2 +-
 assets/common/abilities/hammer/charged.ron |   2 +-
 assets/common/abilities/hammer/leap.ron    |   2 +-
 assets/common/abilities/sword/dash.ron     |   4 +-
 assets/common/abilities/sword/spin.ron     |   2 +-
 voxygen/anim/src/character/alpha.rs        |  44 +++---
 voxygen/anim/src/character/beta.rs         |  17 +-
 voxygen/anim/src/character/chargeswing.rs  | 173 ++++++++++++++++-----
 voxygen/anim/src/character/dash.rs         | 146 ++++++++++++-----
 voxygen/anim/src/character/leapmelee.rs    |  17 +-
 voxygen/anim/src/character/sit.rs          |  53 ++++---
 voxygen/anim/src/character/spin.rs         |  17 +-
 voxygen/anim/src/character/spinmelee.rs    |  17 +-
 voxygen/src/scene/figure/mod.rs            |  15 ++
 15 files changed, 374 insertions(+), 139 deletions(-)

diff --git a/assets/common/abilities/axe/leap.ron b/assets/common/abilities/axe/leap.ron
index c59b733465..50cf49564b 100644
--- a/assets/common/abilities/axe/leap.ron
+++ b/assets/common/abilities/axe/leap.ron
@@ -1,5 +1,5 @@
 LeapMelee(
-    energy_cost: 450,
+    energy_cost: 0,
     buildup_duration: 0.2,
     movement_duration: 0.2,
     swing_duration: 0.2,
diff --git a/assets/common/abilities/axe/spin.ron b/assets/common/abilities/axe/spin.ron
index 39045a1cbc..ef6f426a89 100644
--- a/assets/common/abilities/axe/spin.ron
+++ b/assets/common/abilities/axe/spin.ron
@@ -7,7 +7,7 @@ SpinMelee(
     knockback: ( strength: 0.0, direction: Away),
     range: 3.5,
     damage_effect: None,
-    energy_cost: 100,
+    energy_cost: 0,
     is_infinite: true,
     movement_behavior: AxeHover,
     is_interruptible: false,
diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron
index 978143195e..a854d6aa4f 100644
--- a/assets/common/abilities/hammer/charged.ron
+++ b/assets/common/abilities/hammer/charged.ron
@@ -1,6 +1,6 @@
 ChargedMelee(
     energy_cost: 1,
-    energy_drain: 300,
+    energy_drain: 0,
     initial_damage: 10,
     scaled_damage: 160,
     initial_poise_damage: 60,
diff --git a/assets/common/abilities/hammer/leap.ron b/assets/common/abilities/hammer/leap.ron
index 47f90adb77..41a02ac25c 100644
--- a/assets/common/abilities/hammer/leap.ron
+++ b/assets/common/abilities/hammer/leap.ron
@@ -1,5 +1,5 @@
 LeapMelee(
-    energy_cost: 700,
+    energy_cost: 0,
     buildup_duration: 0.1,
     movement_duration: 0.8,
     swing_duration: 0.15,
diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron
index 72ba6f4451..810160a61d 100644
--- a/assets/common/abilities/sword/dash.ron
+++ b/assets/common/abilities/sword/dash.ron
@@ -1,5 +1,5 @@
 DashMelee(
-    energy_cost: 100,
+    energy_cost: 0,
     base_damage: 80,
     scaled_damage: 160,
     base_poise_damage: 60,
@@ -8,7 +8,7 @@ DashMelee(
     scaled_knockback: 7.0,
     range: 5.0,
     angle: 45.0,
-    energy_drain: 600,
+    energy_drain: 0,
     forward_speed: 4.0,
     buildup_duration: 0.25,
     charge_duration: 0.6,
diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron
index a0cef50ca7..f5f78f15df 100644
--- a/assets/common/abilities/sword/spin.ron
+++ b/assets/common/abilities/sword/spin.ron
@@ -7,7 +7,7 @@ SpinMelee(
     knockback: ( strength: 10.0, direction: Away),
     range: 3.5,
     damage_effect: None,
-    energy_cost: 150,
+    energy_cost: 0,
     is_infinite: false,
     movement_behavior: ForwardGround,
     is_interruptible: true,
diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs
index 0a4d6144a4..42d0121c75 100644
--- a/voxygen/anim/src/character/alpha.rs
+++ b/voxygen/anim/src/character/alpha.rs
@@ -4,7 +4,7 @@ use super::{
 };
 use common::{
     comp::item::{Hands, ToolKind},
-    states::utils::StageSection,
+    states::utils::{AbilityInfo, StageSection},
 };
 use std::f32::consts::PI;
 
@@ -18,6 +18,7 @@ impl Animation for AlphaAnimation {
         f32,
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -28,7 +29,15 @@ impl Animation for AlphaAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, hands, _velocity, _global_time, stage_section): Self::Dependency,
+        (
+            active_tool_kind,
+            _second_tool_kind,
+            hands,
+            _velocity,
+            _global_time,
+            stage_section,
+            ability_info,
+        ): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -36,18 +45,20 @@ impl Animation for AlphaAnimation {
         *rate = 1.0;
         let mut next = (*skeleton).clone();
 
-        let (move1, move2, move3) = match stage_section {
-            Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
-            Some(StageSection::Swing) => (1.0, anim_time, 0.0),
-            Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
-            _ => (0.0, 0.0, 0.0),
+        let (move1, move2, move3, move2h) = match stage_section {
+            Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),
+            Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0, anim_time.powf(0.25)),
+            Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0), /* hmm maybe don' */
+            // t complete the
+            // recovery?
+            _ => (0.0, 0.0, 0.0, 0.0),
         };
         next.second.position = Vec3::new(0.0, 0.0, 0.0);
         next.second.orientation = Quaternion::rotation_z(0.0);
         next.torso.position = Vec3::new(0.0, 0.0, 0.1) * s_a.scaler;
         next.torso.orientation = Quaternion::rotation_z(0.0);
 
-        match active_tool_kind {
+        match ability_info.and_then(|a| a.tool) {
             Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
                 next.main.orientation = Quaternion::rotation_x(0.0);
@@ -60,11 +71,6 @@ impl Animation for AlphaAnimation {
                     move1 * -0.9 + (move2 * 1.75).sin() * 2.5 + move3 * -0.5,
                 );
             },
-            Some(ToolKind::Dagger) => {
-                next.control_l.position = Vec3::new(-10.0, 6.0, 2.0);
-                next.control_l.orientation =
-                    Quaternion::rotation_x(-1.4) * Quaternion::rotation_z(1.4);
-            },
 
             Some(ToolKind::Axe) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
@@ -119,7 +125,7 @@ impl Animation for AlphaAnimation {
         }
 
         match hands {
-            (Some(Hands::Two), _) => match active_tool_kind {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
                 Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                     next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
                     next.hand_l.orientation =
@@ -194,7 +200,7 @@ impl Animation for AlphaAnimation {
 
         match hands {
             (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match active_tool_kind {
+                match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                         next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
                         next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
@@ -238,7 +244,7 @@ impl Animation for AlphaAnimation {
         };
         match hands {
             (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
-                match active_tool_kind {
+                match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                         next.control_r.position = Vec3::new(7.0 + move2 * 8.0, 8.0, 2.0);
                         next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
@@ -264,11 +270,11 @@ impl Animation for AlphaAnimation {
                     | Some(ToolKind::Pick) => {
                         next.control_r.position = Vec3::new(
                             7.0,
-                            8.0 + move1 * -4.0 + move2 * 4.0,
-                            2.0 + move1 * 16.0 + move2 * -21.0,
+                            8.0 + move1 * -4.0 + move2h * 4.0,
+                            2.0 + move1 * 16.0 + move2h * -21.0,
                         );
                         next.control_r.orientation =
-                            Quaternion::rotation_x(-0.3 + move1 * 1.3 + move2 * -2.3)
+                            Quaternion::rotation_x(-0.3 + move1 * 1.3 + move2h * -2.3)
                                 * Quaternion::rotation_y(0.0)
                                 * Quaternion::rotation_z(0.0);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
diff --git a/voxygen/anim/src/character/beta.rs b/voxygen/anim/src/character/beta.rs
index bacbaa88ee..d6d977e9a5 100644
--- a/voxygen/anim/src/character/beta.rs
+++ b/voxygen/anim/src/character/beta.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::{AbilityInfo, StageSection},
+};
 
 pub struct BetaAnimation;
 
@@ -10,9 +13,11 @@ impl Animation for BetaAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         f32,
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -22,7 +27,15 @@ impl Animation for BetaAnimation {
     #[cfg_attr(feature = "be-dyn-lib", export_name = "character_beta")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (_active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency,
+        (
+            _active_tool_kind,
+            _second_tool_kind,
+            hands,
+            _velocity,
+            _global_time,
+            stage_section,
+            ability_info,
+        ): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
diff --git a/voxygen/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs
index ce805fe05a..c0ab4f9afc 100644
--- a/voxygen/anim/src/character/chargeswing.rs
+++ b/voxygen/anim/src/character/chargeswing.rs
@@ -2,16 +2,21 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::{AbilityInfo, StageSection},
+};
 pub struct ChargeswingAnimation;
 
 impl Animation for ChargeswingAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         Vec3<f32>,
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -22,7 +27,15 @@ impl Animation for ChargeswingAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency,
+        (
+            active_tool_kind,
+            _second_tool_kind,
+            hands,
+            _velocity,
+            _global_time,
+            stage_section,
+            ability_info,
+        ): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -36,9 +49,9 @@ impl Animation for ChargeswingAnimation {
             * ((anim_time * lab * 8.0).sin());
         // end spin stuff
 
-        let (move1base, move2base, move3, tension, test) = match stage_section {
+        let (move1base, move2base, movement3, tension, test) = match stage_section {
             Some(StageSection::Charge) => (
-                anim_time.min(1.0),
+                (anim_time.powf(0.25)).min(1.0),
                 0.0,
                 0.0,
                 (anim_time * 18.0 * lab).sin(),
@@ -48,42 +61,128 @@ impl Animation for ChargeswingAnimation {
             Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 0.0, 1.0),
             _ => (0.0, 0.0, 0.0, 0.0, 0.0),
         };
-        let move1 = move1base * (1.0 - move3);
-        let slowrise = test * (1.0 - move3);
 
-        let move2 = move2base * (1.0 - move3);
-        if let Some(ToolKind::Hammer) = active_tool_kind {
-            next.main.position = Vec3::new(0.0, 0.0, 0.0);
-            next.main.orientation = Quaternion::rotation_x(0.0);
-            next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + (move2 * -8.0));
-            next.hand_l.orientation =
-                Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
-            next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
-            next.hand_r.orientation =
-                Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
+        let pullback = (1.0 - movement3);
+        let move1 = move1base * pullback;
+        let move2 = move2base * pullback;
+        let slowrise = test * pullback;
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
 
-            next.control.position = Vec3::new(
-                s_a.hc.0 + (move1 * -2.0 + move2 * -8.0),
-                s_a.hc.1 + (move1 * 2.0 + move2 * 6.0),
-                s_a.hc.2 + (move1 * -2.0 + slowrise * 8.0),
-            );
-            next.control.orientation = Quaternion::rotation_x(s_a.hc.3 + (move2 * 0.0))
-                * Quaternion::rotation_y(
-                    s_a.hc.4 + (tension * 0.08 + move1 * 0.7 + move2 * -1.0 + slowrise * 2.0),
-                )
-                * Quaternion::rotation_z(s_a.hc.5 + (move1 * 0.2 + move2 * -1.0));
-            next.chest.orientation =
-                Quaternion::rotation_z(short * 0.04 + (move1 * 2.0 + move2 * -3.5));
-            next.belt.orientation = Quaternion::rotation_z(short * 0.08 + (move1 * -1.0));
-            next.shorts.orientation = Quaternion::rotation_z(short * 0.15 + (move1 * -1.0));
-            next.head.position = Vec3::new(
-                0.0 + (move1 * -1.0 + move2 * 2.0),
-                s_a.head.0 + (move1 * 1.0),
-                s_a.head.1,
-            );
-            next.head.orientation = Quaternion::rotation_z(move1 * -1.5 + move2 * 3.2);
-            next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
+        if let Some(ToolKind::Hammer) = active_tool_kind {}
+
+        next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
+
+        match ability_info.and_then(|a| a.tool) {
+            Some(ToolKind::Hammer) => {
+                next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                next.main.orientation = Quaternion::rotation_x(0.0);
+
+                next.chest.orientation =
+                    Quaternion::rotation_z(short * 0.04 + (move1 * 2.0 + move2 * -3.5));
+                next.belt.orientation = Quaternion::rotation_z(short * 0.08 + (move1 * -1.0));
+                next.shorts.orientation = Quaternion::rotation_z(short * 0.15 + (move1 * -1.0));
+                next.head.position = Vec3::new(
+                    0.0 + (move1 * -1.0 + move2 * 2.0),
+                    s_a.head.0 + (move1 * 1.0),
+                    s_a.head.1,
+                );
+                next.head.orientation = Quaternion::rotation_z(move1 * -1.5 + move2 * 3.2);
+                next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
+            },
+            _ => {},
         }
+
+        match hands {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) => {
+                    next.hand_l.position =
+                        Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + (move2 * -8.0));
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
+                    next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.hc.0 + (move1 * -2.0 + move2 * -8.0),
+                        s_a.hc.1 + (move1 * 2.0 + move2 * 6.0),
+                        s_a.hc.2 + (move1 * -2.0 + slowrise * 8.0),
+                    );
+                    next.control.orientation = Quaternion::rotation_x(s_a.hc.3 + (move2 * 0.0))
+                        * Quaternion::rotation_y(
+                            s_a.hc.4
+                                + (tension * 0.08 + move1 * 0.7 + move2 * -1.0 + slowrise * 2.0),
+                        )
+                        * Quaternion::rotation_z(s_a.hc.5 + (move1 * 0.2 + move2 * -1.0));
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) => {
+                        next.control_l.position = Vec3::new(
+                            -7.0 + move1 * 4.0,
+                            8.0 + move1 * 2.0 + move2 * 4.0,
+                            2.0 + move1 * -1.0 + slowrise * 8.0,
+                        );
+                        next.control_l.orientation =
+                            Quaternion::rotation_x(-0.3 + move2 * 1.0 + slowrise * -1.5)
+                                * Quaternion::rotation_y(
+                                    tension * 0.07 + move1 * -1.2 + slowrise * 0.5,
+                                )
+                                * Quaternion::rotation_z(move2 * 1.0);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) => {
+                        next.control_r.position = Vec3::new(
+                            7.0 + move1 * 1.0 + move2 * -20.0,
+                            8.0 + move1 * 1.0 + move2 * 4.0,
+                            2.0 + move1 * -3.0 + slowrise * 8.0,
+                        );
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * 1.0)
+                            * Quaternion::rotation_y(
+                                tension * -0.07 + move1 * -2.0 + slowrise * 0.5,
+                            )
+                            * Quaternion::rotation_z(move2 * 1.0);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
+
         next
     }
 }
diff --git a/voxygen/anim/src/character/dash.rs b/voxygen/anim/src/character/dash.rs
index c9cd66eb85..cdb4979a97 100644
--- a/voxygen/anim/src/character/dash.rs
+++ b/voxygen/anim/src/character/dash.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::{AbilityInfo, StageSection},
+};
 use std::f32::consts::PI;
 
 pub struct DashAnimation;
@@ -11,8 +14,10 @@ impl Animation for DashAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -23,7 +28,7 @@ impl Animation for DashAnimation {
     #[allow(clippy::single_match)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, _global_time, stage_section): Self::Dependency,
+        (active_tool_kind, _second_tool_kind, hands, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -31,13 +36,17 @@ impl Animation for DashAnimation {
         *rate = 1.0;
         let mut next = (*skeleton).clone();
 
-        let (movement1, movement2, movement3, movement4) = match stage_section {
+        let (movement1, movement2, movement3, move4) = match stage_section {
             Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),
             Some(StageSection::Charge) => (1.0, anim_time, 0.0, 0.0),
             Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.01), 0.0),
             Some(StageSection::Recover) => (1.1, 1.0, 1.0, anim_time.powi(4)),
             _ => (0.0, 0.0, 0.0, 0.0),
         };
+        let pullback = (1.0 - move4);
+        let move1 = movement1 * pullback;
+        let move2 = movement2 * pullback;
+        let move3 = movement3 * pullback;
 
         fn slow(x: f32) -> f32 {
             ((5.0 / (1.1 + 3.9 * ((x * 12.4).sin()).powi(2))).sqrt()) * ((x * 12.4).sin())
@@ -50,56 +59,31 @@ impl Animation for DashAnimation {
         fn shortalt(x: f32) -> f32 { (x * 5.0 + PI / 2.0).sin() }
 
         next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
-
-        match active_tool_kind {
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
+        match ability_info.and_then(|a| a.tool) {
             Some(ToolKind::Sword) => {
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
                 next.main.orientation = Quaternion::rotation_x(0.0);
 
-                next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                next.control.position = Vec3::new(
-                    s_a.sc.0 + (movement1 * -5.0 + movement3 * -2.0) * (1.0 - movement4),
-                    s_a.sc.1 + (movement2.min(1.0) * -2.0) * (1.0 - movement4),
-                    s_a.sc.2 + (movement2.min(1.0) * 2.0) * (1.0 - movement4),
-                );
-                next.control.orientation = Quaternion::rotation_x(
-                    s_a.sc.3 + (movement1 * -1.0 + movement3 * -0.5) * (1.0 - movement4),
-                ) * Quaternion::rotation_y(
-                    s_a.sc.4 + (movement1 * 1.5 + movement3 * -2.5) * (1.0 - movement4),
-                );
-
                 next.head.position =
-                    Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1 + movement2.min(1.0) * 1.0);
-                next.head.orientation =
-                    Quaternion::rotation_y(movement2.min(1.0) * -0.3 + movement3 * 0.3)
-                        * (1.0 - movement4)
-                        * Quaternion::rotation_z(movement1 * -0.9 + movement3 * 1.6)
-                        * (1.0 - movement4);
+                    Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1 + move2.min(1.0) * 1.0);
+                next.head.orientation = Quaternion::rotation_y(move2.min(1.0) * -0.3 + move3 * 0.3)
+                    * Quaternion::rotation_z(move1 * -0.9 + move3 * 1.6);
 
                 next.chest.position = Vec3::new(
                     0.0,
                     s_a.chest.0,
-                    s_a.chest.1 + (2.0 + shortalt(movement2) * -2.5) * (1.0 - movement4),
-                );
-                next.chest.orientation = Quaternion::rotation_x(
-                    (movement2.min(1.0) * -0.4 + movement3 * 0.4) * (1.0 - movement4),
-                ) * Quaternion::rotation_y(
-                    (movement2.min(1.0) * -0.2 + movement3 * 0.3) * (1.0 - movement4),
-                ) * Quaternion::rotation_z(
-                    (movement1 * 1.1 + movement3 * -2.2) * (1.0 - movement4),
+                    s_a.chest.1 + (2.0 + shortalt(move2) * -2.5) + move3 * -3.0,
                 );
+                next.chest.orientation =
+                    Quaternion::rotation_x((move2.min(1.0) * -0.4 + move3 * 0.4))
+                        * Quaternion::rotation_y((move2.min(1.0) * -0.2 + move3 * 0.3))
+                        * Quaternion::rotation_z((move1 * 1.1 + move3 * -2.2));
 
-                next.shorts.orientation =
-                    Quaternion::rotation_z((short(movement2).min(1.0) * 0.25) * (1.0 - movement4));
+                next.shorts.orientation = Quaternion::rotation_z((short(move2).min(1.0) * 0.25));
 
-                next.belt.orientation =
-                    Quaternion::rotation_z((short(movement2).min(1.0) * 0.1) * (1.0 - movement4));
+                next.belt.orientation = Quaternion::rotation_z((short(move2).min(1.0) * 0.1));
             },
             _ => {},
         }
@@ -107,6 +91,86 @@ impl Animation for DashAnimation {
         next.lantern.orientation = Quaternion::rotation_x(slow(anim_time) * -0.7 + 0.4)
             * Quaternion::rotation_y(slow(anim_time) * 0.4);
 
+        match hands {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.sc.0 + (move1 * -5.0 + move3 * -2.0),
+                        s_a.sc.1 + (move2.min(1.0) * -2.0),
+                        s_a.sc.2 + (move2.min(1.0) * 2.0),
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.sc.3 + (move1 * -1.0 + move3 * -0.5))
+                            * Quaternion::rotation_y(s_a.sc.4 + (move1 * 1.5 + move3 * -2.5));
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.control_l.position =
+                            Vec3::new(-7.0, 8.0 + move3 * 5.0, 2.0 + move1 * 4.0);
+                        next.control_l.orientation =
+                            Quaternion::rotation_x(-0.3 + move2 * 1.0 + move3 * 1.0)
+                                * Quaternion::rotation_y(move1 * -1.2 + move3 * -1.5)
+                                * Quaternion::rotation_z(move2 * 1.0 + move3 * 1.5);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.control_r.position = Vec3::new(
+                            7.0 + move1 * 5.0 + move3 * -30.0,
+                            8.0 + move3 * -5.0,
+                            2.0 + move1 * 1.0,
+                        );
+                        next.control_r.orientation =
+                            Quaternion::rotation_x(-0.3 + move1 * -3.0 + move3 * -0.5)
+                                * Quaternion::rotation_y(move1 * 1.5 + move2 * 1.0 + move3 * 1.5)
+                                * Quaternion::rotation_z(move3 * 1.5);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
+
         next
     }
 }
diff --git a/voxygen/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs
index 02d59719e5..c3b3e15923 100644
--- a/voxygen/anim/src/character/leapmelee.rs
+++ b/voxygen/anim/src/character/leapmelee.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::{AbilityInfo, StageSection},
+};
 use std::f32::consts::PI;
 pub struct LeapAnimation;
 
@@ -10,9 +13,11 @@ impl Animation for LeapAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         Vec3<f32>,
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -23,7 +28,15 @@ impl Animation for LeapAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency,
+        (
+            active_tool_kind,
+            _second_tool_kind,
+            hands,
+            _velocity,
+            _global_time,
+            stage_section,
+            ability_info,
+        ): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
diff --git a/voxygen/anim/src/character/sit.rs b/voxygen/anim/src/character/sit.rs
index 74cd609d60..59d64f70a1 100644
--- a/voxygen/anim/src/character/sit.rs
+++ b/voxygen/anim/src/character/sit.rs
@@ -27,49 +27,48 @@ impl Animation for SitAnimation {
         let slow = (anim_time * 1.0).sin();
         let slowa = (anim_time * 1.0 + PI / 2.0).sin();
         let stop = (anim_time * 3.0).min(PI / 2.0).sin();
+        let pet = (anim_time * 6.0).sin();
 
-        let head_look = Vec2::new(
-            (global_time + anim_time / 18.0).floor().mul(7331.0).sin() * 0.25,
-            (global_time + anim_time / 18.0).floor().mul(1337.0).sin() * 0.125,
-        );
         next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + slow * 0.1 + stop * -0.8);
-        next.head.orientation = Quaternion::rotation_z(head_look.x + slow * 0.2 - slow * 0.1)
-            * Quaternion::rotation_x((slowa * -0.1 + slow * 0.1 + head_look.y).abs());
+        next.head.orientation =
+            Quaternion::rotation_z(stop * 0.4) * Quaternion::rotation_x(slow * 0.1 + pet * 0.01);
 
-        next.chest.position = Vec3::new(
-            0.0,
-            s_a.chest.0 + stop * -0.4,
-            s_a.chest.1 + slow * 0.1 + stop * -0.8,
-        );
-        next.chest.orientation = Quaternion::rotation_x(stop * 0.15);
+        next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + slow * 0.1 + stop * -0.8);
+        next.chest.orientation =
+            Quaternion::rotation_z(stop * -0.4 + pet * 0.04) * Quaternion::rotation_x(stop * -0.2);
 
         next.belt.position = Vec3::new(0.0, s_a.belt.0 + stop * 1.2, s_a.belt.1);
-        next.belt.orientation = Quaternion::rotation_x(stop * 0.3);
+        next.belt.orientation =
+            Quaternion::rotation_x(stop * 0.2) * Quaternion::rotation_z(pet * -0.02);
 
         next.back.position = Vec3::new(0.0, s_a.back.0, s_a.back.1);
 
         next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + stop * 2.5, s_a.shorts.1 + stop * 0.6);
-        next.shorts.orientation = Quaternion::rotation_x(stop * 0.6);
+        next.shorts.orientation =
+            Quaternion::rotation_x(stop * 0.4) * Quaternion::rotation_z(pet * -0.03);
 
         next.hand_l.position = Vec3::new(
-            -s_a.hand.0,
-            s_a.hand.1 + slowa * 0.15,
-            s_a.hand.2 + slow * 0.7 + stop * -2.0,
+            -s_a.hand.0 + stop * 3.0 + pet * 2.0,
+            s_a.hand.1 + stop * 10.0 + pet * -1.0,
+            s_a.hand.2 + slow * 0.7 + stop * 6.0,
         );
-        next.hand_l.orientation = Quaternion::rotation_x(slowa * -0.1 + slow * 0.1);
+        next.hand_l.orientation = Quaternion::rotation_x(stop * 2.0)
+            * Quaternion::rotation_y(stop * -0.2 + pet * -0.2)
+            * Quaternion::rotation_z(stop * -1.0);
 
         next.hand_r.position = Vec3::new(
-            s_a.hand.0,
-            s_a.hand.1 + slowa * 0.15,
-            s_a.hand.2 + slow * 0.7 + stop * -2.0,
+            s_a.hand.0 + stop * -1.0,
+            s_a.hand.1 + stop * 4.0,
+            s_a.hand.2 + slow * 0.7 + stop * 0.0,
         );
-        next.hand_r.orientation = Quaternion::rotation_x(slow * -0.1 + slowa * 0.1);
+        next.hand_r.orientation =
+            Quaternion::rotation_x(stop * 1.5) * Quaternion::rotation_z(stop * 0.0);
 
-        next.foot_l.position = Vec3::new(-s_a.foot.0, 4.0 + s_a.foot.1, 3.0 + s_a.foot.2);
-        next.foot_l.orientation = Quaternion::rotation_x(slow * 0.1 + stop * 1.2 + slow * 0.1);
+        next.foot_l.position = Vec3::new(-s_a.foot.0, 4.0 + s_a.foot.1, 1.0 + s_a.foot.2);
+        next.foot_l.orientation = Quaternion::rotation_x(0.0);
 
-        next.foot_r.position = Vec3::new(s_a.foot.0, 4.0 + s_a.foot.1, 3.0 + s_a.foot.2);
-        next.foot_r.orientation = Quaternion::rotation_x(slowa * 0.1 + stop * 1.2 + slowa * 0.1);
+        next.foot_r.position = Vec3::new(s_a.foot.0, stop * -3.0 + s_a.foot.1, 1.0 + s_a.foot.2);
+        next.foot_r.orientation = Quaternion::rotation_x(stop * -0.5);
 
         next.shoulder_l.position = Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
         next.shoulder_l.orientation = Quaternion::rotation_x(0.0);
@@ -77,7 +76,7 @@ impl Animation for SitAnimation {
         next.shoulder_r.position = Vec3::new(s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
         next.shoulder_r.orientation = Quaternion::rotation_x(0.0);
 
-        next.torso.position = Vec3::new(0.0, -0.2, stop * -0.16) * s_a.scaler;
+        next.torso.position = Vec3::new(0.0, 0.0, stop * -0.10) * s_a.scaler;
 
         next
     }
diff --git a/voxygen/anim/src/character/spin.rs b/voxygen/anim/src/character/spin.rs
index e6e802e90f..74ce5a86c3 100644
--- a/voxygen/anim/src/character/spin.rs
+++ b/voxygen/anim/src/character/spin.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::{AbilityInfo, StageSection},
+};
 use std::f32::consts::PI;
 
 pub struct SpinAnimation;
@@ -11,9 +14,11 @@ impl Animation for SpinAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         Vec3<f32>,
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -23,7 +28,15 @@ impl Animation for SpinAnimation {
     #[cfg_attr(feature = "be-dyn-lib", export_name = "character_spin")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency,
+        (
+            active_tool_kind,
+            _second_tool_kind,
+            hands,
+            _velocity,
+            _global_time,
+            stage_section,
+            ability_info,
+        ): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
diff --git a/voxygen/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs
index f0ee2fd7ad..492c96b943 100644
--- a/voxygen/anim/src/character/spinmelee.rs
+++ b/voxygen/anim/src/character/spinmelee.rs
@@ -2,7 +2,10 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::{AbilityInfo, StageSection},
+};
 use std::f32::consts::PI;
 
 pub struct SpinMeleeAnimation;
@@ -11,9 +14,11 @@ impl Animation for SpinMeleeAnimation {
     type Dependency = (
         Option<ToolKind>,
         Option<ToolKind>,
+        (Option<Hands>, Option<Hands>),
         Vec3<f32>,
         f32,
         Option<StageSection>,
+        Option<AbilityInfo>,
     );
     type Skeleton = CharacterSkeleton;
 
@@ -24,7 +29,15 @@ impl Animation for SpinMeleeAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency,
+        (
+            active_tool_kind,
+            _second_tool_kind,
+            hands,
+            _velocity,
+            _global_time,
+            stage_section,
+            ability_info,
+        ): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 1f7d7b1738..3ddc0416b0 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -903,6 +903,7 @@ impl FigureMgr {
                                     rel_vel.magnitude(),
                                     time,
                                     Some(s.stage_section),
+                                    Some(s.static_data.ability_info),
                                 ),
                                 stage_progress,
                                 &mut state_animation_rate,
@@ -994,9 +995,11 @@ impl FigureMgr {
                                 (
                                     active_tool_kind,
                                     second_tool_kind,
+                                    hands,
                                     rel_vel,
                                     time,
                                     Some(s.stage_section),
+                                    Some(s.static_data.ability_info),
                                 ),
                                 stage_progress,
                                 &mut state_animation_rate,
@@ -1062,6 +1065,7 @@ impl FigureMgr {
                                     rel_vel.magnitude(),
                                     time,
                                     None,
+                                    None,
                                 ),
                                 state.state_time,
                                 &mut state_animation_rate,
@@ -1090,8 +1094,10 @@ impl FigureMgr {
                                 (
                                     active_tool_kind,
                                     second_tool_kind,
+                                    hands,
                                     time,
                                     Some(s.stage_section),
+                                    Some(s.static_data.ability_info),
                                 ),
                                 stage_progress,
                                 &mut state_animation_rate,
@@ -1185,9 +1191,11 @@ impl FigureMgr {
                                 (
                                     active_tool_kind,
                                     second_tool_kind,
+                                    hands,
                                     rel_vel,
                                     time,
                                     Some(s.stage_section),
+                                    Some(s.static_data.ability_info),
                                 ),
                                 stage_progress,
                                 &mut state_animation_rate,
@@ -1221,9 +1229,11 @@ impl FigureMgr {
                                 (
                                     active_tool_kind,
                                     second_tool_kind,
+                                    hands,
                                     rel_vel,
                                     time,
                                     Some(s.stage_section),
+                                    Some(s.static_data.ability_info),
                                 ),
                                 stage_progress,
                                 &mut state_animation_rate,
@@ -1367,6 +1377,7 @@ impl FigureMgr {
                                         rel_vel.magnitude(),
                                         time,
                                         Some(s.stage_section),
+                                        Some(s.static_data.ability_info),
                                     ),
                                     stage_progress,
                                     &mut state_animation_rate,
@@ -1377,9 +1388,11 @@ impl FigureMgr {
                                     (
                                         active_tool_kind,
                                         second_tool_kind,
+                                        hands,
                                         rel_vel,
                                         time,
                                         Some(s.stage_section),
+                                        Some(s.static_data.ability_info),
                                     ),
                                     stage_progress,
                                     &mut state_animation_rate,
@@ -1390,9 +1403,11 @@ impl FigureMgr {
                                     (
                                         active_tool_kind,
                                         second_tool_kind,
+                                        hands,
                                         rel_vel.magnitude(),
                                         time,
                                         Some(s.stage_section),
+                                        Some(s.static_data.ability_info),
                                     ),
                                     stage_progress,
                                     &mut state_animation_rate,

From 40fc3f6daa824f9b8f98e64db1c1ddb9204c7c42 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Mon, 5 Apr 2021 17:43:40 -0400
Subject: [PATCH 06/11] leaps

---
 voxygen/anim/src/character/alpha.rs       |  45 ++--
 voxygen/anim/src/character/chargeswing.rs |  21 +-
 voxygen/anim/src/character/leapmelee.rs   | 262 +++++++++++++++-------
 voxygen/anim/src/character/spinmelee.rs   | 213 ++++++++++++------
 voxygen/anim/src/character/stand.rs       |  83 +++----
 5 files changed, 401 insertions(+), 223 deletions(-)

diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs
index 42d0121c75..d3833e55e5 100644
--- a/voxygen/anim/src/character/alpha.rs
+++ b/voxygen/anim/src/character/alpha.rs
@@ -97,23 +97,23 @@ impl Animation for AlphaAnimation {
             Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
                 let (move1, move2, move3) = match stage_section {
                     Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
-                    Some(StageSection::Swing) => (1.0, anim_time, 0.0),
+                    Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0),
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                     _ => (0.0, 0.0, 0.0),
                 };
+                let pullback = (1.0 - move3);
+                let moveret1 = move1 * pullback;
+                let moveret2 = move2 * pullback;
                 next.main.position = Vec3::new(0.0, 0.0, 0.0);
                 next.main.orientation = Quaternion::rotation_x(0.0);
 
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
-                next.head.orientation =
-                    Quaternion::rotation_x((move1 * 0.1 + move2 * 0.3) * (1.0 - move3))
-                        * Quaternion::rotation_z((move1 * -0.2 + move2 * 0.2) * (1.0 - move3));
-                next.chest.position =
-                    Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + move2 * -2.0 * (1.0 - move3));
-                next.chest.orientation =
-                    Quaternion::rotation_x((move1 * 0.4 + move2 * -0.7) * (1.0 - move3))
-                        * Quaternion::rotation_y((move1 * 0.3 + move2 * -0.4) * (1.0 - move3))
-                        * Quaternion::rotation_z((move1 * 0.5 + move2 * -0.5) * (1.0 - move3));
+                next.head.orientation = Quaternion::rotation_x((moveret1 * 0.1 + moveret2 * 0.3))
+                    * Quaternion::rotation_z((move1 * -0.2 + moveret2 * 0.2));
+                next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + moveret2 * -2.0);
+                next.chest.orientation = Quaternion::rotation_x((moveret1 * 0.4 + moveret2 * -0.7))
+                    * Quaternion::rotation_y((moveret1 * 0.3 + moveret2 * -0.4))
+                    * Quaternion::rotation_z((moveret1 * 0.5 + moveret2 * -0.5));
             },
             Some(ToolKind::Debug) => {
                 next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
@@ -173,8 +173,11 @@ impl Animation for AlphaAnimation {
                         Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                         _ => (0.0, 0.0, 0.0),
                     };
+                    let pullback = (1.0 - move3);
+                    let moveret1 = move1 * pullback;
+                    let moveret2 = move2 * pullback;
                     next.hand_l.position =
-                        Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + move2 * -7.0);
+                        Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + moveret2 * -7.0);
                     next.hand_l.orientation =
                         Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
                     next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
@@ -182,16 +185,14 @@ impl Animation for AlphaAnimation {
                         Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
 
                     next.control.position = Vec3::new(
-                        s_a.hc.0 + (move1 * -13.0) * (1.0 - move3),
-                        s_a.hc.1 + (move2 * 5.0) * (1.0 - move3),
-                        s_a.hc.2,
+                        s_a.hc.0 + moveret1 * -13.0 + moveret2 * 3.0,
+                        s_a.hc.1 + (moveret2 * 5.0),
+                        s_a.hc.2 + moveret1 * 5.0 + moveret2 * -8.0,
                     );
                     next.control.orientation =
-                        Quaternion::rotation_x(s_a.hc.3 + (move1 * 1.5 + move2 * -2.5))
-                            * (1.0 - move3)
-                            * Quaternion::rotation_y(s_a.hc.4 + (move1 * 1.57))
-                            * (1.0 - move3)
-                            * Quaternion::rotation_z(s_a.hc.5 + (move2 * -0.5) * (1.0 - move3));
+                        Quaternion::rotation_x(s_a.hc.3 + (moveret1 * 1.5 + moveret2 * -2.9))
+                            * Quaternion::rotation_y(s_a.hc.4 + moveret1 * 1.57 + moveret2 * 0.5)
+                            * Quaternion::rotation_z(s_a.hc.5 + (moveret2 * -0.5));
                 },
                 _ => {},
             },
@@ -230,7 +231,7 @@ impl Animation for AlphaAnimation {
                             2.0 + move1 * 16.0 + move2 * -19.0,
                         );
                         next.control_l.orientation =
-                            Quaternion::rotation_x(-0.3 + move1 * 1.3 + move2 * -2.3)
+                            Quaternion::rotation_x(-0.3 + move1 * 1.9 + move2 * -3.0)
                                 * Quaternion::rotation_y(0.0)
                                 * Quaternion::rotation_z(0.0);
                         next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
@@ -271,10 +272,10 @@ impl Animation for AlphaAnimation {
                         next.control_r.position = Vec3::new(
                             7.0,
                             8.0 + move1 * -4.0 + move2h * 4.0,
-                            2.0 + move1 * 16.0 + move2h * -21.0,
+                            2.0 + move1 * 12.0 + move2h * -16.0,
                         );
                         next.control_r.orientation =
-                            Quaternion::rotation_x(-0.3 + move1 * 1.3 + move2h * -2.3)
+                            Quaternion::rotation_x(-0.3 + move1 * 2.3 + move2h * -3.5)
                                 * Quaternion::rotation_y(0.0)
                                 * Quaternion::rotation_z(0.0);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
diff --git a/voxygen/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs
index c0ab4f9afc..a3d3c77086 100644
--- a/voxygen/anim/src/character/chargeswing.rs
+++ b/voxygen/anim/src/character/chargeswing.rs
@@ -81,7 +81,7 @@ impl Animation for ChargeswingAnimation {
                 next.chest.orientation =
                     Quaternion::rotation_z(short * 0.04 + (move1 * 2.0 + move2 * -3.5));
                 next.belt.orientation = Quaternion::rotation_z(short * 0.08 + (move1 * -1.0));
-                next.shorts.orientation = Quaternion::rotation_z(short * 0.15 + (move1 * -1.0));
+                next.shorts.orientation = Quaternion::rotation_z(short * 0.15 + (move1 * -1.5));
                 next.head.position = Vec3::new(
                     0.0 + (move1 * -1.0 + move2 * 2.0),
                     s_a.head.0 + (move1 * 1.0),
@@ -128,14 +128,13 @@ impl Animation for ChargeswingAnimation {
                         next.control_l.position = Vec3::new(
                             -7.0 + move1 * 4.0,
                             8.0 + move1 * 2.0 + move2 * 4.0,
-                            2.0 + move1 * -1.0 + slowrise * 8.0,
+                            2.0 + move1 * -1.0 + slowrise * 20.0,
                         );
-                        next.control_l.orientation =
-                            Quaternion::rotation_x(-0.3 + move2 * 1.0 + slowrise * -1.5)
-                                * Quaternion::rotation_y(
-                                    tension * 0.07 + move1 * -1.2 + slowrise * 0.5,
-                                )
-                                * Quaternion::rotation_z(move2 * 1.0);
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * -1.0)
+                            * Quaternion::rotation_y(
+                                tension * 0.07 + move1 * -1.2 + slowrise * 0.5,
+                            )
+                            * Quaternion::rotation_z(move2 * 1.0);
                         next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_l.orientation = Quaternion::rotation_x(1.57)
                     },
@@ -152,11 +151,11 @@ impl Animation for ChargeswingAnimation {
                         next.control_r.position = Vec3::new(
                             7.0 + move1 * 1.0 + move2 * -20.0,
                             8.0 + move1 * 1.0 + move2 * 4.0,
-                            2.0 + move1 * -3.0 + slowrise * 8.0,
+                            2.0 + move1 * -3.0 + slowrise * 20.0,
                         );
-                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * 1.0)
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * -1.0)
                             * Quaternion::rotation_y(
-                                tension * -0.07 + move1 * -2.0 + slowrise * 0.5,
+                                tension * -0.07 + move1 * -2.0 + slowrise * 1.5,
                             )
                             * Quaternion::rotation_z(move2 * 1.0);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
diff --git a/voxygen/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs
index c3b3e15923..e5af095266 100644
--- a/voxygen/anim/src/character/leapmelee.rs
+++ b/voxygen/anim/src/character/leapmelee.rs
@@ -44,105 +44,209 @@ impl Animation for LeapAnimation {
         *rate = 1.0;
         let mut next = (*skeleton).clone();
 
-        let (move1, move2, move3, move4) = match stage_section {
+        let (movement1, movement2, movement3, move4) = match stage_section {
             Some(StageSection::Buildup) => (anim_time, 0.0, 0.0, 0.0),
-            Some(StageSection::Movement) => (1.0, anim_time.powf(0.25), 0.0, 0.0),
-            Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.25), 0.0),
-            Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time),
+            Some(StageSection::Movement) => (1.0, anim_time.powi(2), 0.0, 0.0),
+            Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.75), 0.0),
+            Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time.powf(0.75)),
             _ => (0.0, 0.0, 0.0, 0.0),
         };
+        let pullback = (1.0 - move4);
+        let move1 = movement1 * pullback;
+        let move2 = movement2 * pullback;
+        let move3 = movement3 * pullback;
 
-        if let Some(ToolKind::Hammer) = active_tool_kind {
-            next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
-            next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3);
-            next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
-            next.hand_r.orientation = Quaternion::rotation_x(s_a.hhr.3);
-            next.main.position = Vec3::new(0.0, 0.0, 0.0);
-            next.main.orientation = Quaternion::rotation_y(0.0) * Quaternion::rotation_z(0.0);
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
+        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+        next.main.orientation = Quaternion::rotation_z(0.0);
+        next.torso.position = Vec3::new(0.0, 0.0, 0.1) * s_a.scaler;
+        next.torso.orientation = Quaternion::rotation_z(0.0);
 
-            next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
+        match ability_info.and_then(|a| a.tool) {
+            Some(ToolKind::Hammer) => {
+                next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
 
-            next.control.position = Vec3::new(
-                s_a.hc.0 + move2 * -10.0 + move3 * 6.0,
-                s_a.hc.1 + move2 * 5.0 + move3 * 7.0,
-                s_a.hc.2 + move2 * 5.0 + move3 * -10.0,
-            );
-            next.control.orientation =
-                Quaternion::rotation_x(s_a.hc.3 + move2 * 1.57 + move3 * -2.3)
-                    * Quaternion::rotation_y(s_a.hc.4 + move2 * 1.3)
-                    * Quaternion::rotation_z(s_a.hc.5 + move2 * -1.0 + move3 * 0.5);
-            next.chest.orientation =
-                Quaternion::rotation_x(move1 * 0.3 + move2 * 0.3 + move3 * -0.9 + move4 * 0.3)
+                next.chest.orientation = Quaternion::rotation_x(move2 * 0.4 + move3 * -1.5)
                     * Quaternion::rotation_z(move1 * 0.5 + move2 * 0.2 + move3 * -0.7);
 
-            next.head.orientation = Quaternion::rotation_x(move3 * 0.2)
-                * Quaternion::rotation_y(0.0 + move2 * -0.1)
-                * Quaternion::rotation_z(move1 * -0.4 + move2 * -0.2 + move3 * 0.6);
+                next.head.orientation = Quaternion::rotation_x(move3 * 0.2)
+                    * Quaternion::rotation_y(move2 * -0.1)
+                    * Quaternion::rotation_z(move1 * -0.4 + move2 * -0.2 + move3 * 0.6);
 
-            next.foot_l.position = Vec3::new(
-                -s_a.foot.0,
-                s_a.foot.1 + move3 * 13.0,
-                s_a.foot.2 + move3 * -2.0,
-            );
-            next.foot_l.orientation = Quaternion::rotation_x(-0.8 + move3 * 1.7);
+                next.foot_l.position = Vec3::new(
+                    -s_a.foot.0,
+                    s_a.foot.1 + move3 * 13.0,
+                    s_a.foot.2 + move3 * -2.0,
+                );
+                next.foot_l.orientation = Quaternion::rotation_x(-0.8 + move3 * 1.7);
 
-            next.foot_r.position = Vec3::new(
-                s_a.foot.0,
-                s_a.foot.1 + 8.0 + move3 * -13.0,
-                s_a.foot.2 + 5.0 + move3 * -5.0,
-            );
-            next.foot_r.orientation = Quaternion::rotation_x(0.9 + move3 * -1.7);
-        } else if let Some(ToolKind::Axe) = active_tool_kind {
-            next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-            next.hand_l.orientation = Quaternion::rotation_x(s_a.ahl.3);
-            next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-            next.hand_r.orientation = Quaternion::rotation_x(s_a.ahr.3);
-            next.main.position = Vec3::new(0.0, 0.0, 0.0);
-            next.main.orientation = Quaternion::rotation_y(0.0) * Quaternion::rotation_z(0.0);
+                next.foot_r.position = Vec3::new(
+                    s_a.foot.0,
+                    s_a.foot.1 + move2 * 8.0 + move3 * -13.0,
+                    s_a.foot.2 + move2 * 5.0 + move3 * -5.0,
+                );
+                next.foot_r.orientation = Quaternion::rotation_x(0.9 + move3 * -1.7);
+                next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + move3 * -5.0);
+            },
+            Some(ToolKind::Axe) => {
+                next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
 
-            next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
+                next.torso.orientation =
+                    Quaternion::rotation_x(move1 * 0.4 + move2 * 0.6 + move3 * -1.0)
+                        * Quaternion::rotation_y(0.0)
+                        * Quaternion::rotation_z(move1 * 0.4 + move2 * 0.4);
 
-            next.control.position = Vec3::new(
-                s_a.ac.0 + move1 * 8.0,
-                s_a.ac.1 + move1 * 4.0 + move3 * 3.0,
-                s_a.ac.2 + move1 * 6.0 + move2 * 1.0 + move3 * -14.0,
-            );
-            next.control.orientation = Quaternion::rotation_x(
-                s_a.ac.3 + move1 * -2.0 + move2 * 0.7 + move3 * -2.3
-            ) * Quaternion::rotation_y(s_a.ac.4)// + move1 * 0.5)
-                * Quaternion::rotation_z(s_a.ac.5+move1*PI); // - move1 * 0.2);
+                next.head.orientation = Quaternion::rotation_x(move2 * -0.6 + move3 * 0.8)
+                    * Quaternion::rotation_z(move2 * -0.4);
 
-            next.torso.orientation = Quaternion::rotation_x(
-                -0.3 + move2 * -1.6 * PI + move2 * -0.3 + move3 * -0.2 * PI + move4 * -0.1 * PI,
-            ) * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
+                next.foot_l.position = Vec3::new(
+                    -s_a.foot.0,
+                    s_a.foot.1 + move2 * -4.0 + move3 * 4.0,
+                    s_a.foot.2 + move2 * 5.0 + move3 * -5.0,
+                );
 
-            next.head.orientation =
-                Quaternion::rotation_x(0.0 + move1 * -0.4 + move2 * 0.4 + move3 * 0.2);
+                next.foot_r.position = Vec3::new(
+                    s_a.foot.0,
+                    s_a.foot.1 + move2 * 4.0,
+                    s_a.foot.2 + move3 * -3.0,
+                );
 
-            next.foot_l.position = Vec3::new(
-                -s_a.foot.0,
-                s_a.foot.1 + move2 * 4.0 + move3 * -1.0,
-                s_a.foot.2,
-            );
+                next.foot_l.orientation =
+                    Quaternion::rotation_x(move1 * 0.9 - move2 * 1.9 + move3 * 1.8);
 
-            next.foot_r.position = Vec3::new(
-                s_a.foot.0,
-                s_a.foot.1 + move2 * 4.0 + move3 * -8.0,
-                s_a.foot.2 + move3 * -3.0,
-            );
+                next.foot_r.orientation = Quaternion::rotation_x(move1 * 0.9 - move3 * 1.8);
 
-            next.foot_l.orientation =
-                Quaternion::rotation_x(move1 * 0.9 - move2 * 1.0 + move3 * 1.8);
+                next.belt.orientation = Quaternion::rotation_x(move1 * 0.22 + move2 * 0.1);
+                next.shorts.orientation = Quaternion::rotation_x(move1 * 0.3 + move2 * 0.1);
 
-            next.foot_r.orientation = Quaternion::rotation_x(move1 * 0.9 - move3 * 1.8);
-
-            next.belt.orientation = Quaternion::rotation_x(move1 * 0.22 + move2 * 0.1);
-            next.shorts.orientation = Quaternion::rotation_x(move1 * 0.3 + move2 * 0.1);
-
-            next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
+                next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
+            },
+            _ => {},
         }
 
+        match hands {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Hammer) => {
+                    next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
+                    next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3);
+                    next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
+                    next.hand_r.orientation = Quaternion::rotation_x(s_a.hhr.3);
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(0.0) * Quaternion::rotation_z(0.0);
+                    next.control.position = Vec3::new(
+                        s_a.hc.0 + move2 * -10.0 + move3 * 10.0,
+                        s_a.hc.1 + move2 * 5.0 + move3 * 7.0,
+                        s_a.hc.2 + move2 * 5.0 + move3 * -10.0,
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.hc.3 + move2 * 1.57 + move3 * -2.3)
+                            * Quaternion::rotation_y(s_a.hc.4 + move2 * 1.3)
+                            * Quaternion::rotation_z(s_a.hc.5 + move2 * -1.0 + move3 * 0.5);
+                },
+                Some(ToolKind::Axe) => {
+                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                    next.hand_l.orientation = Quaternion::rotation_x(s_a.ahl.3);
+                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                    next.hand_r.orientation = Quaternion::rotation_x(s_a.ahr.3);
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(0.0) * Quaternion::rotation_z(0.0);
+
+                    next.control.position = Vec3::new(
+                        s_a.ac.0 + move2 * 8.0 + move3 * 15.0,
+                        s_a.ac.1 + move3 * -10.0,
+                        s_a.ac.2 + move3 * 4.0,
+                    );
+                    next.control.orientation = Quaternion::rotation_x(
+                    s_a.ac.3) * Quaternion::rotation_y(s_a.ac.4+move2*-0.8+move3*-4.0)// + move1 * 0.5)
+                    * Quaternion::rotation_z(s_a.ac.5+move2*-0.6+move3*-1.6); // - move1 * 0.2);
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Axe) => {
+                        next.control_l.position =
+                            Vec3::new(-7.0 + move3 * 4.0, 8.0 + move3 * 8.0, 2.0 + move3 * -4.0);
+                        next.control_l.orientation =
+                            Quaternion::rotation_x(-0.3 + move2 * 1.0 + move3 * -2.0)
+                                * Quaternion::rotation_y(move2 * -0.5 + move3 * 1.9);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Hammer)
+                    | Some(ToolKind::HammerSimple)
+                    | Some(ToolKind::Pick) => {
+                        next.control_l.position = Vec3::new(
+                            -7.0,
+                            8.0 + move2 * -5.0 + move3 * 9.0,
+                            2.0 + move2 * 8.0 + move3 * -12.0,
+                        );
+                        next.control_l.orientation =
+                            Quaternion::rotation_x(-0.3 + move2 * 1.5 + move3 * -2.5);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Axe) => {
+                        next.control_r.position = Vec3::new(
+                            7.0 + move2 * 2.0,
+                            8.0 + move2 * -8.0 + move3 * 13.0,
+                            2.0 + move2 * 7.0 + move3 * -10.0,
+                        );
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move3 * -2.2)
+                            * Quaternion::rotation_y(move2 * -0.5 + move3 * 1.2);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Hammer)
+                    | Some(ToolKind::HammerSimple)
+                    | Some(ToolKind::Pick) => {
+                        next.control_r.position = Vec3::new(
+                            7.0 + move2 * 3.0 + move3 * -3.0,
+                            8.0 + move2 * -9.0 + move3 * 15.0,
+                            2.0 + move2 * 11.0 + move3 * -18.0,
+                        );
+                        next.control_r.orientation =
+                            Quaternion::rotation_x(-0.3 + move2 * 1.5 + move3 * -2.5)
+                                * Quaternion::rotation_y(move2 * -0.75 + move3 * 0.75);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
         next
     }
 }
diff --git a/voxygen/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs
index 492c96b943..edbafc1432 100644
--- a/voxygen/anim/src/character/spinmelee.rs
+++ b/voxygen/anim/src/character/spinmelee.rs
@@ -43,104 +43,171 @@ impl Animation for SpinMeleeAnimation {
         s_a: &SkeletonAttr,
     ) -> Self::Skeleton {
         *rate = 1.0;
-        let (move1, move2, move3) = match stage_section {
-            Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
+        let (movement1, movement2, movement3) = match stage_section {
+            Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
             Some(StageSection::Swing) => (1.0, anim_time, 0.0),
-            Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(4.0)),
+            Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(2.0)),
             _ => (0.0, 0.0, 0.0),
         };
+        let pullback = (1.0 - movement3);
+        let move1 = movement1 * pullback;
+        let move2 = movement2 * pullback;
         let mut next = (*skeleton).clone();
-
-        match active_tool_kind {
+        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+        next.main.orientation = Quaternion::rotation_z(0.0);
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
+        match ability_info.and_then(|a| a.tool) {
             Some(ToolKind::Sword) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
+                next.torso.orientation = Quaternion::rotation_z(movement2 * PI * 2.0);
 
-                next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2 + move1 * 2.0);
-                next.control.orientation =
-                    Quaternion::rotation_x(s_a.sc.3 + move1 * -PI / 2.5 + move3 * PI / 2.0)
-                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -PI / 2.0 + move3 * PI / 2.0);
-                next.torso.orientation = Quaternion::rotation_z(move2 * PI * 2.0);
-
-                next.chest.position =
-                    Vec3::new(0.0, s_a.chest.0 + move1 * -2.0, s_a.chest.1 + move1 * -3.0);
-                next.chest.orientation = Quaternion::rotation_x(move1 * -0.3)
-                    * Quaternion::rotation_y(move1 * 0.15 + move3 * -0.15);
+                next.chest.position = Vec3::new(
+                    0.0,
+                    s_a.chest.0 + move1 * -2.0,
+                    s_a.chest.1 + move1 * -2.0 + move2 * 2.0,
+                );
+                next.chest.orientation = Quaternion::rotation_x(move1 * -0.3);
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
-                next.head.orientation = Quaternion::rotation_x(move1 * 0.2 + move3 * 0.15)
-                    * Quaternion::rotation_z(move2 * 0.8 + move3 * -0.6);
-                next.belt.orientation = Quaternion::rotation_x(0.1);
-                next.shorts.orientation = Quaternion::rotation_x(0.2);
+                next.head.orientation =
+                    Quaternion::rotation_x(move1 * 0.2) * Quaternion::rotation_z(move2 * 0.8);
+                next.belt.orientation = Quaternion::rotation_x(move1 * 0.5);
+                next.shorts.orientation = Quaternion::rotation_x(move1 * 0.4);
+                next.belt.position = Vec3::new(0.0, s_a.belt.0, s_a.belt.1 + move1 * 0.0);
+                next.belt.orientation = Quaternion::rotation_x(0.15);
+                next.shorts.position =
+                    Vec3::new(0.0, s_a.shorts.0 + move1 * 2.0, s_a.shorts.1 + move1 * 1.0);
+
+                next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1 + move1 * -6.0, s_a.foot.2);
+                next.foot_r.orientation = Quaternion::rotation_x(move1 * -1.0);
             },
 
             Some(ToolKind::Axe) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-                next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
-                next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
-
-                next.control.position =
-                    Vec3::new(s_a.ac.0 + move1 * 8.0, s_a.ac.1, s_a.ac.2 + move1 * -4.0);
-                next.control.orientation =
-                    Quaternion::rotation_x(s_a.ac.3 + move1 * -0.8 * (1.0 - move3))
-                        * Quaternion::rotation_y(s_a.ac.4 + move1 * -PI * (1.0 - move3))
-                        * Quaternion::rotation_z(s_a.ac.5 + move1 * 1.2 * (1.0 - move3));
-
-                next.head.orientation = Quaternion::rotation_x(move1 * -0.2 * (1.0 - move3))
-                    * Quaternion::rotation_z(move1 * 0.4 * (1.0 - move3));
+                next.head.orientation =
+                    Quaternion::rotation_x(move1 * -0.2) * Quaternion::rotation_z(move1 * 0.4);
                 next.head.position = Vec3::new(0.0, s_a.head.0 + move1 * 2.0, s_a.head.1);
 
-                next.chest.position =
-                    Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + move1 * -1.0 * (1.0 - move3));
-                next.chest.orientation = Quaternion::rotation_x(move1 * 0.3 * (1.0 - move3))
-                    * Quaternion::rotation_y(move1 * 0.3 * (1.0 - move3));
+                next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + move1 * -1.0);
+                next.chest.orientation =
+                    Quaternion::rotation_x(move1 * 0.3) * Quaternion::rotation_y(move1 * 0.3);
 
-                next.belt.position = Vec3::new(
-                    0.0,
-                    1.0 + s_a.belt.0,
-                    s_a.belt.1 + move1 * 0.5 * (1.0 - move3),
-                );
+                next.belt.position = Vec3::new(0.0, 1.0 + s_a.belt.0, s_a.belt.1 + move1 * 0.5);
                 next.belt.orientation = Quaternion::rotation_x(0.15);
                 next.shorts.position = Vec3::new(
                     0.0,
-                    1.0 + s_a.shorts.0 + move1 * 1.0 * (1.0 - move3),
-                    s_a.shorts.1 + move1 * 1.0 * (1.0 - move3),
+                    1.0 + s_a.shorts.0 + move1 * 1.0,
+                    s_a.shorts.1 + move1 * 1.0,
                 );
-                next.shorts.orientation =
-                    Quaternion::rotation_x(0.15 + 0.15 * move1 * (1.0 - move3));
+                next.shorts.orientation = Quaternion::rotation_x(0.15 + 0.15 * move1);
 
                 next.torso.orientation =
-                    Quaternion::rotation_z(move1 * 1.0 * (1.0 - move3) + move2 * -2.0 * PI);
+                    Quaternion::rotation_z(movement1 * -0.5 + movement2 * -6.78);
 
-                next.foot_l.position = Vec3::new(
-                    -s_a.foot.0,
-                    s_a.foot.1 + move1 * 7.0 * (1.0 - move3),
-                    s_a.foot.2,
-                );
-                next.foot_l.orientation = Quaternion::rotation_x(move1 * 0.8 * (1.0 - move3));
+                next.foot_l.position = Vec3::new(-s_a.foot.0, s_a.foot.1 + move1 * 7.0, s_a.foot.2);
+                next.foot_l.orientation = Quaternion::rotation_x(move1 * 0.8);
 
-                next.foot_r.position = Vec3::new(
-                    s_a.foot.0,
-                    s_a.foot.1 + move1 * -3.0 * (1.0 - move3),
-                    s_a.foot.2,
-                );
-                next.foot_r.orientation = Quaternion::rotation_x(move1 * -0.5 * (1.0 - move3));
+                next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1 + move1 * -3.0, s_a.foot.2);
+                next.foot_r.orientation = Quaternion::rotation_x(move1 * -0.5);
             },
-
             _ => {},
         }
+        match hands {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
 
+                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.sc.0,
+                        s_a.sc.1 + move1 * 4.0,
+                        s_a.sc.2 + move1 * 2.0 + move2 * 10.0,
+                    );
+                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + move1 * -PI / 2.5)
+                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -PI / 2.0);
+                },
+                Some(ToolKind::Axe) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
+                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
+                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
+
+                    next.control.position =
+                        Vec3::new(s_a.ac.0 + move1 * 8.0, s_a.ac.1, s_a.ac.2 + move1 * -4.0);
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.ac.3 + move1 * -1.0 + move2 * 0.4)
+                            * Quaternion::rotation_y(s_a.ac.4 + move1 * -PI)
+                            * Quaternion::rotation_z(s_a.ac.5 + move1 * 1.4);
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Sword) => {
+                        next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Sword) => {
+                        next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
         next
     }
 }
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index 5b78002502..6dc8cf2dcc 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -94,48 +94,55 @@ impl Animation for StandAnimation {
         next.glider.position = Vec3::new(0.0, 0.0, 10.0);
         next.glider.scale = Vec3::one() * 0.0;
         next.hold.position = Vec3::new(0.4, -0.3, -5.8);
-        match active_tool_kind {
-            Some(ToolKind::Dagger) => {
-                next.main.position = Vec3::new(-4.0, -5.0, 7.0);
-                next.main.orientation =
-                    Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
+        match hands {
+            (Some(Hands::Two), _) => match active_tool_kind {
+                Some(ToolKind::Bow) => {
+                    next.main.position = Vec3::new(0.0, -5.0, 6.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
+                Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
+                    next.main.position = Vec3::new(2.0, -5.0, -1.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
+                },
+                _ => {
+                    next.main.position = Vec3::new(-7.0, -5.0, 15.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
+                _ => {},
             },
-            Some(ToolKind::Shield) => {
-                next.main.position = Vec3::new(-0.0, -5.0, 3.0);
-                next.main.orientation =
-                    Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
-            },
-            Some(ToolKind::Bow) => {
-                next.main.position = Vec3::new(0.0, -5.0, 6.0);
-                next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-            },
-            Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
-                next.main.position = Vec3::new(2.0, -5.0, -1.0);
-                next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
-            },
-            _ => {
-                next.main.position = Vec3::new(-7.0, -5.0, 15.0);
-                next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-            },
-        }
+            (_, _) => {},
+        };
 
-        match second_tool_kind {
-            Some(ToolKind::Dagger) => {
-                next.second.position = Vec3::new(4.0, -6.0, 7.0);
-                next.second.orientation =
-                    Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+                match active_tool_kind {
+                    Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                        next.main.position = Vec3::new(-4.0, -5.0, 10.0);
+                        next.main.orientation =
+                            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                    },
+
+                    _ => {},
+                }
             },
-            Some(ToolKind::Shield) => {
-                next.second.position = Vec3::new(0.0, -4.0, 3.0);
-                next.second.orientation =
-                    Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
+            (_, _) => {},
+        };
+        match hands {
+            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+                match second_tool_kind {
+                    Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                        next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                        next.second.orientation =
+                            Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                    },
+                    _ => {},
+                }
             },
-            _ => {
-                next.second.position = Vec3::new(-7.0, -5.0, 15.0);
-                next.second.orientation =
-                    Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-            },
-        }
+            (_, _) => {},
+        };
 
         next.lantern.position = Vec3::new(s_a.lantern.0, s_a.lantern.1, s_a.lantern.2);
         next.lantern.orientation = Quaternion::rotation_x(0.1) * Quaternion::rotation_y(0.1);

From 31598107d40b0c036db73f95cbdec95a7059e49b Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Mon, 12 Apr 2021 01:29:51 -0400
Subject: [PATCH 07/11] spins, combos

---
 assets/common/abilities/axe/spin.ron    |   2 +-
 voxygen/anim/src/character/alpha.rs     | 116 +++++++------
 voxygen/anim/src/character/beta.rs      | 106 +++++++++---
 voxygen/anim/src/character/jump.rs      |  38 +++--
 voxygen/anim/src/character/leapmelee.rs |  50 +++---
 voxygen/anim/src/character/run.rs       |  29 +++-
 voxygen/anim/src/character/spin.rs      | 207 ++++++++++++++++--------
 voxygen/anim/src/character/spinmelee.rs |  17 +-
 voxygen/anim/src/character/stand.rs     |  36 ++---
 voxygen/anim/src/character/wield.rs     |   8 +-
 voxygen/src/scene/figure/mod.rs         |  65 +++-----
 11 files changed, 420 insertions(+), 254 deletions(-)

diff --git a/assets/common/abilities/axe/spin.ron b/assets/common/abilities/axe/spin.ron
index ef6f426a89..906396fb05 100644
--- a/assets/common/abilities/axe/spin.ron
+++ b/assets/common/abilities/axe/spin.ron
@@ -3,7 +3,7 @@ SpinMelee(
     swing_duration: 0.6,
     recover_duration: 0.2,
     base_damage: 70,
-    base_poise_damage: 55,
+    base_poise_damage: 25,
     knockback: ( strength: 0.0, direction: Away),
     range: 3.5,
     damage_effect: None,
diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs
index d3833e55e5..b9e774e118 100644
--- a/voxygen/anim/src/character/alpha.rs
+++ b/voxygen/anim/src/character/alpha.rs
@@ -47,12 +47,15 @@ impl Animation for AlphaAnimation {
 
         let (move1, move2, move3, move2h) = match stage_section {
             Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),
-            Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0, anim_time.powf(0.25)),
+            Some(StageSection::Swing) => (1.0, anim_time.powi(2), 0.0, anim_time.powf(0.25)),
             Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0), /* hmm maybe don' */
             // t complete the
             // recovery?
             _ => (0.0, 0.0, 0.0, 0.0),
         };
+
+        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+        next.main.orientation = Quaternion::rotation_x(0.0);
         next.second.position = Vec3::new(0.0, 0.0, 0.0);
         next.second.orientation = Quaternion::rotation_z(0.0);
         next.torso.position = Vec3::new(0.0, 0.0, 0.1) * s_a.scaler;
@@ -64,28 +67,22 @@ impl Animation for AlphaAnimation {
                 next.main.orientation = Quaternion::rotation_x(0.0);
 
                 next.chest.orientation =
-                    Quaternion::rotation_z(move1 * 1.5 + (move2 * 1.75).sin() * -3.0 + move3 * 0.5);
+                    Quaternion::rotation_z(move1 * 1.1 + move2 * -2.0 + move3 * 0.5);
 
                 next.head.position = Vec3::new(0.0 + move2 * 2.0, s_a.head.0, s_a.head.1);
-                next.head.orientation = Quaternion::rotation_z(
-                    move1 * -0.9 + (move2 * 1.75).sin() * 2.5 + move3 * -0.5,
-                );
+                next.head.orientation =
+                    Quaternion::rotation_z(move1 * -0.9 + move2 * 1.8 + move3 * -0.5);
             },
 
             Some(ToolKind::Axe) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-
-                next.head.position =
-                    Vec3::new(0. + move2 * 2.0, s_a.head.0 + move2 * 2.0, s_a.head.1);
-
                 let (move1, move2, move3) = match stage_section {
                     Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
                     Some(StageSection::Swing) => (1.0, anim_time, 0.0),
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                     _ => (0.0, 0.0, 0.0),
                 };
-
+                next.head.position =
+                    Vec3::new(0. + move2 * 2.0, s_a.head.0 + move2 * 2.0, s_a.head.1);
                 next.chest.orientation =
                     Quaternion::rotation_x(0.0 + move1 * 0.6 + move2 * -0.6 + move3 * 0.4)
                         * Quaternion::rotation_y(0.0 + move1 * 0.0 + move2 * 0.0 + move3 * 0.0)
@@ -104,8 +101,6 @@ impl Animation for AlphaAnimation {
                 let pullback = (1.0 - move3);
                 let moveret1 = move1 * pullback;
                 let moveret2 = move2 * pullback;
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
 
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
                 next.head.orientation = Quaternion::rotation_x((moveret1 * 0.1 + moveret2 * 0.3))
@@ -135,17 +130,22 @@ impl Animation for AlphaAnimation {
                         Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
 
                     next.control.position = Vec3::new(
-                        s_a.sc.0,
+                        s_a.sc.0 + move2 * 10.0,
                         s_a.sc.1 + move1 * -4.0 + move2 * 16.0 + move3 * -4.0,
                         s_a.sc.2 + move1 * 1.0,
                     );
-                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + move1 * -0.5)
-                        * Quaternion::rotation_y(
-                            s_a.sc.4 + move1 * -1.0 + move2 * -0.6 + move3 * 1.0,
-                        )
-                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -1.2 + move2 * 1.3);
+                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + move1 * -1.3)
+                        * Quaternion::rotation_y(s_a.sc.4 + move1 * -0.7 + move2 * 1.2)
+                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -1.57);
                 },
                 Some(ToolKind::Axe) => {
+                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
+                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
+
                     let (move1, move2, move3) = match stage_section {
                         Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
                         Some(StageSection::Swing) => (1.0, anim_time, 0.0),
@@ -200,51 +200,47 @@ impl Animation for AlphaAnimation {
         };
 
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match ability_info.and_then(|a| a.tool) {
-                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
-                        next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
-                            * Quaternion::rotation_y(move1 * -1.2 + move2 * -1.5)
-                            * Quaternion::rotation_z(move2 * 1.5);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
-                    Some(ToolKind::Axe) => {
-                        next.control_l.position = Vec3::new(
-                            -7.0 + move2 * 5.0,
-                            8.0 + move1 * 3.0 + move2 * 7.0,
-                            2.0 + move1 * -6.0 + move2 * 10.0,
-                        );
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
-                            * Quaternion::rotation_y(move1 * -1.2 + move2 * -2.5)
-                            * Quaternion::rotation_z(move2 * 1.5);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
-                    Some(ToolKind::Hammer)
-                    | Some(ToolKind::HammerSimple)
-                    | Some(ToolKind::Pick) => {
-                        next.control_l.position = Vec3::new(
-                            -7.0,
-                            8.0 + move1 * -4.0 + move2 * 4.0,
-                            2.0 + move1 * 16.0 + move2 * -19.0,
-                        );
-                        next.control_l.orientation =
-                            Quaternion::rotation_x(-0.3 + move1 * 1.9 + move2 * -3.0)
-                                * Quaternion::rotation_y(0.0)
-                                * Quaternion::rotation_z(0.0);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
+                        * Quaternion::rotation_y(move1 * -1.2 + move2 * -1.5)
+                        * Quaternion::rotation_z(move2 * 1.5);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                Some(ToolKind::Axe) => {
+                    next.control_l.position = Vec3::new(
+                        -7.0 + move2 * 5.0,
+                        8.0 + move1 * 3.0 + move2 * 7.0,
+                        2.0 + move1 * -6.0 + move2 * 10.0,
+                    );
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
+                        * Quaternion::rotation_y(move1 * -1.2 + move2 * -2.5)
+                        * Quaternion::rotation_z(move2 * 1.5);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
+                    next.control_l.position = Vec3::new(
+                        -7.0,
+                        8.0 + move1 * -4.0 + move2 * 4.0,
+                        2.0 + move1 * 16.0 + move2 * -19.0,
+                    );
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(-0.3 + move1 * 1.9 + move2 * -3.0)
+                            * Quaternion::rotation_y(0.0)
+                            * Quaternion::rotation_z(0.0);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
 
-                    _ => {},
-                }
+                _ => {},
             },
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+            (None | Some(Hands::One), Some(Hands::One)) => {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                         next.control_r.position = Vec3::new(7.0 + move2 * 8.0, 8.0, 2.0);
diff --git a/voxygen/anim/src/character/beta.rs b/voxygen/anim/src/character/beta.rs
index d6d977e9a5..1b1c834336 100644
--- a/voxygen/anim/src/character/beta.rs
+++ b/voxygen/anim/src/character/beta.rs
@@ -6,6 +6,7 @@ use common::{
     comp::item::{Hands, ToolKind},
     states::utils::{AbilityInfo, StageSection},
 };
+use std::f32::consts::PI;
 
 pub struct BetaAnimation;
 
@@ -49,29 +50,96 @@ impl Animation for BetaAnimation {
             Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
             _ => (0.0, 0.0, 0.0),
         };
-
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
         next.main.position = Vec3::new(0.0, 0.0, 0.0);
         next.main.orientation = Quaternion::rotation_x(0.0);
 
-        next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
-        next.hand_l.orientation =
-            Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-        next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
-        next.hand_r.orientation =
-            Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+        match ability_info.and_then(|a| a.tool) {
+            Some(ToolKind::Sword) => {
+                next.chest.orientation = Quaternion::rotation_x(0.15)
+                    * Quaternion::rotation_y((-0.1) * (1.0 - move3))
+                    * Quaternion::rotation_z((0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3));
+                next.head.orientation = Quaternion::rotation_z(-0.4 + move1 * -1.0 + move2 * 1.5);
+            },
+            _ => {},
+        }
+        match hands {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
 
-        next.control.position = Vec3::new(
-            s_a.sc.0 + (-1.4 + move1 * -3.0 + move2 * -2.0) * (1.0 - move3),
-            s_a.sc.1 + (-1.4 + move1 * 3.0 + move2 * 3.0) * (1.0 - move3),
-            s_a.sc.2 + (-1.9 + move1 * 2.5 * (1.0 - move3)),
-        );
-        next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + (-1.7) * (1.0 - move3))
-            * Quaternion::rotation_y(s_a.sc.4 + (0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3))
-            * Quaternion::rotation_z(s_a.sc.5 + (1.67 + move2 * 1.57) * (1.0 - move3));
-        next.chest.orientation = Quaternion::rotation_x(0.15)
-            * Quaternion::rotation_y((-0.1) * (1.0 - move3))
-            * Quaternion::rotation_z((0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3));
-        next.head.orientation = Quaternion::rotation_z((-0.4) * (1.0 - move3));
+                    next.control.position = Vec3::new(
+                        s_a.sc.0 + (-1.4 + move1 * -3.0 + move2 * -2.0) * (1.0 - move3),
+                        s_a.sc.1 + (-1.4 + move1 * 3.0 + move2 * 3.0) * (1.0 - move3),
+                        s_a.sc.2 + (-1.9 + move1 * 2.5 * (1.0 - move3)),
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.sc.3 + (-1.7) * (1.0 - move3))
+                            * Quaternion::rotation_y(
+                                s_a.sc.4 + (0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3),
+                            )
+                            * Quaternion::rotation_z(
+                                s_a.sc.5 + (1.67 + move2 * 1.57) * (1.0 - move3),
+                            );
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.control_l.position = Vec3::new(-12.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(1.7)
+                        * Quaternion::rotation_y(-3.7 + move1 * 0.5)
+                        * Quaternion::rotation_z(3.69);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+
+                _ => {},
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None | Some(Hands::One), Some(Hands::One)) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.control_r.position = Vec3::new(0.0 + move1 * -8.0, 13.0, 2.0);
+                        next.control_r.orientation = Quaternion::rotation_x(1.7)
+                            * Quaternion::rotation_y(-2.3 + move1 * -1.3)
+                            * Quaternion::rotation_z(3.69);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
 
         next
     }
diff --git a/voxygen/anim/src/character/jump.rs b/voxygen/anim/src/character/jump.rs
index fae86e1af7..7702dd9f2f 100644
--- a/voxygen/anim/src/character/jump.rs
+++ b/voxygen/anim/src/character/jump.rs
@@ -34,13 +34,9 @@ impl Animation for JumpAnimation {
         let mut next = (*skeleton).clone();
         let slow = (anim_time * 7.0).sin();
 
-        let random =
-            ((((2.0 * ((global_time - anim_time) - ((global_time - anim_time).round()))).abs())
-                * 10.0)
-                .round())
-                / 10.0;
-
-        let switch = if random > 0.5 { 1.0 } else { -1.0 };
+        let subtract = global_time - anim_time as f32;
+        let check = subtract - subtract.trunc();
+        let switch = (check - 0.5).signum();
 
         let speed = Vec2::<f32>::from(velocity).magnitude();
         let speednorm = (speed / 10.0).min(1.0);
@@ -90,7 +86,7 @@ impl Animation for JumpAnimation {
         next.shorts.orientation =
             Quaternion::rotation_x(speednorm * 0.5) * Quaternion::rotation_z(tilt * 3.0);
 
-        if random > 0.5 {
+        if switch > 0.0 {
             next.hand_l.position = Vec3::new(
                 -s_a.hand.0,
                 1.0 + s_a.hand.1 + 4.0,
@@ -194,11 +190,33 @@ impl Animation for JumpAnimation {
         next.torso.orientation = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0 * s_a.scaler;
 
+        match hands {
+            (Some(Hands::One), _) => match active_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.main.position = Vec3::new(-4.0, -5.0, 10.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
+
+                _ => {},
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.orientation =
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
         next.second.scale = match hands {
-            (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
+            (Some(Hands::One) | None, Some(Hands::One)) => Vec3::one(),
             (_, _) => Vec3::zero(),
         };
-
         next
     }
 }
diff --git a/voxygen/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs
index e5af095266..2c2553ccc1 100644
--- a/voxygen/anim/src/character/leapmelee.rs
+++ b/voxygen/anim/src/character/leapmelee.rs
@@ -169,38 +169,34 @@ impl Animation for LeapAnimation {
         };
 
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match ability_info.and_then(|a| a.tool) {
-                    Some(ToolKind::Axe) => {
-                        next.control_l.position =
-                            Vec3::new(-7.0 + move3 * 4.0, 8.0 + move3 * 8.0, 2.0 + move3 * -4.0);
-                        next.control_l.orientation =
-                            Quaternion::rotation_x(-0.3 + move2 * 1.0 + move3 * -2.0)
-                                * Quaternion::rotation_y(move2 * -0.5 + move3 * 1.9);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
-                    Some(ToolKind::Hammer)
-                    | Some(ToolKind::HammerSimple)
-                    | Some(ToolKind::Pick) => {
-                        next.control_l.position = Vec3::new(
-                            -7.0,
-                            8.0 + move2 * -5.0 + move3 * 9.0,
-                            2.0 + move2 * 8.0 + move3 * -12.0,
-                        );
-                        next.control_l.orientation =
-                            Quaternion::rotation_x(-0.3 + move2 * 1.5 + move3 * -2.5);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Axe) => {
+                    next.control_l.position =
+                        Vec3::new(-7.0 + move3 * 4.0, 8.0 + move3 * 8.0, 2.0 + move3 * -4.0);
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(-0.3 + move2 * 1.0 + move3 * -2.0)
+                            * Quaternion::rotation_y(move2 * -0.5 + move3 * 1.9);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
+                    next.control_l.position = Vec3::new(
+                        -7.0,
+                        8.0 + move2 * -5.0 + move3 * 9.0,
+                        2.0 + move2 * 8.0 + move3 * -12.0,
+                    );
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(-0.3 + move2 * 1.5 + move3 * -2.5);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
 
-                    _ => {},
-                }
+                _ => {},
             },
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+            (None | Some(Hands::One), Some(Hands::One)) => {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Axe) => {
                         next.control_r.position = Vec3::new(
diff --git a/voxygen/anim/src/character/run.rs b/voxygen/anim/src/character/run.rs
index 42970f8f98..68ba2d8a5d 100644
--- a/voxygen/anim/src/character/run.rs
+++ b/voxygen/anim/src/character/run.rs
@@ -253,11 +253,34 @@ impl Animation for RunAnimation {
         next.torso.position = Vec3::new(0.0, 0.0, 0.0) * s_a.scaler;
         next.torso.scale = Vec3::one() / 11.0 * s_a.scaler;
 
-        next.second.scale = match hands {
-            (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
-            (_, _) => Vec3::zero(),
+        match hands {
+            (Some(Hands::One), _) => match active_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.main.position = Vec3::new(-4.0, -5.0, 10.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
+
+                _ => {},
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.orientation =
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                },
+                _ => {},
+            },
+            (_, _) => {},
         };
 
+        next.second.scale = match hands {
+            (Some(Hands::One) | None, Some(Hands::One)) => Vec3::one(),
+            (_, _) => Vec3::zero(),
+        };
         next
     }
 }
diff --git a/voxygen/anim/src/character/spin.rs b/voxygen/anim/src/character/spin.rs
index 74ce5a86c3..48732538de 100644
--- a/voxygen/anim/src/character/spin.rs
+++ b/voxygen/anim/src/character/spin.rs
@@ -29,7 +29,7 @@ impl Animation for SpinAnimation {
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
         (
-            active_tool_kind,
+            _active_tool_kind,
             _second_tool_kind,
             hands,
             _velocity,
@@ -51,68 +51,37 @@ impl Animation for SpinAnimation {
             _ => (0.0, 0.0, 0.0),
         };
         let pullback = 1.0 - movement3;
-        let movement1 = movement1base * pullback;
-        let movement2 = movement2base * pullback;
-
+        let move1 = movement1base * pullback;
+        let move2 = movement2base * pullback;
+        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+        next.second.orientation = Quaternion::rotation_z(0.0);
+        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+        next.main.orientation = Quaternion::rotation_x(0.0);
         next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
 
-        match active_tool_kind {
+        match ability_info.and_then(|a| a.tool) {
             Some(ToolKind::Sword) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-
-                next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                next.control.position = Vec3::new(
-                    s_a.sc.0 + movement1 * 2.0 + movement2 * -12.0 + movement3 * -7.0,
-                    s_a.sc.1 + 8.0 + movement1 * 0.6 + movement2 * -15.0 + movement3 * -10.0,
-                    s_a.sc.2 + 1.0 + movement1 * 0.6 + movement2 * 1.5 + movement3 * -4.0,
-                );
-                next.control.orientation =
-                    Quaternion::rotation_x(-0.5 + s_a.sc.3 + movement1 * -1.2)
-                        * Quaternion::rotation_y(
-                            s_a.sc.4 - 0.6 + movement1 * 0.0 + movement2 * -1.7,
-                        )
-                        * Quaternion::rotation_z(s_a.sc.5 + 0.1 + movement1 * 1.57);
                 next.head.position = Vec3::new(
-                    0.0 + 2.0 + movement2 * -2.0,
-                    2.0 + movement2 * -2.0 + s_a.head.0,
+                    0.0 + 2.0 + move2 * -2.0,
+                    2.0 + move2 * -2.0 + s_a.head.0,
                     s_a.head.1,
                 );
 
-                next.chest.orientation = Quaternion::rotation_x(movement2 * 0.15)
-                    * Quaternion::rotation_y(
-                        movement1 * -0.1 + movement2 * 0.15 + movement3 * -0.1,
-                    )
-                    * Quaternion::rotation_z(
-                        -1.0 + movement1 * -0.6 + movement2 * 1.0 + movement3 * 0.5,
-                    );
+                next.chest.orientation = Quaternion::rotation_x(move2 * -0.15)
+                    * Quaternion::rotation_y(move1 * -0.1 + move2 * 0.15)
+                    * Quaternion::rotation_z(-1.0 + move1 * -0.6 + move2 * 1.6);
 
-                next.belt.orientation = Quaternion::rotation_x(movement1 * 0.1)
-                    * Quaternion::rotation_z(movement2.sin() * 0.5);
+                next.belt.orientation =
+                    Quaternion::rotation_x(move1 * 0.1) * Quaternion::rotation_z(move2.sin() * 0.5);
 
-                next.shorts.orientation = Quaternion::rotation_x(movement1 * 0.1)
-                    * Quaternion::rotation_z(movement2.sin() * 1.5);
+                next.shorts.orientation =
+                    Quaternion::rotation_x(move1 * 0.1) * Quaternion::rotation_z(move2.sin() * 1.5);
 
-                next.head.orientation = Quaternion::rotation_y(movement1 * 0.1 + movement2 * -0.1)
-                    * Quaternion::rotation_z(1.07 + movement1 * 0.4 + movement2 * -1.1);
+                next.head.orientation = Quaternion::rotation_x(move2 * 0.15)
+                    * Quaternion::rotation_z(1.07 + move1 * 0.4 + move2 * -1.5);
             },
 
             Some(ToolKind::Axe) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
-                next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-                next.hand_l.orientation =
-                    Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
-                next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-                next.hand_r.orientation =
-                    Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
-
                 let (movement1, movement2, movement3) = match stage_section {
                     Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
                     Some(StageSection::Swing) => (1.0, anim_time, 0.0),
@@ -120,19 +89,6 @@ impl Animation for SpinAnimation {
                     _ => (0.0, 0.0, 0.0),
                 };
 
-                next.control.position = Vec3::new(
-                    s_a.ac.0 + (-3.0 + movement1 * 0.0 + movement2 * -2.0),
-                    s_a.ac.1 + (-3.5 + movement1 * -4.6 + movement2 * 5.0),
-                    s_a.ac.2 + (-11.0 + movement1 * 10.0 + movement2 * -4.0),
-                );
-                next.control.orientation =
-                    Quaternion::rotation_x(s_a.ac.3 + (-2.6 + movement1 * 0.0 + movement2 * -0.6))
-                        * Quaternion::rotation_y(
-                            s_a.ac.4 + (0.2 + movement1 * -0.5 + movement2 * 0.0),
-                        )
-                        * Quaternion::rotation_z(
-                            s_a.ac.5 + (-0.5 + movement1 * -3.0 + movement2 * 0.5),
-                        );
                 next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
 
                 next.chest.orientation = Quaternion::rotation_x(0.4 + movement2 * -0.5)
@@ -170,9 +126,134 @@ impl Animation for SpinAnimation {
                 );
                 next.foot_r.orientation =
                     Quaternion::rotation_x(movement1 * -0.5 + movement2 * -0.5);
+                next.head.orientation = Quaternion::rotation_x(movement2 * 0.25)
+                    * Quaternion::rotation_z(movement2 * 0.8);
             },
             _ => {},
         }
+        match hands {
+            (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                    next.main.orientation = Quaternion::rotation_x(0.0);
+
+                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+
+                    next.control.position = Vec3::new(
+                        s_a.sc.0 + move1 * 2.0 + move2 * -7.0,
+                        s_a.sc.1 + 8.0 + move1 * 0.6 + move2 * -15.0,
+                        s_a.sc.2 + 1.0 + move1 * 0.6 + move2 * 1.5,
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(-0.5 + s_a.sc.3 + move1 * -1.2)
+                            * Quaternion::rotation_y(s_a.sc.4 - 0.6 + move1 * 0.0 + move2 * -0.2)
+                            * Quaternion::rotation_z(s_a.sc.5 + 0.1 + move1 * 1.57);
+                },
+                Some(ToolKind::Axe) => {
+                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                    next.hand_l.orientation =
+                        Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
+                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                    next.hand_r.orientation =
+                        Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
+                    let (move1, move2, _move3) = match stage_section {
+                        Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
+                        Some(StageSection::Swing) => (1.0, anim_time, 0.0),
+                        Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
+                        _ => (0.0, 0.0, 0.0),
+                    };
+                    next.control.position = Vec3::new(
+                        s_a.ac.0 + move1 * -1.0 + move2 * -2.0,
+                        s_a.ac.1 + move1 * -3.0 + move2 * 3.0,
+                        s_a.ac.2 + move1 * 6.0 + move2 * -15.0,
+                    );
+                    next.control.orientation =
+                        Quaternion::rotation_x(s_a.ac.3 + move1 * 0.0 + move2 * -3.0)
+                            * Quaternion::rotation_y(s_a.ac.4 + move1 * -0.0 + move2 * -0.4)
+                            * Quaternion::rotation_z(s_a.ac.5 + move1 * -2.0 + move2 * -1.0)
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.control_l.position = Vec3::new(-7.0 + move2 * -5.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(1.7)
+                        * Quaternion::rotation_y(-2.7 + move1 * -1.0 + move2 * 2.0)
+                        * Quaternion::rotation_z(1.5 + move1 * PI);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                Some(ToolKind::Axe) => {
+                    next.control_l.position = Vec3::new(
+                        -2.0 + move1 * -5.0,
+                        18.0 + move1 * -10.0,
+                        6.0 + move1 * -10.0,
+                    );
+                    next.control_l.orientation = Quaternion::rotation_x(1.7 + move2 * 1.5)
+                        * Quaternion::rotation_y(-3.7)
+                        * Quaternion::rotation_z(1.5 + move2 * 1.57);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+
+                _ => {},
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None | Some(Hands::One), Some(Hands::One)) => {
+                match ability_info.and_then(|a| a.tool) {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.control_r.position =
+                            Vec3::new(15.0 + move2 * -15.0, 8.0 + move2 * 5.0, 2.0);
+                        next.control_r.orientation = Quaternion::rotation_x(1.7)
+                            * Quaternion::rotation_y(-3.3 + move1 * -1.0 + move2 * 2.0)
+                            * Quaternion::rotation_z(1.5 + move1 * PI);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.control_r.position = Vec3::new(
+                            12.0 + move1 * -10.0,
+                            18.0 + move1 * -10.0,
+                            4.0 + move1 * -2.0,
+                        );
+                        next.control_r.orientation = Quaternion::rotation_x(1.7 + move2 * 1.5)
+                            * Quaternion::rotation_y(-3.3)
+                            * Quaternion::rotation_z(1.5 + move2 * 1.57);
+                        next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                    },
+
+                    _ => {},
+                }
+            },
+            (_, _) => {},
+        };
+
+        match hands {
+            (None, None) | (None, Some(Hands::One)) => {
+                next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
+                next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None, None) | (Some(Hands::One), None) => {
+                next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
+                next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
+            },
+            (_, _) => {},
+        };
         next
     }
 }
diff --git a/voxygen/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs
index edbafc1432..e166079e6d 100644
--- a/voxygen/anim/src/character/spinmelee.rs
+++ b/voxygen/anim/src/character/spinmelee.rs
@@ -30,7 +30,7 @@ impl Animation for SpinMeleeAnimation {
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
         (
-            active_tool_kind,
+            _active_tool_kind,
             _second_tool_kind,
             hands,
             _velocity,
@@ -157,13 +157,15 @@ impl Animation for SpinMeleeAnimation {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) => {
                         next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -0.5)
+                            * Quaternion::rotation_z(move1 * 1.57);
                         next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_l.orientation = Quaternion::rotation_x(1.57)
                     },
                     Some(ToolKind::Axe) => {
                         next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.3)
+                            * Quaternion::rotation_z(move1 * -1.57);
                         next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_l.orientation = Quaternion::rotation_x(1.57)
                     },
@@ -177,14 +179,17 @@ impl Animation for SpinMeleeAnimation {
             (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) => {
-                        next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
-                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.control_r.position = Vec3::new(7.0, 8.0, 2.0 + move1 * 10.0);
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2)
+                            * Quaternion::rotation_y(move1 * 0.8)
+                            * Quaternion::rotation_z(move1 * 1.57);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_r.orientation = Quaternion::rotation_x(1.57)
                     },
                     Some(ToolKind::Axe) => {
                         next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
-                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.2);
+                        next.control_r.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.6)
+                            * Quaternion::rotation_z(move1 * -1.57);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_r.orientation = Quaternion::rotation_x(1.57)
                     },
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index 6dc8cf2dcc..44d45a8a78 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -117,29 +117,25 @@ impl Animation for StandAnimation {
         };
 
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match active_tool_kind {
-                    Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                        next.main.position = Vec3::new(-4.0, -5.0, 10.0);
-                        next.main.orientation =
-                            Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-                    },
+            (Some(Hands::One), _) => match active_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.main.position = Vec3::new(-4.0, -5.0, 10.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
 
-                    _ => {},
-                }
+                _ => {},
             },
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
-                match second_tool_kind {
-                    Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
-                        next.second.position = Vec3::new(4.0, -5.5, 10.0);
-                        next.second.orientation =
-                            Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
-                    },
-                    _ => {},
-                }
+            (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.orientation =
+                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                },
+                _ => {},
             },
             (_, _) => {},
         };
@@ -149,12 +145,10 @@ impl Animation for StandAnimation {
 
         next.torso.position = Vec3::new(0.0, 0.0, 0.0) * s_a.scaler;
         next.second.scale = Vec3::one();
-
         next.second.scale = match hands {
-            (None, Some(Hands::One)) | (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
+            (Some(Hands::One) | None, Some(Hands::One)) => Vec3::one(),
             (_, _) => Vec3::zero(),
         };
-
         next
     }
 }
diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs
index d1db54739c..028a20c560 100644
--- a/voxygen/anim/src/character/wield.rs
+++ b/voxygen/anim/src/character/wield.rs
@@ -48,7 +48,7 @@ impl Animation for WieldAnimation {
         *rate = 1.0;
         let lab: f32 = 1.0;
         let speed = Vec2::<f32>::from(velocity).magnitude();
-
+        let speednorm = speed / 9.5;
         let mut next = (*skeleton).clone();
         let head_look = Vec2::new(
             (global_time + anim_time / 3.0).floor().mul(7331.0).sin() * 0.2,
@@ -102,7 +102,7 @@ impl Animation for WieldAnimation {
         next.second.position = Vec3::new(0.0, 0.0, 0.0);
         next.second.orientation = Quaternion::rotation_z(0.0);
         if speed > 0.2 && velocity.z == 0.0 {
-            next.chest.orientation = Quaternion::rotation_z(short * 0.1 + strafe * 0.7)
+            next.chest.orientation = Quaternion::rotation_z(short * 0.1 + strafe * 0.7 * speednorm)
                 * Quaternion::rotation_y(strafe * 0.2)
                 * Quaternion::rotation_x(((direction * 0.8).min(0.3)) * (1.0 - tilt.abs()));
             next.head.orientation =
@@ -345,7 +345,7 @@ impl Animation for WieldAnimation {
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
+            (Some(Hands::One), _) => {
                 next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
                 next.control_l.orientation = Quaternion::rotation_x(-0.3);
                 next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
@@ -354,7 +354,7 @@ impl Animation for WieldAnimation {
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+            (None | Some(Hands::One), Some(Hands::One)) => {
                 next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
                 next.control_r.orientation = Quaternion::rotation_x(-0.3);
                 next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 3ddc0416b0..d794f37f49 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -1161,29 +1161,21 @@ impl FigureMgr {
                             )
                         },
                         CharacterState::LeapMelee(s) => {
-                            let stage_progress = match active_tool_kind {
-                                Some(ToolKind::Axe | ToolKind::Hammer) => {
-                                    let stage_time = s.timer.as_secs_f32();
-                                    match s.stage_section {
-                                        StageSection::Buildup => {
-                                            stage_time
-                                                / s.static_data.buildup_duration.as_secs_f32()
-                                        },
-                                        StageSection::Movement => {
-                                            stage_time
-                                                / s.static_data.movement_duration.as_secs_f32()
-                                        },
-                                        StageSection::Swing => {
-                                            stage_time / s.static_data.swing_duration.as_secs_f32()
-                                        },
-                                        StageSection::Recover => {
-                                            stage_time
-                                                / s.static_data.recover_duration.as_secs_f32()
-                                        },
-                                        _ => 0.0,
-                                    }
+                            let stage_time = s.timer.as_secs_f32();
+                            let stage_progress = match s.stage_section {
+                                StageSection::Buildup => {
+                                    stage_time / s.static_data.buildup_duration.as_secs_f32()
                                 },
-                                _ => state.state_time,
+                                StageSection::Movement => {
+                                    stage_time / s.static_data.movement_duration.as_secs_f32()
+                                },
+                                StageSection::Swing => {
+                                    stage_time / s.static_data.swing_duration.as_secs_f32()
+                                },
+                                StageSection::Recover => {
+                                    stage_time / s.static_data.recover_duration.as_secs_f32()
+                                },
+                                _ => 0.0,
                             };
 
                             anim::character::LeapAnimation::update_skeleton(
@@ -1203,25 +1195,18 @@ impl FigureMgr {
                             )
                         },
                         CharacterState::SpinMelee(s) => {
-                            let stage_progress = match active_tool_kind {
-                                Some(ToolKind::Axe | ToolKind::Sword) => {
-                                    let stage_time = s.timer.as_secs_f32();
-                                    match s.stage_section {
-                                        StageSection::Buildup => {
-                                            stage_time
-                                                / s.static_data.buildup_duration.as_secs_f32()
-                                        },
-                                        StageSection::Swing => {
-                                            stage_time / s.static_data.swing_duration.as_secs_f32()
-                                        },
-                                        StageSection::Recover => {
-                                            stage_time
-                                                / s.static_data.recover_duration.as_secs_f32()
-                                        },
-                                        _ => 0.0,
-                                    }
+                            let stage_time = s.timer.as_secs_f32();
+                            let stage_progress = match s.stage_section {
+                                StageSection::Buildup => {
+                                    stage_time / s.static_data.buildup_duration.as_secs_f32()
                                 },
-                                _ => state.state_time,
+                                StageSection::Swing => {
+                                    stage_time / s.static_data.swing_duration.as_secs_f32()
+                                },
+                                StageSection::Recover => {
+                                    stage_time / s.static_data.recover_duration.as_secs_f32()
+                                },
+                                _ => 0.0,
                             };
 
                             anim::character::SpinMeleeAnimation::update_skeleton(

From ce168a17f7b59b3eef3cf29ad9d9c18f7392cee3 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 13 Apr 2021 02:50:30 -0400
Subject: [PATCH 08/11] loot tables, clippy, animation tweaks

---
 assets/common/abilities/axe/leap.ron          |  2 +-
 assets/common/abilities/axe/spin.ron          |  2 +-
 assets/common/abilities/hammer/charged.ron    |  2 +-
 assets/common/abilities/hammer/leap.ron       |  2 +-
 assets/common/abilities/sword/dash.ron        |  6 +-
 .../loot_tables/weapons/axe/bloodsteel.ron    |  4 +
 .../common/loot_tables/weapons/axe/bronze.ron |  4 +
 .../common/loot_tables/weapons/axe/cobalt.ron |  4 +
 .../common/loot_tables/weapons/axe/iron.ron   |  6 ++
 .../common/loot_tables/weapons/axe/steel.ron  |  5 ++
 .../loot_tables/weapons/hammer/bloodsteel.ron |  4 +
 .../loot_tables/weapons/hammer/bronze.ron     |  4 +
 .../loot_tables/weapons/hammer/cobalt.ron     |  4 +
 .../loot_tables/weapons/hammer/iron.ron       |  5 ++
 .../loot_tables/weapons/hammer/steel.ron      |  5 ++
 .../loot_tables/weapons/hammer/stone.ron      |  4 +
 .../loot_tables/weapons/sword/bloodsteel.ron  |  5 ++
 .../loot_tables/weapons/sword/bronze.ron      |  5 ++
 .../loot_tables/weapons/sword/cobalt.ron      |  6 ++
 .../common/loot_tables/weapons/sword/iron.ron |  7 ++
 .../loot_tables/weapons/sword/steel.ron       |  6 ++
 assets/voxygen/i18n/es_ES/skills.ron          |  2 +-
 assets/voxygen/i18n/fr_FR/skills.ron          |  2 +-
 assets/voxygen/i18n/ja_JP/skills.ron          |  2 +-
 assets/voxygen/i18n/pt_BR/skills.ron          |  2 +-
 assets/voxygen/i18n/uk_UA/skills.ron          |  2 +-
 .../voxygen/voxel/biped_weapon_manifest.ron   | 32 ++++----
 common/src/comp/ability.rs                    |  2 +-
 voxygen/anim/src/character/alpha.rs           | 41 ++++------
 voxygen/anim/src/character/beta.rs            | 41 ++++------
 voxygen/anim/src/character/chargeswing.rs     | 63 ++++++---------
 voxygen/anim/src/character/dash.rs            | 33 ++++----
 voxygen/anim/src/character/idle.rs            | 80 ++++++++++---------
 voxygen/anim/src/character/jump.rs            |  4 +-
 voxygen/anim/src/character/leapmelee.rs       | 30 +++----
 voxygen/anim/src/character/run.rs             |  4 +-
 voxygen/anim/src/character/sit.rs             | 53 ++++++------
 voxygen/anim/src/character/spin.rs            | 27 +++----
 voxygen/anim/src/character/spinmelee.rs       | 29 +++----
 voxygen/anim/src/character/stand.rs           |  3 +-
 voxygen/anim/src/character/swim.rs            | 22 +++++
 voxygen/src/scene/figure/mod.rs               | 26 +-----
 42 files changed, 304 insertions(+), 288 deletions(-)

diff --git a/assets/common/abilities/axe/leap.ron b/assets/common/abilities/axe/leap.ron
index 50cf49564b..c59b733465 100644
--- a/assets/common/abilities/axe/leap.ron
+++ b/assets/common/abilities/axe/leap.ron
@@ -1,5 +1,5 @@
 LeapMelee(
-    energy_cost: 0,
+    energy_cost: 450,
     buildup_duration: 0.2,
     movement_duration: 0.2,
     swing_duration: 0.2,
diff --git a/assets/common/abilities/axe/spin.ron b/assets/common/abilities/axe/spin.ron
index 906396fb05..c638a62ad2 100644
--- a/assets/common/abilities/axe/spin.ron
+++ b/assets/common/abilities/axe/spin.ron
@@ -7,7 +7,7 @@ SpinMelee(
     knockback: ( strength: 0.0, direction: Away),
     range: 3.5,
     damage_effect: None,
-    energy_cost: 0,
+    energy_cost: 100,
     is_infinite: true,
     movement_behavior: AxeHover,
     is_interruptible: false,
diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron
index a854d6aa4f..978143195e 100644
--- a/assets/common/abilities/hammer/charged.ron
+++ b/assets/common/abilities/hammer/charged.ron
@@ -1,6 +1,6 @@
 ChargedMelee(
     energy_cost: 1,
-    energy_drain: 0,
+    energy_drain: 300,
     initial_damage: 10,
     scaled_damage: 160,
     initial_poise_damage: 60,
diff --git a/assets/common/abilities/hammer/leap.ron b/assets/common/abilities/hammer/leap.ron
index 41a02ac25c..47f90adb77 100644
--- a/assets/common/abilities/hammer/leap.ron
+++ b/assets/common/abilities/hammer/leap.ron
@@ -1,5 +1,5 @@
 LeapMelee(
-    energy_cost: 0,
+    energy_cost: 700,
     buildup_duration: 0.1,
     movement_duration: 0.8,
     swing_duration: 0.15,
diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron
index 810160a61d..f66177b7c4 100644
--- a/assets/common/abilities/sword/dash.ron
+++ b/assets/common/abilities/sword/dash.ron
@@ -1,5 +1,5 @@
 DashMelee(
-    energy_cost: 0,
+    energy_cost: 100,
     base_damage: 80,
     scaled_damage: 160,
     base_poise_damage: 60,
@@ -8,8 +8,8 @@ DashMelee(
     scaled_knockback: 7.0,
     range: 5.0,
     angle: 45.0,
-    energy_drain: 0,
-    forward_speed: 4.0,
+    energy_drain: 600,
+    forward_speed: 3.0,
     buildup_duration: 0.25,
     charge_duration: 0.6,
     swing_duration: 0.1,
diff --git a/assets/common/loot_tables/weapons/axe/bloodsteel.ron b/assets/common/loot_tables/weapons/axe/bloodsteel.ron
index 6bea84d63c..adbff0c596 100644
--- a/assets/common/loot_tables/weapons/axe/bloodsteel.ron
+++ b/assets/common/loot_tables/weapons/axe/bloodsteel.ron
@@ -1,5 +1,9 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.axe.bloodsteel_axe-0")),
     (1.0, Item("common.items.weapons.axe.bloodsteel_axe-1")),
     (1.0, Item("common.items.weapons.axe.bloodsteel_axe-2")),
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.bloodsteel-0")),
+    (1.0, Item("common.items.weapons.axe_1h.bloodsteel-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/axe/bronze.ron b/assets/common/loot_tables/weapons/axe/bronze.ron
index 9cfe1fd020..e2c93f9d34 100644
--- a/assets/common/loot_tables/weapons/axe/bronze.ron
+++ b/assets/common/loot_tables/weapons/axe/bronze.ron
@@ -1,5 +1,9 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.axe.bronze_axe-0")),
     (1.0, Item("common.items.weapons.axe.bronze_axe-1")),
     (1.0, Item("common.items.weapons.axe.bronze_axe-2")),
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.bronze-0")),
+    (1.0, Item("common.items.weapons.axe_1h.bronze-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/axe/cobalt.ron b/assets/common/loot_tables/weapons/axe/cobalt.ron
index 706962b998..2ca2be4477 100644
--- a/assets/common/loot_tables/weapons/axe/cobalt.ron
+++ b/assets/common/loot_tables/weapons/axe/cobalt.ron
@@ -1,4 +1,8 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.axe.cobalt_axe-0")),
     (1.0, Item("common.items.weapons.axe.cobalt_axe-1")),
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.cobalt-0")),
+    (1.0, Item("common.items.weapons.axe_1h.cobalt-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/axe/iron.ron b/assets/common/loot_tables/weapons/axe/iron.ron
index 1acdbf400f..d4bfd40345 100644
--- a/assets/common/loot_tables/weapons/axe/iron.ron
+++ b/assets/common/loot_tables/weapons/axe/iron.ron
@@ -1,4 +1,5 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.axe.iron_axe-0")),
     (1.0, Item("common.items.weapons.axe.iron_axe-1")),
     (1.0, Item("common.items.weapons.axe.iron_axe-2")),
@@ -9,4 +10,9 @@
     (1.0, Item("common.items.weapons.axe.iron_axe-7")),
     (1.0, Item("common.items.weapons.axe.iron_axe-8")),
     (1.0, Item("common.items.weapons.axe.iron_axe-9")),
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.iron-0")),
+    (1.0, Item("common.items.weapons.axe_1h.iron-1")),
+    (1.0, Item("common.items.weapons.axe_1h.iron-2")),
+    (1.0, Item("common.items.weapons.axe_1h.iron-3")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/axe/steel.ron b/assets/common/loot_tables/weapons/axe/steel.ron
index 5288490d5a..60e2fc5d67 100644
--- a/assets/common/loot_tables/weapons/axe/steel.ron
+++ b/assets/common/loot_tables/weapons/axe/steel.ron
@@ -1,4 +1,5 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.axe.steel_axe-0")),
     (1.0, Item("common.items.weapons.axe.steel_axe-1")),
     (1.0, Item("common.items.weapons.axe.steel_axe-2")),
@@ -6,4 +7,8 @@
     (1.0, Item("common.items.weapons.axe.steel_axe-4")),
     (1.0, Item("common.items.weapons.axe.steel_axe-5")),
     (1.0, Item("common.items.weapons.axe.steel_axe-6")),
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.steel-0")),
+    (1.0, Item("common.items.weapons.axe_1h.steel-1")),
+    (1.0, Item("common.items.weapons.axe_1h.steel-2")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/hammer/bloodsteel.ron b/assets/common/loot_tables/weapons/hammer/bloodsteel.ron
index 72d10c43b0..6a32d42de7 100644
--- a/assets/common/loot_tables/weapons/hammer/bloodsteel.ron
+++ b/assets/common/loot_tables/weapons/hammer/bloodsteel.ron
@@ -1,4 +1,8 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.hammer.runic_hammer")),
     (1.0, Item("common.items.weapons.hammer.ramshead_hammer")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.bloodsteel-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.bloodsteel-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/hammer/bronze.ron b/assets/common/loot_tables/weapons/hammer/bronze.ron
index f5bd4c550e..62dd121468 100644
--- a/assets/common/loot_tables/weapons/hammer/bronze.ron
+++ b/assets/common/loot_tables/weapons/hammer/bronze.ron
@@ -1,4 +1,8 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.hammer.bronze_hammer-0")),
     (1.0, Item("common.items.weapons.hammer.bronze_hammer-1")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.bronze-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.bronze-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/hammer/cobalt.ron b/assets/common/loot_tables/weapons/hammer/cobalt.ron
index bdd436bf89..122ca13746 100644
--- a/assets/common/loot_tables/weapons/hammer/cobalt.ron
+++ b/assets/common/loot_tables/weapons/hammer/cobalt.ron
@@ -1,4 +1,8 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.hammer.cobalt_hammer-0")),
     (1.0, Item("common.items.weapons.hammer.cobalt_hammer-1")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.cobalt-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.cobalt-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/hammer/iron.ron b/assets/common/loot_tables/weapons/hammer/iron.ron
index e2aba04a42..1279307efd 100644
--- a/assets/common/loot_tables/weapons/hammer/iron.ron
+++ b/assets/common/loot_tables/weapons/hammer/iron.ron
@@ -1,4 +1,5 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.hammer.iron_hammer-0")),
     (1.0, Item("common.items.weapons.hammer.iron_hammer-1")),
     (1.0, Item("common.items.weapons.hammer.iron_hammer-2")),
@@ -8,4 +9,8 @@
     (1.0, Item("common.items.weapons.hammer.iron_hammer-6")),
     (1.0, Item("common.items.weapons.hammer.iron_hammer-7")),
     (1.0, Item("common.items.weapons.hammer.iron_hammer-8")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.iron-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.iron-1")),
+    (1.0, Item("common.items.weapons.hammer_1h.iron-2")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/hammer/steel.ron b/assets/common/loot_tables/weapons/hammer/steel.ron
index c607bf58f5..cf80e69cf1 100644
--- a/assets/common/loot_tables/weapons/hammer/steel.ron
+++ b/assets/common/loot_tables/weapons/hammer/steel.ron
@@ -1,8 +1,13 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.hammer.steel_hammer-0")),
     (1.0, Item("common.items.weapons.hammer.steel_hammer-1")),
     (1.0, Item("common.items.weapons.hammer.steel_hammer-2")),
     (1.0, Item("common.items.weapons.hammer.steel_hammer-3")),
     (1.0, Item("common.items.weapons.hammer.steel_hammer-4")),
     (1.0, Item("common.items.weapons.hammer.steel_hammer-5")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.steel-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.steel-1")),
+    (1.0, Item("common.items.weapons.hammer_1h.steel-2")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/hammer/stone.ron b/assets/common/loot_tables/weapons/hammer/stone.ron
index f1f5d6df25..ec7db4d7d8 100644
--- a/assets/common/loot_tables/weapons/hammer/stone.ron
+++ b/assets/common/loot_tables/weapons/hammer/stone.ron
@@ -1,6 +1,10 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.hammer.stone_hammer-0")),
     (1.0, Item("common.items.weapons.hammer.stone_hammer-1")),
     (1.0, Item("common.items.weapons.hammer.stone_hammer-2")),
     (1.0, Item("common.items.weapons.hammer.stone_hammer-3")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.stone-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.stone-1")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/sword/bloodsteel.ron b/assets/common/loot_tables/weapons/sword/bloodsteel.ron
index da08d3a973..6bc6d34af0 100644
--- a/assets/common/loot_tables/weapons/sword/bloodsteel.ron
+++ b/assets/common/loot_tables/weapons/sword/bloodsteel.ron
@@ -1,5 +1,10 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.sword.bloodsteel-0")),
     (1.0, Item("common.items.weapons.sword.bloodsteel-1")),
     (1.0, Item("common.items.weapons.sword.bloodsteel-2")),
+    //1h
+    (1.0, Item("common.items.weapons.sword_1h.bloodsteel-0")),
+    (1.0, Item("common.items.weapons.sword_1h.bloodsteel-1")),
+    (1.0, Item("common.items.weapons.sword_1h.bloodsteel-2")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/sword/bronze.ron b/assets/common/loot_tables/weapons/sword/bronze.ron
index 5ab30d738f..b100474511 100644
--- a/assets/common/loot_tables/weapons/sword/bronze.ron
+++ b/assets/common/loot_tables/weapons/sword/bronze.ron
@@ -1,5 +1,10 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.sword.bronze-0")),
     (1.0, Item("common.items.weapons.sword.bronze-1")),
     (1.0, Item("common.items.weapons.sword.bronze-2")),
+    //1h
+    (1.0, Item("common.items.weapons.sword_1h.bronze-0")),
+    (1.0, Item("common.items.weapons.sword_1h.bronze-1")),
+    (1.0, Item("common.items.weapons.sword_1h.bronze-2")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/sword/cobalt.ron b/assets/common/loot_tables/weapons/sword/cobalt.ron
index fe77f59554..9f3c3353c6 100644
--- a/assets/common/loot_tables/weapons/sword/cobalt.ron
+++ b/assets/common/loot_tables/weapons/sword/cobalt.ron
@@ -1,6 +1,12 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.sword.cobalt-0")),
     (1.0, Item("common.items.weapons.sword.cobalt-1")),
     (1.0, Item("common.items.weapons.sword.cobalt-2")),
     (1.0, Item("common.items.weapons.sword.cobalt-3")),
+    //1h
+    (1.0, Item("common.items.weapons.sword_1h.cobalt-0")),
+    (1.0, Item("common.items.weapons.sword_1h.cobalt-1")),
+    (1.0, Item("common.items.weapons.sword_1h.cobalt-2")),
+    (1.0, Item("common.items.weapons.sword_1h.cobalt-3")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/sword/iron.ron b/assets/common/loot_tables/weapons/sword/iron.ron
index ae2b6b13c8..b79a486bcd 100644
--- a/assets/common/loot_tables/weapons/sword/iron.ron
+++ b/assets/common/loot_tables/weapons/sword/iron.ron
@@ -1,4 +1,5 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.sword.iron-0")),
     (1.0, Item("common.items.weapons.sword.iron-1")),
     (1.0, Item("common.items.weapons.sword.iron-2")),
@@ -10,4 +11,10 @@
     (1.0, Item("common.items.weapons.sword.iron-8")),
     (1.0, Item("common.items.weapons.sword.iron-9")),
     (1.0, Item("common.items.weapons.sword.iron-10")),
+    //1h
+    (1.0, Item("common.items.weapons.sword_1h.iron-0")),
+    (1.0, Item("common.items.weapons.sword_1h.iron-1")),
+    (1.0, Item("common.items.weapons.sword_1h.iron-2")),
+    (1.0, Item("common.items.weapons.sword_1h.iron-3")),
+    (1.0, Item("common.items.weapons.sword_1h.iron-4")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/weapons/sword/steel.ron b/assets/common/loot_tables/weapons/sword/steel.ron
index c672fdf04f..966afa2bec 100644
--- a/assets/common/loot_tables/weapons/sword/steel.ron
+++ b/assets/common/loot_tables/weapons/sword/steel.ron
@@ -1,4 +1,5 @@
 [
+    //2h
     (1.0, Item("common.items.weapons.sword.steel-0")),
     (1.0, Item("common.items.weapons.sword.steel-1")),
     (1.0, Item("common.items.weapons.sword.steel-2")),
@@ -8,4 +9,9 @@
     (1.0, Item("common.items.weapons.sword.steel-6")),
     (1.0, Item("common.items.weapons.sword.steel-7")),
     (1.0, Item("common.items.weapons.sword.steel-8")),
+    //1h
+    (1.0, Item("common.items.weapons.sword_1h.steel-0")),
+    (1.0, Item("common.items.weapons.sword_1h.steel-1")),
+    (1.0, Item("common.items.weapons.sword_1h.steel-2")),
+    (1.0, Item("common.items.weapons.sword_1h.steel-3")),
 ]
\ No newline at end of file
diff --git a/assets/voxygen/i18n/es_ES/skills.ron b/assets/voxygen/i18n/es_ES/skills.ron
index 8a4f52cafb..1568bc0762 100644
--- a/assets/voxygen/i18n/es_ES/skills.ron
+++ b/assets/voxygen/i18n/es_ES/skills.ron
@@ -190,7 +190,7 @@
         "hud.skill.sw_dash_cost_title": "Coste de Atravesar",
         "hud.skill.sw_dash_cost": "Disminuye el coste inicial de Atravesar en un 25%{SP}",
         "hud.skill.sw_dash_speed_title": "Velocidad de Atravesar",
-        "hud.skill.sw_dash_speed": "Aumenta la velocidad al atravesar en un 30%{SP}",
+        "hud.skill.sw_dash_speed": "Aumenta la velocidad al atravesar en un 15%{SP}",
         "hud.skill.sw_dash_inf_title": "Atravesar Infinito",
         "hud.skill.sw_dash_inf": "Te permite hacer atravesar durante todo el tiempo que tengas energía{SP}",
         "hud.skill.sw_dash_scale_title": "Intensidad de daño de Atravesar",
diff --git a/assets/voxygen/i18n/fr_FR/skills.ron b/assets/voxygen/i18n/fr_FR/skills.ron
index da97133bce..b009792aee 100644
--- a/assets/voxygen/i18n/fr_FR/skills.ron
+++ b/assets/voxygen/i18n/fr_FR/skills.ron
@@ -190,7 +190,7 @@
         "hud.skill.sw_dash_cost_title": "Coût d'Endurance de la Ruée",
         "hud.skill.sw_dash_cost": "Diminue de 25% le coût en endurance initial de la ruée{SP}",
         "hud.skill.sw_dash_speed_title": "Vitesse de la Ruée",
-        "hud.skill.sw_dash_speed": "Augmente de 30% la vitesse de course durant la ruée{SP}",
+        "hud.skill.sw_dash_speed": "Augmente de 15% la vitesse de course durant la ruée{SP}",
         "hud.skill.sw_dash_inf_title": "Ruée Infinie",
         "hud.skill.sw_dash_inf": "Vous permet de vous élancer en ruée tant que vous avez de l'endurance{SP}",
         "hud.skill.sw_dash_scale_title": "Progression des Dégâts de la Ruée",
diff --git a/assets/voxygen/i18n/ja_JP/skills.ron b/assets/voxygen/i18n/ja_JP/skills.ron
index 4900dba81a..de6cd0b734 100644
--- a/assets/voxygen/i18n/ja_JP/skills.ron
+++ b/assets/voxygen/i18n/ja_JP/skills.ron
@@ -190,7 +190,7 @@
         "hud.skill.sw_dash_cost_title": "ダッシュ コスト",
         "hud.skill.sw_dash_cost": "ダッシュ攻撃の初期スタミナ消費を25%減少 {SP}",
         "hud.skill.sw_dash_speed_title": "ダッシュ 速度",
-        "hud.skill.sw_dash_speed": "ダッシュ攻撃の速度を30%増加 {SP}",
+        "hud.skill.sw_dash_speed": "ダッシュ攻撃の速度を15%増加 {SP}",
         "hud.skill.sw_dash_inf_title": "無限ダッシュ攻撃",
         "hud.skill.sw_dash_inf": "エネルギーの続く限りダッシュ攻撃する {SP}",
         "hud.skill.sw_dash_scale_title": "ダッシュ ダメージ増量",
diff --git a/assets/voxygen/i18n/pt_BR/skills.ron b/assets/voxygen/i18n/pt_BR/skills.ron
index 08fdc5a3fe..28981ac47a 100644
--- a/assets/voxygen/i18n/pt_BR/skills.ron
+++ b/assets/voxygen/i18n/pt_BR/skills.ron
@@ -186,7 +186,7 @@
         "hud.skill.sw_dash_cost_title": "Custo da Investida",
         "hud.skill.sw_dash_cost": "Reduz custo inicial da investida em 25%{SP}",
         "hud.skill.sw_dash_speed_title": "Velocidade de Investida",
-        "hud.skill.sw_dash_speed": "Aumenta a velocidade durante a investida em 30%{SP}",
+        "hud.skill.sw_dash_speed": "Aumenta a velocidade durante a investida em 15%{SP}",
         "hud.skill.sw_dash_inf_title": "Investida do Infinito",
         "hud.skill.sw_dash_inf": "Você consegue investir contanto que possua energia para tal{SP}",
         "hud.skill.sw_dash_scale_title": "Investida Acumulada",
diff --git a/assets/voxygen/i18n/uk_UA/skills.ron b/assets/voxygen/i18n/uk_UA/skills.ron
index d2886cbaab..9eeaf039f5 100644
--- a/assets/voxygen/i18n/uk_UA/skills.ron
+++ b/assets/voxygen/i18n/uk_UA/skills.ron
@@ -195,7 +195,7 @@
         "hud.skill.sw_dash_cost_title": "Енергозатрати на випад",
         "hud.skill.sw_dash_cost": "Зменшує початкову енергетичну ціну випаду на 25%{SP}",
         "hud.skill.sw_dash_speed_title": "Швидкість випаду",
-        "hud.skill.sw_dash_speed": "Збільшує швидкість руху під час випаду 30%{SP}",
+        "hud.skill.sw_dash_speed": "Збільшує швидкість руху під час випаду 15%{SP}",
         "hud.skill.sw_dash_inf_title": "Необмежений випад",
         "hud.skill.sw_dash_inf": "Дозволяє нестись в випаді доки не закінчиться енергія{SP}",
         "hud.skill.sw_dash_scale_title": "Приріст ушкодження випадом",
diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index 9233487f66..1a69cb2f35 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -613,67 +613,67 @@
         color: None
     ),
     "common.items.weapons.hammer_1h.bloodsteel-1": (
-        vox_spec: ("weapon.hammer_1h.bloodsteel-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.bloodsteel-1", (-2.5, -5.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.bronze-0": (
-        vox_spec: ("weapon.hammer_1h.bronze-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.bronze-0", (-3.5, -4.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.bronze-1": (
-        vox_spec: ("weapon.hammer_1h.bronze-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.bronze-1", (-2.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.cobalt-0": (
-        vox_spec: ("weapon.hammer_1h.cobalt-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.cobalt-0", (-2.5, -4.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.cobalt-1": (
-        vox_spec: ("weapon.hammer_1h.cobalt-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.cobalt-1", (-2.5, -4.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.iron-0": (
-        vox_spec: ("weapon.hammer_1h.iron-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.iron-0", (-2.5, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.iron-1": (
-        vox_spec: ("weapon.hammer_1h.iron-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.iron-1", (-2.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.iron-2": (
-        vox_spec: ("weapon.hammer_1h.iron-2", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.iron-2", (-2.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.orichalcum-0": (
-        vox_spec: ("weapon.hammer_1h.orichalcum-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.orichalcum-0", (-1.5, -4.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.steel-0": (
-        vox_spec: ("weapon.hammer_1h.steel-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.steel-0", (-2.5, -4.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.steel-1": (
-        vox_spec: ("weapon.hammer_1h.steel-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.steel-1", (-2.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.steel-2": (
-        vox_spec: ("weapon.hammer_1h.steel-2", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.steel-2", (-2.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.stone-0": (
-        vox_spec: ("weapon.hammer_1h.stone-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.stone-0", (-2.5, -3.5, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.stone-1": (
-        vox_spec: ("weapon.hammer_1h.stone-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.stone-1", (-2.5, -4.5, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.wood-0": (
-        vox_spec: ("weapon.hammer_1h.wood-0", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.wood-0", (-3.0, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.hammer_1h.wood-1": (
-        vox_spec: ("weapon.hammer_1h.wood-1", (-1.5, -5.0, -6.0)),
+        vox_spec: ("weapon.hammer_1h.wood-1", (-2.5, -3.0, -3.0)),
         color: None
     ),
     // Daggers
diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index 9f31741fcf..3e66a0a569 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -667,7 +667,7 @@ impl CharacterAbility {
                             *scaled_damage *= 1.2_f32.powi(level.into());
                         }
                         if skillset.has_skill(Sword(DSpeed)) {
-                            *forward_speed *= 1.3;
+                            *forward_speed *= 1.15;
                         }
                         *infinite_charge = skillset.has_skill(Sword(DInfinite));
                     },
diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs
index b9e774e118..04a34a749c 100644
--- a/voxygen/anim/src/character/alpha.rs
+++ b/voxygen/anim/src/character/alpha.rs
@@ -10,16 +10,15 @@ use std::f32::consts::PI;
 
 pub struct AlphaAnimation;
 
+type AlphaAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    f32,
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
 impl Animation for AlphaAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        f32,
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = AlphaAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -29,15 +28,7 @@ impl Animation for AlphaAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (
-            active_tool_kind,
-            _second_tool_kind,
-            hands,
-            _velocity,
-            _global_time,
-            stage_section,
-            ability_info,
-        ): Self::Dependency,
+        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -98,17 +89,17 @@ impl Animation for AlphaAnimation {
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                     _ => (0.0, 0.0, 0.0),
                 };
-                let pullback = (1.0 - move3);
+                let pullback = 1.0 - move3;
                 let moveret1 = move1 * pullback;
                 let moveret2 = move2 * pullback;
 
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
-                next.head.orientation = Quaternion::rotation_x((moveret1 * 0.1 + moveret2 * 0.3))
-                    * Quaternion::rotation_z((move1 * -0.2 + moveret2 * 0.2));
+                next.head.orientation = Quaternion::rotation_x(moveret1 * 0.1 + moveret2 * 0.3)
+                    * Quaternion::rotation_z(move1 * -0.2 + moveret2 * 0.2);
                 next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + moveret2 * -2.0);
-                next.chest.orientation = Quaternion::rotation_x((moveret1 * 0.4 + moveret2 * -0.7))
-                    * Quaternion::rotation_y((moveret1 * 0.3 + moveret2 * -0.4))
-                    * Quaternion::rotation_z((moveret1 * 0.5 + moveret2 * -0.5));
+                next.chest.orientation = Quaternion::rotation_x(moveret1 * 0.4 + moveret2 * -0.7)
+                    * Quaternion::rotation_y(moveret1 * 0.3 + moveret2 * -0.4)
+                    * Quaternion::rotation_z(moveret1 * 0.5 + moveret2 * -0.5);
             },
             Some(ToolKind::Debug) => {
                 next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
@@ -173,7 +164,7 @@ impl Animation for AlphaAnimation {
                         Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                         _ => (0.0, 0.0, 0.0),
                     };
-                    let pullback = (1.0 - move3);
+                    let pullback = 1.0 - move3;
                     let moveret1 = move1 * pullback;
                     let moveret2 = move2 * pullback;
                     next.hand_l.position =
diff --git a/voxygen/anim/src/character/beta.rs b/voxygen/anim/src/character/beta.rs
index 1b1c834336..7ef8457630 100644
--- a/voxygen/anim/src/character/beta.rs
+++ b/voxygen/anim/src/character/beta.rs
@@ -6,20 +6,18 @@ use common::{
     comp::item::{Hands, ToolKind},
     states::utils::{AbilityInfo, StageSection},
 };
-use std::f32::consts::PI;
 
 pub struct BetaAnimation;
 
+type BetaAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    f32,
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
 impl Animation for BetaAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        f32,
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = BetaAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -28,15 +26,7 @@ impl Animation for BetaAnimation {
     #[cfg_attr(feature = "be-dyn-lib", export_name = "character_beta")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (
-            _active_tool_kind,
-            _second_tool_kind,
-            hands,
-            _velocity,
-            _global_time,
-            stage_section,
-            ability_info,
-        ): Self::Dependency,
+        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -55,14 +45,11 @@ impl Animation for BetaAnimation {
         next.main.position = Vec3::new(0.0, 0.0, 0.0);
         next.main.orientation = Quaternion::rotation_x(0.0);
 
-        match ability_info.and_then(|a| a.tool) {
-            Some(ToolKind::Sword) => {
-                next.chest.orientation = Quaternion::rotation_x(0.15)
-                    * Quaternion::rotation_y((-0.1) * (1.0 - move3))
-                    * Quaternion::rotation_z((0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3));
-                next.head.orientation = Quaternion::rotation_z(-0.4 + move1 * -1.0 + move2 * 1.5);
-            },
-            _ => {},
+        if let Some(ToolKind::Sword) = ability_info.and_then(|a| a.tool) {
+            next.chest.orientation = Quaternion::rotation_x(0.15)
+                * Quaternion::rotation_y((-0.1) * (1.0 - move3))
+                * Quaternion::rotation_z((0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3));
+            next.head.orientation = Quaternion::rotation_z(-0.4 + move1 * -1.0 + move2 * 1.5);
         }
         match hands {
             (Some(Hands::Two), _) => match ability_info.and_then(|a| a.tool) {
diff --git a/voxygen/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs
index a3d3c77086..eb399f7560 100644
--- a/voxygen/anim/src/character/chargeswing.rs
+++ b/voxygen/anim/src/character/chargeswing.rs
@@ -8,16 +8,16 @@ use common::{
 };
 pub struct ChargeswingAnimation;
 
+type ChargeswingAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    Vec3<f32>,
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
+
 impl Animation for ChargeswingAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        Vec3<f32>,
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = ChargeswingAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -27,15 +27,7 @@ impl Animation for ChargeswingAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (
-            active_tool_kind,
-            _second_tool_kind,
-            hands,
-            _velocity,
-            _global_time,
-            stage_section,
-            ability_info,
-        ): Self::Dependency,
+        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -62,35 +54,30 @@ impl Animation for ChargeswingAnimation {
             _ => (0.0, 0.0, 0.0, 0.0, 0.0),
         };
 
-        let pullback = (1.0 - movement3);
+        let pullback = 1.0 - movement3;
         let move1 = move1base * pullback;
         let move2 = move2base * pullback;
         let slowrise = test * pullback;
         next.second.position = Vec3::new(0.0, 0.0, 0.0);
         next.second.orientation = Quaternion::rotation_z(0.0);
 
-        if let Some(ToolKind::Hammer) = active_tool_kind {}
-
         next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
 
-        match ability_info.and_then(|a| a.tool) {
-            Some(ToolKind::Hammer) => {
-                next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                next.main.orientation = Quaternion::rotation_x(0.0);
+        if let Some(ToolKind::Hammer) = ability_info.and_then(|a| a.tool) {
+            next.main.position = Vec3::new(0.0, 0.0, 0.0);
+            next.main.orientation = Quaternion::rotation_x(0.0);
 
-                next.chest.orientation =
-                    Quaternion::rotation_z(short * 0.04 + (move1 * 2.0 + move2 * -3.5));
-                next.belt.orientation = Quaternion::rotation_z(short * 0.08 + (move1 * -1.0));
-                next.shorts.orientation = Quaternion::rotation_z(short * 0.15 + (move1 * -1.5));
-                next.head.position = Vec3::new(
-                    0.0 + (move1 * -1.0 + move2 * 2.0),
-                    s_a.head.0 + (move1 * 1.0),
-                    s_a.head.1,
-                );
-                next.head.orientation = Quaternion::rotation_z(move1 * -1.5 + move2 * 3.2);
-                next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
-            },
-            _ => {},
+            next.chest.orientation =
+                Quaternion::rotation_z(short * 0.04 + (move1 * 2.0 + move2 * -3.5));
+            next.belt.orientation = Quaternion::rotation_z(short * 0.08 + (move1 * -1.0));
+            next.shorts.orientation = Quaternion::rotation_z(short * 0.15 + (move1 * -1.5));
+            next.head.position = Vec3::new(
+                0.0 + (move1 * -1.0 + move2 * 2.0),
+                s_a.head.0 + (move1 * 1.0),
+                s_a.head.1,
+            );
+            next.head.orientation = Quaternion::rotation_z(move1 * -1.5 + move2 * 3.2);
+            next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
         }
 
         match hands {
diff --git a/voxygen/anim/src/character/dash.rs b/voxygen/anim/src/character/dash.rs
index cdb4979a97..163a39067f 100644
--- a/voxygen/anim/src/character/dash.rs
+++ b/voxygen/anim/src/character/dash.rs
@@ -10,15 +10,14 @@ use std::f32::consts::PI;
 
 pub struct DashAnimation;
 
+type DashAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
 impl Animation for DashAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = DashAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -28,7 +27,7 @@ impl Animation for DashAnimation {
     #[allow(clippy::single_match)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, hands, _global_time, stage_section, ability_info): Self::Dependency,
+        (hands, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -43,7 +42,7 @@ impl Animation for DashAnimation {
             Some(StageSection::Recover) => (1.1, 1.0, 1.0, anim_time.powi(4)),
             _ => (0.0, 0.0, 0.0, 0.0),
         };
-        let pullback = (1.0 - move4);
+        let pullback = 1.0 - move4;
         let move1 = movement1 * pullback;
         let move2 = movement2 * pullback;
         let move3 = movement3 * pullback;
@@ -77,13 +76,13 @@ impl Animation for DashAnimation {
                     s_a.chest.1 + (2.0 + shortalt(move2) * -2.5) + move3 * -3.0,
                 );
                 next.chest.orientation =
-                    Quaternion::rotation_x((move2.min(1.0) * -0.4 + move3 * 0.4))
-                        * Quaternion::rotation_y((move2.min(1.0) * -0.2 + move3 * 0.3))
-                        * Quaternion::rotation_z((move1 * 1.1 + move3 * -2.2));
+                    Quaternion::rotation_x(move2.min(1.0) * -0.4 + move3 * 0.4)
+                        * Quaternion::rotation_y(move2.min(1.0) * -0.2 + move3 * 0.3)
+                        * Quaternion::rotation_z(move1 * 1.1 + move3 * -2.2);
 
-                next.shorts.orientation = Quaternion::rotation_z((short(move2).min(1.0) * 0.25));
+                next.shorts.orientation = Quaternion::rotation_z(short(move2).min(1.0) * 0.25);
 
-                next.belt.orientation = Quaternion::rotation_z((short(move2).min(1.0) * 0.1));
+                next.belt.orientation = Quaternion::rotation_z(short(move2).min(1.0) * 0.1);
             },
             _ => {},
         }
@@ -145,7 +144,9 @@ impl Animation for DashAnimation {
                         );
                         next.control_r.orientation =
                             Quaternion::rotation_x(-0.3 + move1 * -3.0 + move3 * -0.5)
-                                * Quaternion::rotation_y(move1 * 1.5 + move2 * 1.0 + move3 * 1.5)
+                                * Quaternion::rotation_y(
+                                    move1 * 1.5 + (move2 * 1.0).min(0.8) + move3 * 1.5,
+                                )
                                 * Quaternion::rotation_z(move3 * 1.5);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_r.orientation = Quaternion::rotation_x(1.57)
diff --git a/voxygen/anim/src/character/idle.rs b/voxygen/anim/src/character/idle.rs
index 8b44c52a23..6aeea2325a 100644
--- a/voxygen/anim/src/character/idle.rs
+++ b/voxygen/anim/src/character/idle.rs
@@ -3,7 +3,7 @@ use super::{
     CharacterSkeleton, SkeletonAttr,
 };
 use common::comp::item::{Hands, ToolKind};
-use std::{f32::consts::PI, ops::Mul};
+use std::ops::Mul;
 
 pub struct IdleAnimation;
 
@@ -87,48 +87,50 @@ impl Animation for IdleAnimation {
         next.glider.position = Vec3::new(0.0, 0.0, 10.0);
         next.glider.scale = Vec3::one() * 0.0;
         next.hold.position = Vec3::new(0.4, -0.3, -5.8);
-        match active_tool_kind {
-            Some(ToolKind::Dagger) => {
-                next.main.position = Vec3::new(-4.0, -5.0, 7.0);
-                next.main.orientation =
-                    Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
+        match hands {
+            (Some(Hands::Two), _) => match active_tool_kind {
+                Some(ToolKind::Bow) => {
+                    next.main.position = Vec3::new(0.0, -5.0, 6.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
+                Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
+                    next.main.position = Vec3::new(2.0, -5.0, -1.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
+                },
+                _ => {
+                    next.main.position = Vec3::new(-7.0, -5.0, 15.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                },
             },
-            Some(ToolKind::Shield) => {
-                next.main.position = Vec3::new(-0.0, -5.0, 3.0);
-                next.main.orientation =
-                    Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
-            },
-            Some(ToolKind::Bow) => {
-                next.main.position = Vec3::new(0.0, -5.0, 6.0);
-                next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-            },
-            Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
-                next.main.position = Vec3::new(2.0, -5.0, -1.0);
-                next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
-            },
-            _ => {
-                next.main.position = Vec3::new(-7.0, -5.0, 15.0);
-                next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-            },
-        }
+            (_, _) => {},
+        };
 
-        match second_tool_kind {
-            Some(ToolKind::Dagger) => {
-                next.second.position = Vec3::new(4.0, -6.0, 7.0);
-                next.second.orientation =
-                    Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
+        match hands {
+            (Some(Hands::One), _) => match active_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.main.position = Vec3::new(-4.0, -5.0, 10.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.35) * Quaternion::rotation_z(1.57);
+                },
+
+                _ => {},
             },
-            Some(ToolKind::Shield) => {
-                next.second.position = Vec3::new(0.0, -4.0, 3.0);
-                next.second.orientation =
-                    Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
+            (_, _) => {},
+        };
+        match hands {
+            (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.orientation =
+                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
+                },
+                _ => {},
             },
-            _ => {
-                next.second.position = Vec3::new(-7.0, -5.0, 15.0);
-                next.second.orientation =
-                    Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
-            },
-        }
+            (_, _) => {},
+        };
 
         next.lantern.position = Vec3::new(s_a.lantern.0, s_a.lantern.1, s_a.lantern.2);
         next.lantern.orientation = Quaternion::rotation_x(0.1) * Quaternion::rotation_y(0.1);
diff --git a/voxygen/anim/src/character/jump.rs b/voxygen/anim/src/character/jump.rs
index 7702dd9f2f..8a66331fff 100644
--- a/voxygen/anim/src/character/jump.rs
+++ b/voxygen/anim/src/character/jump.rs
@@ -195,7 +195,7 @@ impl Animation for JumpAnimation {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
                     next.main.position = Vec3::new(-4.0, -5.0, 10.0);
                     next.main.orientation =
-                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(2.35) * Quaternion::rotation_z(1.57);
                 },
 
                 _ => {},
@@ -207,7 +207,7 @@ impl Animation for JumpAnimation {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
                     next.second.position = Vec3::new(4.0, -5.5, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs
index 2c2553ccc1..ce7a6c139f 100644
--- a/voxygen/anim/src/character/leapmelee.rs
+++ b/voxygen/anim/src/character/leapmelee.rs
@@ -6,19 +6,17 @@ use common::{
     comp::item::{Hands, ToolKind},
     states::utils::{AbilityInfo, StageSection},
 };
-use std::f32::consts::PI;
 pub struct LeapAnimation;
 
+type LeapAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    Vec3<f32>,
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
 impl Animation for LeapAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        Vec3<f32>,
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = LeapAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -28,15 +26,7 @@ impl Animation for LeapAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (
-            active_tool_kind,
-            _second_tool_kind,
-            hands,
-            _velocity,
-            _global_time,
-            stage_section,
-            ability_info,
-        ): Self::Dependency,
+        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -51,7 +41,7 @@ impl Animation for LeapAnimation {
             Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time.powf(0.75)),
             _ => (0.0, 0.0, 0.0, 0.0),
         };
-        let pullback = (1.0 - move4);
+        let pullback = 1.0 - move4;
         let move1 = movement1 * pullback;
         let move2 = movement2 * pullback;
         let move3 = movement3 * pullback;
diff --git a/voxygen/anim/src/character/run.rs b/voxygen/anim/src/character/run.rs
index 68ba2d8a5d..80235453fd 100644
--- a/voxygen/anim/src/character/run.rs
+++ b/voxygen/anim/src/character/run.rs
@@ -258,7 +258,7 @@ impl Animation for RunAnimation {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
                     next.main.position = Vec3::new(-4.0, -5.0, 10.0);
                     next.main.orientation =
-                        Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(2.35) * Quaternion::rotation_z(1.57);
                 },
 
                 _ => {},
@@ -270,7 +270,7 @@ impl Animation for RunAnimation {
                 Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
                     next.second.position = Vec3::new(4.0, -5.5, 10.0);
                     next.second.orientation =
-                        Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(1.57);
+                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/sit.rs b/voxygen/anim/src/character/sit.rs
index 59d64f70a1..74cd609d60 100644
--- a/voxygen/anim/src/character/sit.rs
+++ b/voxygen/anim/src/character/sit.rs
@@ -27,48 +27,49 @@ impl Animation for SitAnimation {
         let slow = (anim_time * 1.0).sin();
         let slowa = (anim_time * 1.0 + PI / 2.0).sin();
         let stop = (anim_time * 3.0).min(PI / 2.0).sin();
-        let pet = (anim_time * 6.0).sin();
 
+        let head_look = Vec2::new(
+            (global_time + anim_time / 18.0).floor().mul(7331.0).sin() * 0.25,
+            (global_time + anim_time / 18.0).floor().mul(1337.0).sin() * 0.125,
+        );
         next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + slow * 0.1 + stop * -0.8);
-        next.head.orientation =
-            Quaternion::rotation_z(stop * 0.4) * Quaternion::rotation_x(slow * 0.1 + pet * 0.01);
+        next.head.orientation = Quaternion::rotation_z(head_look.x + slow * 0.2 - slow * 0.1)
+            * Quaternion::rotation_x((slowa * -0.1 + slow * 0.1 + head_look.y).abs());
 
-        next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + slow * 0.1 + stop * -0.8);
-        next.chest.orientation =
-            Quaternion::rotation_z(stop * -0.4 + pet * 0.04) * Quaternion::rotation_x(stop * -0.2);
+        next.chest.position = Vec3::new(
+            0.0,
+            s_a.chest.0 + stop * -0.4,
+            s_a.chest.1 + slow * 0.1 + stop * -0.8,
+        );
+        next.chest.orientation = Quaternion::rotation_x(stop * 0.15);
 
         next.belt.position = Vec3::new(0.0, s_a.belt.0 + stop * 1.2, s_a.belt.1);
-        next.belt.orientation =
-            Quaternion::rotation_x(stop * 0.2) * Quaternion::rotation_z(pet * -0.02);
+        next.belt.orientation = Quaternion::rotation_x(stop * 0.3);
 
         next.back.position = Vec3::new(0.0, s_a.back.0, s_a.back.1);
 
         next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + stop * 2.5, s_a.shorts.1 + stop * 0.6);
-        next.shorts.orientation =
-            Quaternion::rotation_x(stop * 0.4) * Quaternion::rotation_z(pet * -0.03);
+        next.shorts.orientation = Quaternion::rotation_x(stop * 0.6);
 
         next.hand_l.position = Vec3::new(
-            -s_a.hand.0 + stop * 3.0 + pet * 2.0,
-            s_a.hand.1 + stop * 10.0 + pet * -1.0,
-            s_a.hand.2 + slow * 0.7 + stop * 6.0,
+            -s_a.hand.0,
+            s_a.hand.1 + slowa * 0.15,
+            s_a.hand.2 + slow * 0.7 + stop * -2.0,
         );
-        next.hand_l.orientation = Quaternion::rotation_x(stop * 2.0)
-            * Quaternion::rotation_y(stop * -0.2 + pet * -0.2)
-            * Quaternion::rotation_z(stop * -1.0);
+        next.hand_l.orientation = Quaternion::rotation_x(slowa * -0.1 + slow * 0.1);
 
         next.hand_r.position = Vec3::new(
-            s_a.hand.0 + stop * -1.0,
-            s_a.hand.1 + stop * 4.0,
-            s_a.hand.2 + slow * 0.7 + stop * 0.0,
+            s_a.hand.0,
+            s_a.hand.1 + slowa * 0.15,
+            s_a.hand.2 + slow * 0.7 + stop * -2.0,
         );
-        next.hand_r.orientation =
-            Quaternion::rotation_x(stop * 1.5) * Quaternion::rotation_z(stop * 0.0);
+        next.hand_r.orientation = Quaternion::rotation_x(slow * -0.1 + slowa * 0.1);
 
-        next.foot_l.position = Vec3::new(-s_a.foot.0, 4.0 + s_a.foot.1, 1.0 + s_a.foot.2);
-        next.foot_l.orientation = Quaternion::rotation_x(0.0);
+        next.foot_l.position = Vec3::new(-s_a.foot.0, 4.0 + s_a.foot.1, 3.0 + s_a.foot.2);
+        next.foot_l.orientation = Quaternion::rotation_x(slow * 0.1 + stop * 1.2 + slow * 0.1);
 
-        next.foot_r.position = Vec3::new(s_a.foot.0, stop * -3.0 + s_a.foot.1, 1.0 + s_a.foot.2);
-        next.foot_r.orientation = Quaternion::rotation_x(stop * -0.5);
+        next.foot_r.position = Vec3::new(s_a.foot.0, 4.0 + s_a.foot.1, 3.0 + s_a.foot.2);
+        next.foot_r.orientation = Quaternion::rotation_x(slowa * 0.1 + stop * 1.2 + slowa * 0.1);
 
         next.shoulder_l.position = Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
         next.shoulder_l.orientation = Quaternion::rotation_x(0.0);
@@ -76,7 +77,7 @@ impl Animation for SitAnimation {
         next.shoulder_r.position = Vec3::new(s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
         next.shoulder_r.orientation = Quaternion::rotation_x(0.0);
 
-        next.torso.position = Vec3::new(0.0, 0.0, stop * -0.10) * s_a.scaler;
+        next.torso.position = Vec3::new(0.0, -0.2, stop * -0.16) * s_a.scaler;
 
         next
     }
diff --git a/voxygen/anim/src/character/spin.rs b/voxygen/anim/src/character/spin.rs
index 48732538de..8934ba5bcf 100644
--- a/voxygen/anim/src/character/spin.rs
+++ b/voxygen/anim/src/character/spin.rs
@@ -10,16 +10,15 @@ use std::f32::consts::PI;
 
 pub struct SpinAnimation;
 
+type SpinAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    Vec3<f32>,
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
 impl Animation for SpinAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        Vec3<f32>,
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = SpinAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -28,15 +27,7 @@ impl Animation for SpinAnimation {
     #[cfg_attr(feature = "be-dyn-lib", export_name = "character_spin")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (
-            _active_tool_kind,
-            _second_tool_kind,
-            hands,
-            _velocity,
-            _global_time,
-            stage_section,
-            ability_info,
-        ): Self::Dependency,
+        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
diff --git a/voxygen/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs
index e166079e6d..51f5994d17 100644
--- a/voxygen/anim/src/character/spinmelee.rs
+++ b/voxygen/anim/src/character/spinmelee.rs
@@ -10,16 +10,15 @@ use std::f32::consts::PI;
 
 pub struct SpinMeleeAnimation;
 
+type SpinMeleeAnimationDependency = (
+    (Option<Hands>, Option<Hands>),
+    Vec3<f32>,
+    f32,
+    Option<StageSection>,
+    Option<AbilityInfo>,
+);
 impl Animation for SpinMeleeAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        (Option<Hands>, Option<Hands>),
-        Vec3<f32>,
-        f32,
-        Option<StageSection>,
-        Option<AbilityInfo>,
-    );
+    type Dependency = SpinMeleeAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -29,15 +28,7 @@ impl Animation for SpinMeleeAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (
-            _active_tool_kind,
-            _second_tool_kind,
-            hands,
-            _velocity,
-            _global_time,
-            stage_section,
-            ability_info,
-        ): Self::Dependency,
+        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -49,7 +40,7 @@ impl Animation for SpinMeleeAnimation {
             Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(2.0)),
             _ => (0.0, 0.0, 0.0),
         };
-        let pullback = (1.0 - movement3);
+        let pullback = 1.0 - movement3;
         let move1 = movement1 * pullback;
         let move2 = movement2 * pullback;
         let mut next = (*skeleton).clone();
diff --git a/voxygen/anim/src/character/stand.rs b/voxygen/anim/src/character/stand.rs
index 44d45a8a78..14162616eb 100644
--- a/voxygen/anim/src/character/stand.rs
+++ b/voxygen/anim/src/character/stand.rs
@@ -3,7 +3,7 @@ use super::{
     CharacterSkeleton, SkeletonAttr,
 };
 use common::comp::item::{Hands, ToolKind};
-use std::{f32::consts::PI, ops::Mul};
+use std::ops::Mul;
 
 pub struct StandAnimation;
 
@@ -111,7 +111,6 @@ impl Animation for StandAnimation {
                     next.main.orientation =
                         Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
                 },
-                _ => {},
             },
             (_, _) => {},
         };
diff --git a/voxygen/anim/src/character/swim.rs b/voxygen/anim/src/character/swim.rs
index 6025923673..eb1db055b4 100644
--- a/voxygen/anim/src/character/swim.rs
+++ b/voxygen/anim/src/character/swim.rs
@@ -230,7 +230,29 @@ impl Animation for SwimAnimation {
         ) * Quaternion::rotation_y(tilt * 8.0)
             * Quaternion::rotation_z(tilt * 8.0);
         next.torso.scale = Vec3::one() / 11.0 * s_a.scaler;
+        match hands {
+            (Some(Hands::One), _) => match active_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.main.position = Vec3::new(-4.0, -5.0, 10.0);
+                    next.main.orientation =
+                        Quaternion::rotation_y(2.35) * Quaternion::rotation_z(1.57);
+                },
 
+                _ => {},
+            },
+            (_, _) => {},
+        };
+        match hands {
+            (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind {
+                Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => {
+                    next.second.position = Vec3::new(4.0, -5.5, 10.0);
+                    next.second.orientation =
+                        Quaternion::rotation_y(-2.35) * Quaternion::rotation_z(1.57);
+                },
+                _ => {},
+            },
+            (_, _) => {},
+        };
         next.second.scale = match hands {
             (Some(Hands::One), Some(Hands::One)) => Vec3::one(),
             (_, _) => Vec3::zero(),
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index d794f37f49..bc45025b2a 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -897,8 +897,6 @@ impl FigureMgr {
                             anim::character::AlphaAnimation::update_skeleton(
                                 &target_base,
                                 (
-                                    active_tool_kind,
-                                    second_tool_kind,
                                     hands,
                                     rel_vel.magnitude(),
                                     time,
@@ -993,8 +991,6 @@ impl FigureMgr {
                             anim::character::ChargeswingAnimation::update_skeleton(
                                 &target_base,
                                 (
-                                    active_tool_kind,
-                                    second_tool_kind,
                                     hands,
                                     rel_vel,
                                     time,
@@ -1058,15 +1054,7 @@ impl FigureMgr {
                         CharacterState::Boost(_) => {
                             anim::character::AlphaAnimation::update_skeleton(
                                 &target_base,
-                                (
-                                    active_tool_kind,
-                                    second_tool_kind,
-                                    hands,
-                                    rel_vel.magnitude(),
-                                    time,
-                                    None,
-                                    None,
-                                ),
+                                (hands, rel_vel.magnitude(), time, None, None),
                                 state.state_time,
                                 &mut state_animation_rate,
                                 skeleton_attr,
@@ -1092,8 +1080,6 @@ impl FigureMgr {
                             anim::character::DashAnimation::update_skeleton(
                                 &target_base,
                                 (
-                                    active_tool_kind,
-                                    second_tool_kind,
                                     hands,
                                     time,
                                     Some(s.stage_section),
@@ -1181,8 +1167,6 @@ impl FigureMgr {
                             anim::character::LeapAnimation::update_skeleton(
                                 &target_base,
                                 (
-                                    active_tool_kind,
-                                    second_tool_kind,
                                     hands,
                                     rel_vel,
                                     time,
@@ -1212,8 +1196,6 @@ impl FigureMgr {
                             anim::character::SpinMeleeAnimation::update_skeleton(
                                 &target_base,
                                 (
-                                    active_tool_kind,
-                                    second_tool_kind,
                                     hands,
                                     rel_vel,
                                     time,
@@ -1356,8 +1338,6 @@ impl FigureMgr {
                                 1 => anim::character::AlphaAnimation::update_skeleton(
                                     &target_base,
                                     (
-                                        active_tool_kind,
-                                        second_tool_kind,
                                         hands,
                                         rel_vel.magnitude(),
                                         time,
@@ -1371,8 +1351,6 @@ impl FigureMgr {
                                 2 => anim::character::SpinAnimation::update_skeleton(
                                     &target_base,
                                     (
-                                        active_tool_kind,
-                                        second_tool_kind,
                                         hands,
                                         rel_vel,
                                         time,
@@ -1386,8 +1364,6 @@ impl FigureMgr {
                                 _ => anim::character::BetaAnimation::update_skeleton(
                                     &target_base,
                                     (
-                                        active_tool_kind,
-                                        second_tool_kind,
                                         hands,
                                         rel_vel.magnitude(),
                                         time,

From 3640656a026a371cc24539599140c091ad3ddfd3 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 13 Apr 2021 03:04:48 -0400
Subject: [PATCH 09/11] changelog

---
 CHANGELOG.md                           | 2 ++
 assets/common/abilities/sword/spin.ron | 2 +-
 common/src/comp/inventory/item/mod.rs  | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe8a7ab3e3..d0d6f277dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added --sql-log-mode profile/trace parameter to veloren-server-cli
 - Added /disconnect_all_players admin command
 - Added disconnectall CLI command
+- One handed weapons can now be used and found in the world
+
 
 ### Changed
 
diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron
index f5f78f15df..a0cef50ca7 100644
--- a/assets/common/abilities/sword/spin.ron
+++ b/assets/common/abilities/sword/spin.ron
@@ -7,7 +7,7 @@ SpinMelee(
     knockback: ( strength: 10.0, direction: Away),
     range: 3.5,
     damage_effect: None,
-    energy_cost: 0,
+    energy_cost: 150,
     is_infinite: false,
     movement_behavior: ForwardGround,
     is_interruptible: true,
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index 27d2995432..117e6a43bc 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -265,11 +265,9 @@ impl TryFrom<(&ItemKind, &[Item], &AbilityMap, &MaterialStatManifest)> for ItemC
             Ok(ItemConfig {
                 abilities,
                 block_ability: None,
-                dodge_ability: Some(CharacterAbility::default_roll()),
             })
         } else {
             Err(ItemConfigError::BadItemKind)
-            };
         }
     }
 }

From 48d02cff83a5844656a7d997d034d4d9e5d87220 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 13 Apr 2021 18:56:26 -0400
Subject: [PATCH 10/11] 2h/1h bug fix, staggers

---
 voxygen/anim/src/biped_large/mod.rs       |   4 +-
 voxygen/anim/src/biped_large/stunned.rs   | 435 ++++++++++++++++++++++
 voxygen/anim/src/character/chargeswing.rs |  34 +-
 voxygen/anim/src/character/dash.rs        |  27 +-
 voxygen/anim/src/character/spinmelee.rs   |  36 +-
 voxygen/anim/src/character/staggered.rs   | 223 ++++++-----
 voxygen/anim/src/character/stunned.rs     | 224 ++++++-----
 voxygen/src/scene/figure/mod.rs           |  36 ++
 8 files changed, 785 insertions(+), 234 deletions(-)
 create mode 100644 voxygen/anim/src/biped_large/stunned.rs

diff --git a/voxygen/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs
index d277b5dc38..4cc4b49c65 100644
--- a/voxygen/anim/src/biped_large/mod.rs
+++ b/voxygen/anim/src/biped_large/mod.rs
@@ -13,6 +13,7 @@ pub mod shockwave;
 pub mod shoot;
 pub mod spin;
 pub mod spinmelee;
+pub mod stunned;
 pub mod summon;
 pub mod wield;
 
@@ -22,7 +23,8 @@ pub use self::{
     charge::ChargeAnimation, dash::DashAnimation, equip::EquipAnimation, idle::IdleAnimation,
     jump::JumpAnimation, leapmelee::LeapAnimation, run::RunAnimation,
     shockwave::ShockwaveAnimation, shoot::ShootAnimation, spin::SpinAnimation,
-    spinmelee::SpinMeleeAnimation, summon::SummonAnimation, wield::WieldAnimation,
+    spinmelee::SpinMeleeAnimation, stunned::StunnedAnimation, summon::SummonAnimation,
+    wield::WieldAnimation,
 };
 
 use super::{make_bone, vek::*, FigureBoneData, Skeleton};
diff --git a/voxygen/anim/src/biped_large/stunned.rs b/voxygen/anim/src/biped_large/stunned.rs
new file mode 100644
index 0000000000..8cc8a838b5
--- /dev/null
+++ b/voxygen/anim/src/biped_large/stunned.rs
@@ -0,0 +1,435 @@
+use super::{
+    super::{vek::*, Animation},
+    BipedLargeSkeleton, SkeletonAttr,
+};
+use common::{
+    comp::item::{ToolKind, UniqueKind},
+    states::utils::StageSection,
+};
+use std::{f32::consts::PI, ops::Mul};
+
+pub struct StunnedAnimation;
+
+impl Animation for StunnedAnimation {
+    type Dependency = (
+        Option<ToolKind>,
+        Option<ToolKind>,
+        Vec3<f32>,
+        f32,
+        f32,
+        Option<StageSection>,
+    );
+    type Skeleton = BipedLargeSkeleton;
+
+    #[cfg(feature = "use-dyn-lib")]
+    const UPDATE_FN: &'static [u8] = b"biped_large_stunned\0";
+
+    #[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_stunned")]
+    fn update_skeleton_inner(
+        skeleton: &Self::Skeleton,
+        (active_tool_kind, _second_tool_kind, velocity, global_time, acc_vel, stage_section): Self::Dependency,
+        anim_time: f32,
+        _rate: &mut f32,
+        s_a: &SkeletonAttr,
+    ) -> Self::Skeleton {
+        let mut next = (*skeleton).clone();
+        let speed = Vec2::<f32>::from(velocity).magnitude();
+
+        let lab: f32 = 0.65 * s_a.tempo; //.65
+
+        let (movement1base, movement2) = match stage_section {
+            Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0),
+            Some(StageSection::Recover) => (1.0, anim_time.powf(4.0)),
+            _ => (0.0, 0.0),
+        };
+        let pullback = 1.0 - movement2;
+        let movement1 = movement1base * pullback;
+        let torso = (anim_time * lab + 1.5 * PI).sin();
+        let speednorm = (speed / 12.0).powf(0.4);
+        let foothoril = (acc_vel * lab + PI * 1.45).sin() * speednorm;
+        let foothorir = (acc_vel * lab + PI * (0.45)).sin() * speednorm;
+        let footrotl = ((1.0 / (0.5 + (0.5) * ((acc_vel * lab + PI * 1.4).sin()).powi(2))).sqrt())
+            * ((acc_vel * lab + PI * 1.4).sin());
+
+        let footrotr = ((1.0 / (0.5 + (0.5) * ((acc_vel * lab + PI * 0.4).sin()).powi(2))).sqrt())
+            * ((acc_vel * lab + PI * 0.4).sin());
+        let slower = (anim_time * 1.0 + PI).sin();
+        let slow = (anim_time * 3.5 + PI).sin();
+
+        let tailmove = Vec2::new(
+            (global_time / 2.0 + anim_time / 2.0)
+                .floor()
+                .mul(7331.0)
+                .sin()
+                * 0.25,
+            (global_time / 2.0 + anim_time / 2.0)
+                .floor()
+                .mul(1337.0)
+                .sin()
+                * 0.125,
+        );
+
+        let look = Vec2::new(
+            (global_time / 2.0 + anim_time / 8.0)
+                .floor()
+                .mul(7331.0)
+                .sin()
+                * 0.5,
+            (global_time / 2.0 + anim_time / 8.0)
+                .floor()
+                .mul(1337.0)
+                .sin()
+                * 0.25,
+        );
+
+        let breathe = if s_a.beast {
+            // Controls for the beast breathing
+            let intensity = 0.04;
+            let lenght = 1.5;
+            let chop = 0.2;
+            let chop_freq = 60.0;
+            intensity * (lenght * anim_time).sin()
+                + 0.05 * chop * (anim_time * chop_freq).sin() * (anim_time * lenght).cos()
+        } else {
+            0.0
+        };
+
+        let footvertl = (anim_time * 16.0 * lab).sin();
+        let footvertr = (anim_time * 16.0 * lab + PI).sin();
+        let handhoril = (anim_time * 16.0 * lab + PI * 1.4).sin();
+        let handhorir = (anim_time * 16.0 * lab + PI * 0.4).sin();
+
+        let short = (acc_vel * lab).sin() * speednorm;
+
+        let shortalt = (anim_time * lab * 16.0 + PI / 2.0).sin();
+
+        if s_a.beast {
+            next.jaw.position = Vec3::new(0.0, s_a.jaw.0, s_a.jaw.1);
+        } else {
+            next.jaw.position = Vec3::new(0.0, s_a.jaw.0 - slower * 0.12, s_a.jaw.1 + slow * 0.2);
+
+            next.hold.scale = Vec3::one() * 0.0;
+
+            next.main.position = Vec3::new(0.0, 0.0, 0.0);
+            next.main.orientation = Quaternion::rotation_x(0.0);
+
+            next.hand_l.position = Vec3::new(s_a.grip.1, 0.0, s_a.grip.0);
+            next.hand_r.position = Vec3::new(-s_a.grip.1, 0.0, s_a.grip.0);
+
+            next.hand_l.orientation = Quaternion::rotation_x(0.0);
+            next.hand_r.orientation = Quaternion::rotation_x(0.0);
+
+            if speed > 0.5 {
+                next.shoulder_l.position = Vec3::new(
+                    -s_a.shoulder.0,
+                    s_a.shoulder.1,
+                    s_a.shoulder.2 - foothorir * 1.0,
+                );
+                next.shoulder_l.orientation =
+                    Quaternion::rotation_x(0.6 * speednorm + (footrotr * -0.2) * speednorm);
+
+                next.shoulder_r.position = Vec3::new(
+                    s_a.shoulder.0,
+                    s_a.shoulder.1,
+                    s_a.shoulder.2 - foothoril * 1.0,
+                );
+                next.shoulder_r.orientation =
+                    Quaternion::rotation_x(0.6 * speednorm + (footrotl * -0.2) * speednorm);
+            } else {
+                next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1) * 1.02;
+                next.head.orientation = Quaternion::rotation_z(look.x * 0.6 + movement1 * 1.0)
+                    * Quaternion::rotation_x(look.y * 0.6);
+
+                next.upper_torso.position =
+                    Vec3::new(0.0, s_a.upper_torso.0, s_a.upper_torso.1 + torso * -0.5);
+                next.upper_torso.orientation =
+                    Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
+
+                next.lower_torso.position =
+                    Vec3::new(0.0, s_a.lower_torso.0, s_a.lower_torso.1 + torso * 0.5);
+                next.lower_torso.orientation =
+                    Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
+                next.lower_torso.scale = Vec3::one() * 1.02;
+
+                next.jaw.position =
+                    Vec3::new(0.0, s_a.jaw.0 - slower * 0.12, s_a.jaw.1 + slow * 0.2);
+                next.jaw.orientation = Quaternion::rotation_x(-0.1 + breathe * 2.0);
+
+                next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1);
+                next.tail.orientation = Quaternion::rotation_z(0.0 + slow * 0.2 + tailmove.x)
+                    * Quaternion::rotation_x(0.0);
+
+                next.shoulder_l.position =
+                    Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
+                next.shoulder_l.orientation =
+                    Quaternion::rotation_y(0.0) * Quaternion::rotation_x(0.3);
+
+                next.shoulder_r.position =
+                    Vec3::new(s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
+                next.shoulder_r.orientation =
+                    Quaternion::rotation_y(0.0) * Quaternion::rotation_x(0.3);
+            }
+            match active_tool_kind {
+                Some(ToolKind::SwordSimple) => {
+                    next.control_l.position = Vec3::new(-1.0, 1.0, 1.0);
+                    next.control_r.position = Vec3::new(0.0, 2.0, -3.0);
+
+                    next.control.position = Vec3::new(
+                        -3.0,
+                        5.0 + s_a.grip.0 / 1.2,
+                        -4.0 + -s_a.grip.0 / 2.0 + short * -1.5,
+                    );
+
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.2);
+                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.2)
+                        * Quaternion::rotation_y(0.2)
+                        * Quaternion::rotation_z(0.0);
+
+                    next.control.orientation =
+                        Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(-0.1);
+                },
+                Some(ToolKind::BowSimple) | Some(ToolKind::Bow) => {
+                    next.control_l.position = Vec3::new(-1.0, -2.0, -3.0);
+                    next.control_r.position = Vec3::new(0.0, 4.0, 1.0);
+
+                    next.control.position = Vec3::new(
+                        -1.0,
+                        6.0 + s_a.grip.0 / 1.2,
+                        -5.0 + -s_a.grip.0 / 2.0 + short * -1.5,
+                    );
+
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.2);
+                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.2)
+                        * Quaternion::rotation_y(0.2)
+                        * Quaternion::rotation_z(0.0);
+
+                    next.control.orientation = Quaternion::rotation_x(-0.2 + short * 0.2)
+                        * Quaternion::rotation_y(1.0)
+                        * Quaternion::rotation_z(-0.3);
+                },
+                Some(ToolKind::HammerSimple) | Some(ToolKind::AxeSimple) => {
+                    next.control_l.position = Vec3::new(-1.0, 2.0, 12.0);
+                    next.control_r.position = Vec3::new(1.0, 2.0, -2.0);
+
+                    next.control.position = Vec3::new(
+                        4.0,
+                        0.0 + s_a.grip.0 / 1.0,
+                        -s_a.grip.0 / 0.8 + short * -1.5,
+                    );
+
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.0);
+                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.0 + 0.2)
+                        * Quaternion::rotation_y(0.0)
+                        * Quaternion::rotation_z(0.0);
+
+                    next.control.orientation =
+                        Quaternion::rotation_x(-1.0 + short * 0.2) * Quaternion::rotation_y(-1.8);
+                },
+                Some(ToolKind::StaffSimple)
+                | Some(ToolKind::Unique(UniqueKind::MindflayerStaff)) => {
+                    next.control_l.position = Vec3::new(-1.0, 3.0, 12.0);
+                    next.control_r.position = Vec3::new(1.0, 2.0, 2.0);
+
+                    next.control.position = Vec3::new(
+                        -3.0,
+                        3.0 + s_a.grip.0 / 1.2,
+                        -11.0 + -s_a.grip.0 / 2.0 + short * -1.5,
+                    );
+
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.5);
+                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.5)
+                        * Quaternion::rotation_y(0.5)
+                        * Quaternion::rotation_z(0.0);
+
+                    next.control.orientation =
+                        Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(-0.1);
+                },
+                Some(ToolKind::Unique(UniqueKind::WendigoMagic)) => {
+                    next.control_l.position = Vec3::new(-9.0, 19.0, -13.0);
+                    next.control_r.position = Vec3::new(9.0, 19.0, -13.0);
+
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_y(-0.15);
+                    next.control_r.orientation =
+                        Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_y(0.15);
+                },
+                Some(ToolKind::Unique(UniqueKind::TidalClaws)) => {
+                    next.control_l.position = Vec3::new(-14.0, 12.0, -12.0);
+                    next.control_r.position = Vec3::new(14.0, 12.0, -12.0);
+
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_y(-0.15);
+                    next.control_r.orientation =
+                        Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_y(0.15);
+                },
+                Some(ToolKind::Unique(UniqueKind::BeastClaws)) => {
+                    next.shoulder_l.position =
+                        Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
+
+                    next.shoulder_r.position =
+                        Vec3::new(s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
+
+                    next.hand_l.position =
+                        Vec3::new(-s_a.hand.0, s_a.hand.1, s_a.hand.2 + torso * 0.6);
+
+                    next.hand_r.position =
+                        Vec3::new(s_a.hand.0, s_a.hand.1, s_a.hand.2 + torso * 0.6);
+
+                    if speed < 0.5 {
+                        next.head.position =
+                            Vec3::new(0.0, s_a.head.0, s_a.head.1 + torso * 0.2) * 1.02;
+                        next.head.orientation = Quaternion::rotation_z(look.x * 0.6)
+                            * Quaternion::rotation_x(look.y * 0.6);
+
+                        next.upper_torso.position =
+                            Vec3::new(0.0, s_a.upper_torso.0, s_a.upper_torso.1 + torso * 0.5);
+
+                        next.lower_torso.position =
+                            Vec3::new(0.0, s_a.lower_torso.0, s_a.lower_torso.1 + torso * 0.15);
+
+                        next.jaw.orientation = Quaternion::rotation_x(-0.1);
+
+                        next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1);
+                        next.tail.orientation = Quaternion::rotation_z(slow * 0.2 + tailmove.x);
+
+                        next.second.orientation = Quaternion::rotation_x(PI);
+
+                        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                        next.main.orientation = Quaternion::rotation_y(0.0);
+
+                        next.shoulder_l.position =
+                            Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
+
+                        next.hand_l.position =
+                            Vec3::new(-s_a.hand.0, s_a.hand.1, s_a.hand.2 + torso * 0.6);
+
+                        next.hand_r.position =
+                            Vec3::new(s_a.hand.0, s_a.hand.1, s_a.hand.2 + torso * 0.6);
+
+                        next.leg_l.position =
+                            Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2 + torso * 0.2);
+                        next.leg_l.orientation =
+                            Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
+
+                        next.leg_r.position =
+                            Vec3::new(s_a.leg.0, s_a.leg.1, s_a.leg.2 + torso * 0.2);
+                        next.leg_r.orientation =
+                            Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
+                    } else {
+                        next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1) * 1.02;
+                        next.head.orientation =
+                            Quaternion::rotation_z(short * -0.18) * Quaternion::rotation_x(-0.05);
+                        next.head.scale = Vec3::one() * 1.02;
+
+                        next.upper_torso.position =
+                            Vec3::new(0.0, s_a.upper_torso.0, s_a.upper_torso.1 + shortalt * -1.5);
+                        next.upper_torso.orientation = Quaternion::rotation_z(short * 0.18);
+
+                        next.lower_torso.position =
+                            Vec3::new(0.0, s_a.lower_torso.0, s_a.lower_torso.1);
+                        next.lower_torso.orientation =
+                            Quaternion::rotation_z(short * 0.15) * Quaternion::rotation_x(0.14);
+                        next.lower_torso.scale = Vec3::one() * 1.02;
+
+                        next.jaw.position = Vec3::new(0.0, s_a.jaw.0, s_a.jaw.1);
+                        next.jaw.orientation = Quaternion::rotation_x(0.0);
+                        next.jaw.scale = Vec3::one() * 1.02;
+
+                        next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1);
+                        next.tail.orientation = Quaternion::rotation_x(shortalt * 0.3);
+
+                        next.second.position = Vec3::new(0.0, 0.0, 0.0);
+                        next.second.orientation = Quaternion::rotation_x(PI)
+                            * Quaternion::rotation_y(0.0)
+                            * Quaternion::rotation_z(0.0);
+                        next.second.scale = Vec3::one() * 0.0;
+
+                        next.control.position = Vec3::new(0.0, 0.0, 0.0);
+                        next.control.orientation = Quaternion::rotation_z(0.0);
+
+                        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+                        next.main.orientation = Quaternion::rotation_y(0.0);
+
+                        next.shoulder_l.position = Vec3::new(
+                            -s_a.shoulder.0,
+                            s_a.shoulder.1 + foothoril * -3.0,
+                            s_a.shoulder.2,
+                        );
+                        next.shoulder_l.orientation = Quaternion::rotation_x(footrotl * -0.36)
+                            * Quaternion::rotation_y(0.1)
+                            * Quaternion::rotation_z(footrotl * 0.3);
+
+                        next.shoulder_r.position = Vec3::new(
+                            s_a.shoulder.0,
+                            s_a.shoulder.1 + foothorir * -3.0,
+                            s_a.shoulder.2,
+                        );
+                        next.shoulder_r.orientation = Quaternion::rotation_x(footrotr * -0.36)
+                            * Quaternion::rotation_y(-0.1)
+                            * Quaternion::rotation_z(footrotr * -0.3);
+
+                        next.hand_l.position = Vec3::new(
+                            -1.0 + -s_a.hand.0,
+                            s_a.hand.1 + foothoril * -4.0,
+                            s_a.hand.2 + foothoril * 1.0,
+                        );
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(0.15 + (handhoril * -1.2).max(-0.3))
+                                * Quaternion::rotation_y(handhoril * -0.1);
+
+                        next.hand_r.position = Vec3::new(
+                            1.0 + s_a.hand.0,
+                            s_a.hand.1 + foothorir * -4.0,
+                            s_a.hand.2 + foothorir * 1.0,
+                        );
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(0.15 + (handhorir * -1.2).max(-0.3))
+                                * Quaternion::rotation_y(handhorir * 0.1);
+                        next.hand_r.scale = Vec3::one() * 1.04;
+
+                        next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2) * 0.98;
+                        next.leg_l.orientation = Quaternion::rotation_z(short * 0.18)
+                            * Quaternion::rotation_x(foothoril * 0.3);
+                        next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1, s_a.leg.2) * 0.98;
+
+                        next.leg_r.orientation = Quaternion::rotation_z(short * 0.18)
+                            * Quaternion::rotation_x(foothorir * 0.3);
+
+                        next.foot_l.position = Vec3::new(
+                            -s_a.foot.0,
+                            s_a.foot.1 + foothoril * 8.5,
+                            s_a.foot.2 + ((footvertl * 6.5).max(0.0)),
+                        );
+                        next.foot_l.orientation = Quaternion::rotation_x(-0.5 + footrotl * 0.85);
+
+                        next.foot_r.position = Vec3::new(
+                            s_a.foot.0,
+                            s_a.foot.1 + foothorir * 8.5,
+                            s_a.foot.2 + ((footvertr * 6.5).max(0.0)),
+                        );
+                        next.foot_r.orientation = Quaternion::rotation_x(-0.5 + footrotr * 0.85);
+
+                        next.torso.orientation = Quaternion::rotation_x(-0.25);
+                    }
+                },
+                _ => {},
+            }
+        };
+
+        if s_a.float {
+            next.upper_torso.position = Vec3::new(
+                0.0,
+                s_a.upper_torso.0,
+                s_a.upper_torso.1 + slower * 1.0 + 4.0,
+            );
+            next.foot_l.orientation = Quaternion::rotation_x(-0.5 + slow * 0.1);
+            next.foot_r.orientation = Quaternion::rotation_x(-0.5 + slow * 0.1);
+        }
+
+        next
+    }
+}
diff --git a/voxygen/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs
index eb399f7560..46f8ac321f 100644
--- a/voxygen/anim/src/character/chargeswing.rs
+++ b/voxygen/anim/src/character/chargeswing.rs
@@ -109,30 +109,26 @@ impl Animation for ChargeswingAnimation {
         };
 
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match ability_info.and_then(|a| a.tool) {
-                    Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) => {
-                        next.control_l.position = Vec3::new(
-                            -7.0 + move1 * 4.0,
-                            8.0 + move1 * 2.0 + move2 * 4.0,
-                            2.0 + move1 * -1.0 + slowrise * 20.0,
-                        );
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * -1.0)
-                            * Quaternion::rotation_y(
-                                tension * 0.07 + move1 * -1.2 + slowrise * 0.5,
-                            )
-                            * Quaternion::rotation_z(move2 * 1.0);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) => {
+                    next.control_l.position = Vec3::new(
+                        -7.0 + move1 * 4.0,
+                        8.0 + move1 * 2.0 + move2 * 4.0,
+                        2.0 + move1 * -1.0 + slowrise * 20.0,
+                    );
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * -1.0)
+                        * Quaternion::rotation_y(tension * 0.07 + move1 * -1.2 + slowrise * 0.5)
+                        * Quaternion::rotation_z(move2 * 1.0);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
 
-                    _ => {},
-                }
+                _ => {},
             },
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+            (None | Some(Hands::One), Some(Hands::One)) => {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) => {
                         next.control_r.position = Vec3::new(
diff --git a/voxygen/anim/src/character/dash.rs b/voxygen/anim/src/character/dash.rs
index 163a39067f..7f1d692ea3 100644
--- a/voxygen/anim/src/character/dash.rs
+++ b/voxygen/anim/src/character/dash.rs
@@ -115,26 +115,23 @@ impl Animation for DashAnimation {
         };
 
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match ability_info.and_then(|a| a.tool) {
-                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
-                        next.control_l.position =
-                            Vec3::new(-7.0, 8.0 + move3 * 5.0, 2.0 + move1 * 4.0);
-                        next.control_l.orientation =
-                            Quaternion::rotation_x(-0.3 + move2 * 1.0 + move3 * 1.0)
-                                * Quaternion::rotation_y(move1 * -1.2 + move3 * -1.5)
-                                * Quaternion::rotation_z(move2 * 1.0 + move3 * 1.5);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                    next.control_l.position = Vec3::new(-7.0, 8.0 + move3 * 5.0, 2.0 + move1 * 4.0);
+                    next.control_l.orientation =
+                        Quaternion::rotation_x(-0.3 + move2 * 1.0 + move3 * 1.0)
+                            * Quaternion::rotation_y(move1 * -1.2 + move3 * -1.5)
+                            * Quaternion::rotation_z(move2 * 1.0 + move3 * 1.5);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
 
-                    _ => {},
-                }
+                _ => {},
             },
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+            (None | Some(Hands::One), Some(Hands::One)) => {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                         next.control_r.position = Vec3::new(
diff --git a/voxygen/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs
index 51f5994d17..4466152af4 100644
--- a/voxygen/anim/src/character/spinmelee.rs
+++ b/voxygen/anim/src/character/spinmelee.rs
@@ -144,30 +144,28 @@ impl Animation for SpinMeleeAnimation {
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (Some(Hands::One), None) => {
-                match ability_info.and_then(|a| a.tool) {
-                    Some(ToolKind::Sword) => {
-                        next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -0.5)
-                            * Quaternion::rotation_z(move1 * 1.57);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
-                    Some(ToolKind::Axe) => {
-                        next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
-                        next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.3)
-                            * Quaternion::rotation_z(move1 * -1.57);
-                        next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
-                        next.hand_l.orientation = Quaternion::rotation_x(1.57)
-                    },
+            (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
+                Some(ToolKind::Sword) => {
+                    next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -0.5)
+                        * Quaternion::rotation_z(move1 * 1.57);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                Some(ToolKind::Axe) => {
+                    next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3 + move1 * -1.3)
+                        * Quaternion::rotation_z(move1 * -1.57);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
 
-                    _ => {},
-                }
+                _ => {},
             },
             (_, _) => {},
         };
         match hands {
-            (Some(Hands::One), Some(Hands::One)) | (None, Some(Hands::One)) => {
+            (None | Some(Hands::One), Some(Hands::One)) => {
                 match ability_info.and_then(|a| a.tool) {
                     Some(ToolKind::Sword) => {
                         next.control_r.position = Vec3::new(7.0, 8.0, 2.0 + move1 * 10.0);
diff --git a/voxygen/anim/src/character/staggered.rs b/voxygen/anim/src/character/staggered.rs
index 96233722f1..967d4c1ce7 100644
--- a/voxygen/anim/src/character/staggered.rs
+++ b/voxygen/anim/src/character/staggered.rs
@@ -2,20 +2,25 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::StageSection,
+};
 
 pub struct StaggeredAnimation;
 
+type StaggeredAnimationDependency = (
+    Option<ToolKind>,
+    Option<ToolKind>,
+    (Option<Hands>, Option<Hands>),
+    f32,
+    f32,
+    Option<StageSection>,
+    f32,
+    bool,
+);
 impl Animation for StaggeredAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        f32,
-        f32,
-        Option<StageSection>,
-        f32,
-        bool,
-    );
+    type Dependency = StaggeredAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -28,6 +33,7 @@ impl Animation for StaggeredAnimation {
         (
             active_tool_kind,
             _second_tool_kind,
+            hands,
             _velocity,
             global_time,
             stage_section,
@@ -67,89 +73,126 @@ impl Animation for StaggeredAnimation {
         if wield_status {
             next.main.position = Vec3::new(0.0, 0.0, 0.0);
             next.main.orientation = Quaternion::rotation_x(0.0);
-            match active_tool_kind {
-                Some(ToolKind::Sword) => {
-                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+            match hands {
+                (Some(Hands::Two), _) => match active_tool_kind {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                        next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+
+                        next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
+                        next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
+                        next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
+
+                        next.control.position = Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2);
+                        next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
+                            * Quaternion::rotation_y(s_a.ac.4)
+                            * Quaternion::rotation_z(s_a.ac.5);
+                    },
+                    Some(ToolKind::Hammer | ToolKind::Pick) => {
+                        next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
+                        next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
+
+                        next.control.position = Vec3::new(s_a.hc.0, s_a.hc.1, s_a.hc.2);
+                        next.control.orientation = Quaternion::rotation_x(s_a.hc.3)
+                            * Quaternion::rotation_y(s_a.hc.4)
+                            * Quaternion::rotation_z(s_a.hc.5);
+                    },
+                    Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
+                        next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
+
+                        next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2);
+
+                        next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
+                        next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
+
+                        next.control.orientation = Quaternion::rotation_x(s_a.stc.3)
+                            * Quaternion::rotation_y(s_a.stc.4)
+                            * Quaternion::rotation_z(s_a.stc.5);
+                    },
+                    Some(ToolKind::Bow) => {
+                        next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
+                        next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
+                        next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2);
+                        next.hand_r.orientation = Quaternion::rotation_x(s_a.bhr.3);
+
+                        next.hold.position = Vec3::new(0.0, -1.0, -5.2);
+                        next.hold.orientation = Quaternion::rotation_x(-1.57);
+                        next.hold.scale = Vec3::one() * 1.0;
+
+                        next.control.position = Vec3::new(s_a.bc.0, s_a.bc.1, s_a.bc.2);
+                        next.control.orientation =
+                            Quaternion::rotation_y(s_a.bc.4) * Quaternion::rotation_z(s_a.bc.5);
+                    },
+                    Some(ToolKind::Debug) => {
+                        next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.27);
+                        next.main.position = Vec3::new(-5.0, 5.0, 23.0);
+                        next.main.orientation = Quaternion::rotation_x(3.14);
+                    },
+                    Some(ToolKind::Farming) => {
+                        next.hand_l.position = Vec3::new(9.0, 1.0, 1.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57);
+                        next.hand_r.position = Vec3::new(9.0, 1.0, 11.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57);
+                        next.main.position = Vec3::new(7.5, 7.5, 13.2);
+                        next.main.orientation = Quaternion::rotation_y(3.14);
+
+                        next.control.position = Vec3::new(-11.0, 1.8, 4.0);
+                    },
+                    _ => {},
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (Some(Hands::One), _) => {
+                    next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (None | Some(Hands::One), Some(Hands::One)) => {
+                    next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
+                    next.control_r.orientation = Quaternion::rotation_x(-0.3);
+                    next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (None, None) | (None, Some(Hands::One)) => {
+                    next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
                     next.hand_l.orientation =
-                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                        Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (None, None) | (Some(Hands::One), None) => {
+                    next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
                     next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                    next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
-                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
+                        Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
                 },
-                Some(ToolKind::Axe) => {
-                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-                    next.hand_l.orientation =
-                        Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
-                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-                    next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
-
-                    next.control.position = Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2);
-                    next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
-                        * Quaternion::rotation_y(s_a.ac.4)
-                        * Quaternion::rotation_z(s_a.ac.5);
-                },
-                Some(ToolKind::Hammer | ToolKind::Pick) => {
-                    next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
-                    next.hand_l.orientation =
-                        Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
-                    next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
-                    next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
-
-                    next.control.position = Vec3::new(s_a.hc.0, s_a.hc.1, s_a.hc.2);
-                    next.control.orientation = Quaternion::rotation_x(s_a.hc.3)
-                        * Quaternion::rotation_y(s_a.hc.4)
-                        * Quaternion::rotation_z(s_a.hc.5);
-                },
-                Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
-                    next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
-                    next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
-
-                    next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2);
-
-                    next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
-                    next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
-
-                    next.control.orientation = Quaternion::rotation_x(s_a.stc.3)
-                        * Quaternion::rotation_y(s_a.stc.4)
-                        * Quaternion::rotation_z(s_a.stc.5);
-                },
-                Some(ToolKind::Bow) => {
-                    next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
-                    next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
-                    next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2);
-                    next.hand_r.orientation = Quaternion::rotation_x(s_a.bhr.3);
-
-                    next.hold.position = Vec3::new(0.0, -1.0, -5.2);
-                    next.hold.orientation = Quaternion::rotation_x(-1.57);
-                    next.hold.scale = Vec3::one() * 1.0;
-
-                    next.control.position = Vec3::new(s_a.bc.0, s_a.bc.1, s_a.bc.2);
-                    next.control.orientation =
-                        Quaternion::rotation_y(s_a.bc.4) * Quaternion::rotation_z(s_a.bc.5);
-                },
-                Some(ToolKind::Debug) => {
-                    next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
-                    next.hand_l.orientation = Quaternion::rotation_x(1.27);
-                    next.main.position = Vec3::new(-5.0, 5.0, 23.0);
-                    next.main.orientation = Quaternion::rotation_x(3.14);
-                },
-                Some(ToolKind::Farming) => {
-                    next.hand_l.position = Vec3::new(9.0, 1.0, 1.0);
-                    next.hand_l.orientation = Quaternion::rotation_x(1.57);
-                    next.hand_r.position = Vec3::new(9.0, 1.0, 11.0);
-                    next.hand_r.orientation = Quaternion::rotation_x(1.57);
-                    next.main.position = Vec3::new(7.5, 7.5, 13.2);
-                    next.main.orientation = Quaternion::rotation_y(3.14);
-
-                    next.control.position = Vec3::new(-11.0, 1.8, 4.0);
-                },
-                _ => {},
+                (_, _) => {},
             }
         } else if mirror > 0.0 {
             next.hand_r.position = Vec3::new(
diff --git a/voxygen/anim/src/character/stunned.rs b/voxygen/anim/src/character/stunned.rs
index bbb7fa980d..56e68dfab0 100644
--- a/voxygen/anim/src/character/stunned.rs
+++ b/voxygen/anim/src/character/stunned.rs
@@ -2,20 +2,25 @@ use super::{
     super::{vek::*, Animation},
     CharacterSkeleton, SkeletonAttr,
 };
-use common::{comp::item::ToolKind, states::utils::StageSection};
+use common::{
+    comp::item::{Hands, ToolKind},
+    states::utils::StageSection,
+};
 
 pub struct StunnedAnimation;
 
+type StunnedAnimationDependency = (
+    Option<ToolKind>,
+    Option<ToolKind>,
+    (Option<Hands>, Option<Hands>),
+    f32,
+    f32,
+    Option<StageSection>,
+    f32,
+    bool,
+);
 impl Animation for StunnedAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        f32,
-        f32,
-        Option<StageSection>,
-        f32,
-        bool,
-    );
+    type Dependency = StunnedAnimationDependency;
     type Skeleton = CharacterSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -28,6 +33,7 @@ impl Animation for StunnedAnimation {
         (
             active_tool_kind,
             _second_tool_kind,
+            hands,
             _velocity,
             global_time,
             stage_section,
@@ -65,89 +71,127 @@ impl Animation for StunnedAnimation {
         if wield_status {
             next.main.position = Vec3::new(0.0, 0.0, 0.0);
             next.main.orientation = Quaternion::rotation_x(0.0);
-            match active_tool_kind {
-                Some(ToolKind::Sword) => {
-                    next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+
+            match hands {
+                (Some(Hands::Two), _) => match active_tool_kind {
+                    Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
+                        next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
+                        next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
+
+                        next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
+                        next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
+                    },
+                    Some(ToolKind::Axe) => {
+                        next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
+                        next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
+
+                        next.control.position = Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2);
+                        next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
+                            * Quaternion::rotation_y(s_a.ac.4)
+                            * Quaternion::rotation_z(s_a.ac.5);
+                    },
+                    Some(ToolKind::Hammer | ToolKind::Pick) => {
+                        next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
+                        next.hand_l.orientation =
+                            Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
+                        next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
+
+                        next.control.position = Vec3::new(s_a.hc.0, s_a.hc.1, s_a.hc.2);
+                        next.control.orientation = Quaternion::rotation_x(s_a.hc.3)
+                            * Quaternion::rotation_y(s_a.hc.4)
+                            * Quaternion::rotation_z(s_a.hc.5);
+                    },
+                    Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
+                        next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
+                        next.hand_r.orientation =
+                            Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
+
+                        next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2);
+
+                        next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
+                        next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
+
+                        next.control.orientation = Quaternion::rotation_x(s_a.stc.3)
+                            * Quaternion::rotation_y(s_a.stc.4)
+                            * Quaternion::rotation_z(s_a.stc.5);
+                    },
+                    Some(ToolKind::Bow) => {
+                        next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
+                        next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
+                        next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2);
+                        next.hand_r.orientation = Quaternion::rotation_x(s_a.bhr.3);
+
+                        next.hold.position = Vec3::new(0.0, -1.0, -5.2);
+                        next.hold.orientation = Quaternion::rotation_x(-1.57);
+                        next.hold.scale = Vec3::one() * 1.0;
+
+                        next.control.position = Vec3::new(s_a.bc.0, s_a.bc.1, s_a.bc.2);
+                        next.control.orientation =
+                            Quaternion::rotation_y(s_a.bc.4) * Quaternion::rotation_z(s_a.bc.5);
+                    },
+                    Some(ToolKind::Debug) => {
+                        next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.27);
+                        next.main.position = Vec3::new(-5.0, 5.0, 23.0);
+                        next.main.orientation = Quaternion::rotation_x(3.14);
+                    },
+                    Some(ToolKind::Farming) => {
+                        next.hand_l.position = Vec3::new(9.0, 1.0, 1.0);
+                        next.hand_l.orientation = Quaternion::rotation_x(1.57);
+                        next.hand_r.position = Vec3::new(9.0, 1.0, 11.0);
+                        next.hand_r.orientation = Quaternion::rotation_x(1.57);
+                        next.main.position = Vec3::new(7.5, 7.5, 13.2);
+                        next.main.orientation = Quaternion::rotation_y(3.14);
+
+                        next.control.position = Vec3::new(-11.0, 1.8, 4.0);
+                    },
+                    _ => {},
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (Some(Hands::One), _) => {
+                    next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
+                    next.control_l.orientation = Quaternion::rotation_x(-0.3);
+                    next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_l.orientation = Quaternion::rotation_x(1.57)
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (None | Some(Hands::One), Some(Hands::One)) => {
+                    next.control_r.position = Vec3::new(7.0, 8.0, 2.0);
+                    next.control_r.orientation = Quaternion::rotation_x(-0.3);
+                    next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
+                    next.hand_r.orientation = Quaternion::rotation_x(1.57)
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (None, None) | (None, Some(Hands::One)) => {
+                    next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
                     next.hand_l.orientation =
-                        Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
-                    next.hand_r.position = Vec3::new(s_a.shr.0, s_a.shr.1, s_a.shr.2);
+                        Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
+                },
+                (_, _) => {},
+            };
+            match hands {
+                (None, None) | (Some(Hands::One), None) => {
+                    next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
                     next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
-
-                    next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
-                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
+                        Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
                 },
-                Some(ToolKind::Axe) => {
-                    next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
-                    next.hand_l.orientation =
-                        Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
-                    next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
-                    next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
-
-                    next.control.position = Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2);
-                    next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
-                        * Quaternion::rotation_y(s_a.ac.4)
-                        * Quaternion::rotation_z(s_a.ac.5);
-                },
-                Some(ToolKind::Hammer | ToolKind::Pick) => {
-                    next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
-                    next.hand_l.orientation =
-                        Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
-                    next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
-                    next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
-
-                    next.control.position = Vec3::new(s_a.hc.0, s_a.hc.1, s_a.hc.2);
-                    next.control.orientation = Quaternion::rotation_x(s_a.hc.3)
-                        * Quaternion::rotation_y(s_a.hc.4)
-                        * Quaternion::rotation_z(s_a.hc.5);
-                },
-                Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
-                    next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
-                    next.hand_r.orientation =
-                        Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
-
-                    next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2);
-
-                    next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
-                    next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
-
-                    next.control.orientation = Quaternion::rotation_x(s_a.stc.3)
-                        * Quaternion::rotation_y(s_a.stc.4)
-                        * Quaternion::rotation_z(s_a.stc.5);
-                },
-                Some(ToolKind::Bow) => {
-                    next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
-                    next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
-                    next.hand_r.position = Vec3::new(s_a.bhr.0, s_a.bhr.1, s_a.bhr.2);
-                    next.hand_r.orientation = Quaternion::rotation_x(s_a.bhr.3);
-
-                    next.hold.position = Vec3::new(0.0, -1.0, -5.2);
-                    next.hold.orientation = Quaternion::rotation_x(-1.57);
-                    next.hold.scale = Vec3::one() * 1.0;
-
-                    next.control.position = Vec3::new(s_a.bc.0, s_a.bc.1, s_a.bc.2);
-                    next.control.orientation =
-                        Quaternion::rotation_y(s_a.bc.4) * Quaternion::rotation_z(s_a.bc.5);
-                },
-                Some(ToolKind::Debug) => {
-                    next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
-                    next.hand_l.orientation = Quaternion::rotation_x(1.27);
-                    next.main.position = Vec3::new(-5.0, 5.0, 23.0);
-                    next.main.orientation = Quaternion::rotation_x(3.14);
-                },
-                Some(ToolKind::Farming) => {
-                    next.hand_l.position = Vec3::new(9.0, 1.0, 1.0);
-                    next.hand_l.orientation = Quaternion::rotation_x(1.57);
-                    next.hand_r.position = Vec3::new(9.0, 1.0, 11.0);
-                    next.hand_r.orientation = Quaternion::rotation_x(1.57);
-                    next.main.position = Vec3::new(7.5, 7.5, 13.2);
-                    next.main.orientation = Quaternion::rotation_y(3.14);
-
-                    next.control.position = Vec3::new(-11.0, 1.8, 4.0);
-                },
-                _ => {},
+                (_, _) => {},
             }
         } else if mirror > 0.0 {
             next.hand_r.position = Vec3::new(
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index bc45025b2a..02204ecfb2 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -1228,6 +1228,7 @@ impl FigureMgr {
                                         (
                                             active_tool_kind,
                                             second_tool_kind,
+                                            hands,
                                             rel_vel.magnitude(),
                                             time,
                                             Some(s.stage_section),
@@ -1245,6 +1246,7 @@ impl FigureMgr {
                                         (
                                             active_tool_kind,
                                             second_tool_kind,
+                                            hands,
                                             rel_vel.magnitude(),
                                             time,
                                             Some(s.stage_section),
@@ -3582,6 +3584,40 @@ impl FigureMgr {
                                 skeleton_attr,
                             )
                         },
+                        CharacterState::Stunned(s) => {
+                            let stage_time = s.timer.as_secs_f32();
+                            let stage_progress = match s.stage_section {
+                                StageSection::Buildup => {
+                                    stage_time / s.static_data.buildup_duration.as_secs_f32()
+                                },
+                                StageSection::Recover => {
+                                    stage_time / s.static_data.recover_duration.as_secs_f32()
+                                },
+                                _ => 0.0,
+                            };
+                            match s.static_data.poise_state {
+                                PoiseState::Normal
+                                | PoiseState::Interrupted
+                                | PoiseState::Stunned
+                                | PoiseState::Dazed
+                                | PoiseState::KnockedDown => {
+                                    anim::biped_large::StunnedAnimation::update_skeleton(
+                                        &target_base,
+                                        (
+                                            active_tool_kind,
+                                            second_tool_kind,
+                                            rel_vel,
+                                            state.state_time,
+                                            state.acc_vel,
+                                            Some(s.stage_section),
+                                        ),
+                                        stage_progress,
+                                        &mut state_animation_rate,
+                                        skeleton_attr,
+                                    )
+                                },
+                            }
+                        },
                         CharacterState::Blink(s) => {
                             let stage_time = s.timer.as_secs_f32();
 

From 28778fbbd0e343d33eba7e7ecc464531c2c71548 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 13 Apr 2021 20:17:55 -0400
Subject: [PATCH 11/11] addressing commments

---
 voxygen/anim/src/biped_large/stunned.rs | 99 ++++++-------------------
 voxygen/anim/src/character/alpha.rs     | 17 ++---
 voxygen/anim/src/character/beta.rs      | 29 ++++----
 voxygen/anim/src/character/leapmelee.rs |  9 +--
 voxygen/anim/src/character/spin.rs      | 28 +++----
 voxygen/anim/src/character/wield.rs     | 56 ++------------
 voxygen/anim/src/dyn_lib.rs             | 32 ++++----
 voxygen/src/scene/figure/mod.rs         |  8 +-
 8 files changed, 80 insertions(+), 198 deletions(-)

diff --git a/voxygen/anim/src/biped_large/stunned.rs b/voxygen/anim/src/biped_large/stunned.rs
index 8cc8a838b5..674cb164a0 100644
--- a/voxygen/anim/src/biped_large/stunned.rs
+++ b/voxygen/anim/src/biped_large/stunned.rs
@@ -6,19 +6,12 @@ use common::{
     comp::item::{ToolKind, UniqueKind},
     states::utils::StageSection,
 };
-use std::{f32::consts::PI, ops::Mul};
+use std::f32::consts::PI;
 
 pub struct StunnedAnimation;
 
 impl Animation for StunnedAnimation {
-    type Dependency = (
-        Option<ToolKind>,
-        Option<ToolKind>,
-        Vec3<f32>,
-        f32,
-        f32,
-        Option<StageSection>,
-    );
+    type Dependency = (Option<ToolKind>, Vec3<f32>, f32, Option<StageSection>);
     type Skeleton = BipedLargeSkeleton;
 
     #[cfg(feature = "use-dyn-lib")]
@@ -27,7 +20,7 @@ impl Animation for StunnedAnimation {
     #[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_stunned")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (active_tool_kind, _second_tool_kind, velocity, global_time, acc_vel, stage_section): Self::Dependency,
+        (active_tool_kind, velocity, acc_vel, stage_section): Self::Dependency,
         anim_time: f32,
         _rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -56,44 +49,6 @@ impl Animation for StunnedAnimation {
         let slower = (anim_time * 1.0 + PI).sin();
         let slow = (anim_time * 3.5 + PI).sin();
 
-        let tailmove = Vec2::new(
-            (global_time / 2.0 + anim_time / 2.0)
-                .floor()
-                .mul(7331.0)
-                .sin()
-                * 0.25,
-            (global_time / 2.0 + anim_time / 2.0)
-                .floor()
-                .mul(1337.0)
-                .sin()
-                * 0.125,
-        );
-
-        let look = Vec2::new(
-            (global_time / 2.0 + anim_time / 8.0)
-                .floor()
-                .mul(7331.0)
-                .sin()
-                * 0.5,
-            (global_time / 2.0 + anim_time / 8.0)
-                .floor()
-                .mul(1337.0)
-                .sin()
-                * 0.25,
-        );
-
-        let breathe = if s_a.beast {
-            // Controls for the beast breathing
-            let intensity = 0.04;
-            let lenght = 1.5;
-            let chop = 0.2;
-            let chop_freq = 60.0;
-            intensity * (lenght * anim_time).sin()
-                + 0.05 * chop * (anim_time * chop_freq).sin() * (anim_time * lenght).cos()
-        } else {
-            0.0
-        };
-
         let footvertl = (anim_time * 16.0 * lab).sin();
         let footvertr = (anim_time * 16.0 * lab + PI).sin();
         let handhoril = (anim_time * 16.0 * lab + PI * 1.4).sin();
@@ -119,6 +74,11 @@ impl Animation for StunnedAnimation {
             next.hand_l.orientation = Quaternion::rotation_x(0.0);
             next.hand_r.orientation = Quaternion::rotation_x(0.0);
 
+            next.head.orientation =
+                Quaternion::rotation_x(movement1 * -0.2) * Quaternion::rotation_z(movement1 * -0.7);
+            next.upper_torso.orientation = Quaternion::rotation_x(movement1 * 0.5);
+            next.lower_torso.orientation = Quaternion::rotation_x(movement1 * -0.5);
+
             if speed > 0.5 {
                 next.shoulder_l.position = Vec3::new(
                     -s_a.shoulder.0,
@@ -137,37 +97,24 @@ impl Animation for StunnedAnimation {
                     Quaternion::rotation_x(0.6 * speednorm + (footrotl * -0.2) * speednorm);
             } else {
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1) * 1.02;
-                next.head.orientation = Quaternion::rotation_z(look.x * 0.6 + movement1 * 1.0)
-                    * Quaternion::rotation_x(look.y * 0.6);
 
-                next.upper_torso.position =
-                    Vec3::new(0.0, s_a.upper_torso.0, s_a.upper_torso.1 + torso * -0.5);
-                next.upper_torso.orientation =
-                    Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
-
-                next.lower_torso.position =
-                    Vec3::new(0.0, s_a.lower_torso.0, s_a.lower_torso.1 + torso * 0.5);
-                next.lower_torso.orientation =
-                    Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
+                next.lower_torso.orientation = Quaternion::rotation_x(0.0);
                 next.lower_torso.scale = Vec3::one() * 1.02;
 
                 next.jaw.position =
                     Vec3::new(0.0, s_a.jaw.0 - slower * 0.12, s_a.jaw.1 + slow * 0.2);
-                next.jaw.orientation = Quaternion::rotation_x(-0.1 + breathe * 2.0);
+                next.jaw.orientation = Quaternion::rotation_x(-0.1);
 
                 next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1);
-                next.tail.orientation = Quaternion::rotation_z(0.0 + slow * 0.2 + tailmove.x)
-                    * Quaternion::rotation_x(0.0);
+                next.tail.orientation = Quaternion::rotation_z(slow * 0.2);
 
                 next.shoulder_l.position =
                     Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
-                next.shoulder_l.orientation =
-                    Quaternion::rotation_y(0.0) * Quaternion::rotation_x(0.3);
+                next.shoulder_l.orientation = Quaternion::rotation_x(0.3);
 
                 next.shoulder_r.position =
                     Vec3::new(s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2);
-                next.shoulder_r.orientation =
-                    Quaternion::rotation_y(0.0) * Quaternion::rotation_x(0.3);
+                next.shoulder_r.orientation = Quaternion::rotation_x(0.3);
             }
             match active_tool_kind {
                 Some(ToolKind::SwordSimple) => {
@@ -182,9 +129,8 @@ impl Animation for StunnedAnimation {
 
                     next.control_l.orientation =
                         Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.2);
-                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.2)
-                        * Quaternion::rotation_y(0.2)
-                        * Quaternion::rotation_z(0.0);
+                    next.control_r.orientation =
+                        Quaternion::rotation_x(PI / 2.2) * Quaternion::rotation_y(0.2);
 
                     next.control.orientation =
                         Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(-0.1);
@@ -201,9 +147,8 @@ impl Animation for StunnedAnimation {
 
                     next.control_l.orientation =
                         Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.2);
-                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.2)
-                        * Quaternion::rotation_y(0.2)
-                        * Quaternion::rotation_z(0.0);
+                    next.control_r.orientation =
+                        Quaternion::rotation_x(PI / 2.2) * Quaternion::rotation_y(0.2);
 
                     next.control.orientation = Quaternion::rotation_x(-0.2 + short * 0.2)
                         * Quaternion::rotation_y(1.0)
@@ -221,9 +166,7 @@ impl Animation for StunnedAnimation {
 
                     next.control_l.orientation =
                         Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_y(-0.0);
-                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.0 + 0.2)
-                        * Quaternion::rotation_y(0.0)
-                        * Quaternion::rotation_z(0.0);
+                    next.control_r.orientation = Quaternion::rotation_x(PI / 2.0 + 0.2);
 
                     next.control.orientation =
                         Quaternion::rotation_x(-1.0 + short * 0.2) * Quaternion::rotation_y(-1.8);
@@ -282,8 +225,8 @@ impl Animation for StunnedAnimation {
                     if speed < 0.5 {
                         next.head.position =
                             Vec3::new(0.0, s_a.head.0, s_a.head.1 + torso * 0.2) * 1.02;
-                        next.head.orientation = Quaternion::rotation_z(look.x * 0.6)
-                            * Quaternion::rotation_x(look.y * 0.6);
+                        next.head.orientation =
+                            Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
 
                         next.upper_torso.position =
                             Vec3::new(0.0, s_a.upper_torso.0, s_a.upper_torso.1 + torso * 0.5);
@@ -294,7 +237,7 @@ impl Animation for StunnedAnimation {
                         next.jaw.orientation = Quaternion::rotation_x(-0.1);
 
                         next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1);
-                        next.tail.orientation = Quaternion::rotation_z(slow * 0.2 + tailmove.x);
+                        next.tail.orientation = Quaternion::rotation_z(slow * 0.2);
 
                         next.second.orientation = Quaternion::rotation_x(PI);
 
diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs
index 04a34a749c..6e3f3076f3 100644
--- a/voxygen/anim/src/character/alpha.rs
+++ b/voxygen/anim/src/character/alpha.rs
@@ -12,8 +12,6 @@ pub struct AlphaAnimation;
 
 type AlphaAnimationDependency = (
     (Option<Hands>, Option<Hands>),
-    f32,
-    f32,
     Option<StageSection>,
     Option<AbilityInfo>,
 );
@@ -28,7 +26,7 @@ impl Animation for AlphaAnimation {
     #[allow(clippy::approx_constant)] // TODO: Pending review in #587
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency,
+        (hands, stage_section, ability_info): Self::Dependency,
         anim_time: f32,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -39,9 +37,7 @@ impl Animation for AlphaAnimation {
         let (move1, move2, move3, move2h) = match stage_section {
             Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),
             Some(StageSection::Swing) => (1.0, anim_time.powi(2), 0.0, anim_time.powf(0.25)),
-            Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0), /* hmm maybe don' */
-            // t complete the
-            // recovery?
+            Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0),
             _ => (0.0, 0.0, 0.0, 0.0),
         };
 
@@ -58,11 +54,11 @@ impl Animation for AlphaAnimation {
                 next.main.orientation = Quaternion::rotation_x(0.0);
 
                 next.chest.orientation =
-                    Quaternion::rotation_z(move1 * 1.1 + move2 * -2.0 + move3 * 0.5);
+                    Quaternion::rotation_z(move1 * 1.1 + move2 * -2.0 + move3 * 0.2);
 
                 next.head.position = Vec3::new(0.0 + move2 * 2.0, s_a.head.0, s_a.head.1);
                 next.head.orientation =
-                    Quaternion::rotation_z(move1 * -0.9 + move2 * 1.8 + move3 * -0.5);
+                    Quaternion::rotation_z(move1 * -0.9 + move2 * 1.8 + move3 * -0.2);
             },
 
             Some(ToolKind::Axe) => {
@@ -72,8 +68,7 @@ impl Animation for AlphaAnimation {
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
                     _ => (0.0, 0.0, 0.0),
                 };
-                next.head.position =
-                    Vec3::new(0. + move2 * 2.0, s_a.head.0 + move2 * 2.0, s_a.head.1);
+                next.head.position = Vec3::new(move2 * 2.0, s_a.head.0 + move2 * 2.0, s_a.head.1);
                 next.chest.orientation =
                     Quaternion::rotation_x(0.0 + move1 * 0.6 + move2 * -0.6 + move3 * 0.4)
                         * Quaternion::rotation_y(0.0 + move1 * 0.0 + move2 * 0.0 + move3 * 0.0)
@@ -127,7 +122,7 @@ impl Animation for AlphaAnimation {
                     );
                     next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + move1 * -1.3)
                         * Quaternion::rotation_y(s_a.sc.4 + move1 * -0.7 + move2 * 1.2)
-                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -1.57);
+                        * Quaternion::rotation_z(s_a.sc.5 + move1 * -1.57 + move3 * -1.57);
                 },
                 Some(ToolKind::Axe) => {
                     next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
diff --git a/voxygen/anim/src/character/beta.rs b/voxygen/anim/src/character/beta.rs
index 7ef8457630..0d7563a3b1 100644
--- a/voxygen/anim/src/character/beta.rs
+++ b/voxygen/anim/src/character/beta.rs
@@ -44,11 +44,11 @@ impl Animation for BetaAnimation {
         next.second.orientation = Quaternion::rotation_z(0.0);
         next.main.position = Vec3::new(0.0, 0.0, 0.0);
         next.main.orientation = Quaternion::rotation_x(0.0);
-
+        let pullback = 1.0 - move3;
         if let Some(ToolKind::Sword) = ability_info.and_then(|a| a.tool) {
             next.chest.orientation = Quaternion::rotation_x(0.15)
-                * Quaternion::rotation_y((-0.1) * (1.0 - move3))
-                * Quaternion::rotation_z((0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3));
+                * Quaternion::rotation_y((-0.1) * pullback)
+                * Quaternion::rotation_z((0.4 + move1 * 1.5 + move2 * -2.5) * pullback);
             next.head.orientation = Quaternion::rotation_z(-0.4 + move1 * -1.0 + move2 * 1.5);
         }
         match hands {
@@ -62,18 +62,15 @@ impl Animation for BetaAnimation {
                         Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
 
                     next.control.position = Vec3::new(
-                        s_a.sc.0 + (-1.4 + move1 * -3.0 + move2 * -2.0) * (1.0 - move3),
-                        s_a.sc.1 + (-1.4 + move1 * 3.0 + move2 * 3.0) * (1.0 - move3),
-                        s_a.sc.2 + (-1.9 + move1 * 2.5 * (1.0 - move3)),
+                        s_a.sc.0 + (-1.4 + move1 * -3.0 + move2 * -2.0) * pullback,
+                        s_a.sc.1 + (-1.4 + move1 * 3.0 + move2 * 3.0) * pullback,
+                        s_a.sc.2 + (-1.9 + move1 * 2.5 * pullback),
                     );
-                    next.control.orientation =
-                        Quaternion::rotation_x(s_a.sc.3 + (-1.7) * (1.0 - move3))
-                            * Quaternion::rotation_y(
-                                s_a.sc.4 + (0.4 + move1 * 1.5 + move2 * -2.5) * (1.0 - move3),
-                            )
-                            * Quaternion::rotation_z(
-                                s_a.sc.5 + (1.67 + move2 * 1.57) * (1.0 - move3),
-                            );
+                    next.control.orientation = Quaternion::rotation_x(s_a.sc.3 + (-1.7) * pullback)
+                        * Quaternion::rotation_y(
+                            s_a.sc.4 + (0.4 + move1 * 1.5 + move2 * -2.5) * pullback,
+                        )
+                        * Quaternion::rotation_z(s_a.sc.5 + (1.67 + move2 * 1.57) * pullback);
                 },
                 _ => {},
             },
@@ -85,7 +82,7 @@ impl Animation for BetaAnimation {
                 Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                     next.control_l.position = Vec3::new(-12.0, 8.0, 2.0);
                     next.control_l.orientation = Quaternion::rotation_x(1.7)
-                        * Quaternion::rotation_y(-3.7 + move1 * 0.5)
+                        * Quaternion::rotation_y(-3.7 + move1 * -0.75 + move2 * 1.0)
                         * Quaternion::rotation_z(3.69);
                     next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                     next.hand_l.orientation = Quaternion::rotation_x(1.57)
@@ -101,7 +98,7 @@ impl Animation for BetaAnimation {
                     Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
                         next.control_r.position = Vec3::new(0.0 + move1 * -8.0, 13.0, 2.0);
                         next.control_r.orientation = Quaternion::rotation_x(1.7)
-                            * Quaternion::rotation_y(-2.3 + move1 * -1.3)
+                            * Quaternion::rotation_y(-2.3 + move1 * -2.3 + move2 * 1.0)
                             * Quaternion::rotation_z(3.69);
                         next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
                         next.hand_r.orientation = Quaternion::rotation_x(1.57)
diff --git a/voxygen/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs
index ce7a6c139f..17ab9c9a38 100644
--- a/voxygen/anim/src/character/leapmelee.rs
+++ b/voxygen/anim/src/character/leapmelee.rs
@@ -83,8 +83,7 @@ impl Animation for LeapAnimation {
                 next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
 
                 next.torso.orientation =
-                    Quaternion::rotation_x(move1 * 0.4 + move2 * 0.6 + move3 * -1.0)
-                        * Quaternion::rotation_y(0.0)
+                    Quaternion::rotation_x(move1 * 0.3 + move2 * 0.5 + move3 * -1.0)
                         * Quaternion::rotation_z(move1 * 0.4 + move2 * 0.4);
 
                 next.head.orientation = Quaternion::rotation_x(move2 * -0.6 + move3 * 0.8)
@@ -149,9 +148,9 @@ impl Animation for LeapAnimation {
                         s_a.ac.1 + move3 * -10.0,
                         s_a.ac.2 + move3 * 4.0,
                     );
-                    next.control.orientation = Quaternion::rotation_x(
-                    s_a.ac.3) * Quaternion::rotation_y(s_a.ac.4+move2*-0.8+move3*-4.0)// + move1 * 0.5)
-                    * Quaternion::rotation_z(s_a.ac.5+move2*-0.6+move3*-1.6); // - move1 * 0.2);
+                    next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
+                        * Quaternion::rotation_y(s_a.ac.4 + move2 * -0.8 + move3 * -4.0)
+                        * Quaternion::rotation_z(s_a.ac.5 + move2 * -0.6 + move3 * -1.6);
                 },
                 _ => {},
             },
diff --git a/voxygen/anim/src/character/spin.rs b/voxygen/anim/src/character/spin.rs
index 8934ba5bcf..ee3cd0b220 100644
--- a/voxygen/anim/src/character/spin.rs
+++ b/voxygen/anim/src/character/spin.rs
@@ -136,14 +136,14 @@ impl Animation for SpinAnimation {
                         Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
 
                     next.control.position = Vec3::new(
-                        s_a.sc.0 + move1 * 2.0 + move2 * -7.0,
-                        s_a.sc.1 + 8.0 + move1 * 0.6 + move2 * -15.0,
-                        s_a.sc.2 + 1.0 + move1 * 0.6 + move2 * 1.5,
+                        s_a.sc.0 + movement1base * 2.0 + movement2base * -7.0,
+                        s_a.sc.1 + 8.0 + movement1base * 0.6 + movement2base * -15.0,
+                        s_a.sc.2 + 1.0 + movement1base * 0.6 + movement2base * 1.5,
                     );
                     next.control.orientation =
-                        Quaternion::rotation_x(-0.5 + s_a.sc.3 + move1 * -1.2)
-                            * Quaternion::rotation_y(s_a.sc.4 - 0.6 + move1 * 0.0 + move2 * -0.2)
-                            * Quaternion::rotation_z(s_a.sc.5 + 0.1 + move1 * 1.57);
+                        Quaternion::rotation_x(-0.5 + s_a.sc.3 + movement1base * -1.2)
+                            * Quaternion::rotation_y(s_a.sc.4 - 0.6 + movement2base * -0.2)
+                            * Quaternion::rotation_z(s_a.sc.5 - 1.57 + movement1base * PI);
                 },
                 Some(ToolKind::Axe) => {
                     next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
@@ -176,22 +176,22 @@ impl Animation for SpinAnimation {
         match hands {
             (Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
                 Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
-                    next.control_l.position = Vec3::new(-7.0 + move2 * -5.0, 8.0, 2.0);
+                    next.control_l.position = Vec3::new(-7.0 + movement2base * -5.0, 8.0, 2.0);
                     next.control_l.orientation = Quaternion::rotation_x(1.7)
-                        * Quaternion::rotation_y(-2.7 + move1 * -1.0 + move2 * 2.0)
-                        * Quaternion::rotation_z(1.5 + move1 * PI);
+                        * Quaternion::rotation_y(-2.7 + movement1base * -1.0 + movement2base * 2.0)
+                        * Quaternion::rotation_z(1.5 + movement1base * PI);
                     next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                     next.hand_l.orientation = Quaternion::rotation_x(1.57)
                 },
                 Some(ToolKind::Axe) => {
                     next.control_l.position = Vec3::new(
-                        -2.0 + move1 * -5.0,
-                        18.0 + move1 * -10.0,
-                        6.0 + move1 * -10.0,
+                        -2.0 + movement1base * -5.0,
+                        18.0 + movement1base * -10.0,
+                        6.0 + movement1base * -10.0,
                     );
-                    next.control_l.orientation = Quaternion::rotation_x(1.7 + move2 * 1.5)
+                    next.control_l.orientation = Quaternion::rotation_x(1.7 + movement2base * 1.5)
                         * Quaternion::rotation_y(-3.7)
-                        * Quaternion::rotation_z(1.5 + move2 * 1.57);
+                        * Quaternion::rotation_z(1.5 + movement2base * 1.57);
                     next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
                     next.hand_l.orientation = Quaternion::rotation_x(1.57)
                 },
diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs
index 028a20c560..30780724b8 100644
--- a/voxygen/anim/src/character/wield.rs
+++ b/voxygen/anim/src/character/wield.rs
@@ -111,18 +111,14 @@ impl Animation for WieldAnimation {
                         (0.3 - direction * 0.4) * (1.0 - tilt.abs()) + look_dir.z * 0.7,
                     );
 
-            next.chest.position = Vec3::new(
-                0.0 + short * strafe,
-                s_a.chest.0,
-                s_a.chest.1 + shortalt * -1.5,
-            );
+            next.chest.position =
+                Vec3::new(short * strafe, s_a.chest.0, s_a.chest.1 + shortalt * -1.5);
         } else {
-            next.head.position = Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1 + u_slow * 0.1);
+            next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + u_slow * 0.1);
             next.head.orientation = Quaternion::rotation_z(head_look.x + tilt * -0.75)
                 * Quaternion::rotation_x(head_look.y.abs() + look_dir.z * 0.7);
 
-            next.chest.position =
-                Vec3::new(0.0 + slowalt * 0.5, s_a.chest.0, s_a.chest.1 + u_slow * 0.5);
+            next.chest.position = Vec3::new(slowalt * 0.5, s_a.chest.0, s_a.chest.1 + u_slow * 0.5);
             next.belt.orientation = Quaternion::rotation_z(0.15 + beltstatic * tilt * 0.1);
 
             next.shorts.orientation = Quaternion::rotation_z(0.3 + beltstatic * tilt * 0.2);
@@ -158,9 +154,6 @@ impl Animation for WieldAnimation {
         match hands {
             (Some(Hands::Two), _) => match active_tool_kind {
                 Some(ToolKind::Sword) | Some(ToolKind::SwordSimple) => {
-                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.main.orientation = Quaternion::rotation_x(0.0);
-
                     next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
                     next.hand_l.orientation =
                         Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
@@ -177,26 +170,12 @@ impl Animation for WieldAnimation {
                     next.control.position = Vec3::new(0.0, 0.0, 0.0);
 
                     next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.hand_l.orientation = Quaternion::rotation_x(0.0 * PI)
-                        * Quaternion::rotation_y(0.0 * PI)
-                        * Quaternion::rotation_z(0.0 * PI);
-
-                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.main.orientation = Quaternion::rotation_x(0.0 * PI)
-                        * Quaternion::rotation_y(0.0 * PI)
-                        * Quaternion::rotation_z(0.0 * PI);
+                    next.hand_l.orientation = Quaternion::rotation_x(0.0);
 
                     next.control_l.position = Vec3::new(-7.0, 0.0, 0.0);
 
                     next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.hand_r.orientation = Quaternion::rotation_x(0.0 * PI)
-                        * Quaternion::rotation_y(0.0 * PI)
-                        * Quaternion::rotation_z(0.0 * PI);
-
-                    next.second.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.second.orientation = Quaternion::rotation_x(0.0 * PI)
-                        * Quaternion::rotation_y(0.0 * PI)
-                        * Quaternion::rotation_z(0.0 * PI);
+                    next.hand_r.orientation = Quaternion::rotation_x(0.0);
 
                     next.control_r.position = Vec3::new(7.0, 0.0, 0.0);
                 },
@@ -235,8 +214,6 @@ impl Animation for WieldAnimation {
                         * Quaternion::rotation_z(s_a.ac.5);
                 },
                 Some(ToolKind::Hammer) | Some(ToolKind::HammerSimple) | Some(ToolKind::Pick) => {
-                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.main.orientation = Quaternion::rotation_x(0.0);
                     next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2);
                     next.hand_l.orientation =
                         Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
@@ -267,8 +244,6 @@ impl Animation for WieldAnimation {
                         next.hand_r.orientation =
                             Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
                     };
-                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.main.orientation = Quaternion::rotation_y(0.0);
 
                     next.control.position =
                         Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2 + direction * -5.0);
@@ -280,25 +255,6 @@ impl Animation for WieldAnimation {
                         * Quaternion::rotation_y(s_a.stc.4)
                         * Quaternion::rotation_z(s_a.stc.5 + u_slowalt * 0.1);
                 },
-                Some(ToolKind::Shield) => {
-                    next.control.position = Vec3::new(0.0, 0.0, 0.0);
-
-                    next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.hand_l.orientation = Quaternion::rotation_x(0.0 * PI);
-
-                    next.main.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.main.orientation = Quaternion::rotation_x(0.0 * PI);
-
-                    next.control_l.position = Vec3::new(-7.0, 0.0, 0.0);
-
-                    next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.hand_r.orientation = Quaternion::rotation_x(0.0);
-
-                    next.second.position = Vec3::new(0.0, 0.0, 0.0);
-                    next.second.orientation = Quaternion::rotation_x(0.0 * PI);
-
-                    next.control_r.position = Vec3::new(7.0, 0.0, 0.0);
-                },
                 Some(ToolKind::Bow) => {
                     next.main.position = Vec3::new(0.0, 0.0, 0.0);
                     next.main.orientation = Quaternion::rotation_x(0.0);
diff --git a/voxygen/anim/src/dyn_lib.rs b/voxygen/anim/src/dyn_lib.rs
index e1adea401d..8c7feaf030 100644
--- a/voxygen/anim/src/dyn_lib.rs
+++ b/voxygen/anim/src/dyn_lib.rs
@@ -146,25 +146,23 @@ pub fn init() {
     // Start reloader that watcher signals
     // "Debounces" events since I can't find the option to do this in the latest
     // `notify`
-    std::thread::Builder::new()
-        .name("voxygen_anim_watcher".to_owned())
-        .spawn(move || {
-            let mut modified_paths = std::collections::HashSet::new();
-            while let Ok(path) = reload_recv.recv() {
+    std::thread::Builder::new("voxygen_anim_watcher".to_owned()).spawn(move || {
+        let mut modified_paths = std::collections::HashSet::new();
+        while let Ok(path) = reload_recv.recv() {
+            modified_paths.insert(path);
+            // Wait for any additional modify events before reloading
+            while let Ok(path) = reload_recv.recv_timeout(Duration::from_millis(300)) {
                 modified_paths.insert(path);
-                // Wait for any additional modify events before reloading
-                while let Ok(path) = reload_recv.recv_timeout(Duration::from_millis(300)) {
-                    modified_paths.insert(path);
-                }
-
-                info!(
-                    ?modified_paths,
-                    "Hot reloading animations because files in `anim` modified."
-                );
-
-                hotreload();
             }
-        });
+
+            info!(
+                ?modified_paths,
+                "Hot reloading animations because files in `anim` modified."
+            );
+
+            hotreload();
+        }
+    });
 
     // Let the watcher live forever
     std::mem::forget(watcher);
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 02204ecfb2..54fadc9671 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -898,8 +898,6 @@ impl FigureMgr {
                                 &target_base,
                                 (
                                     hands,
-                                    rel_vel.magnitude(),
-                                    time,
                                     Some(s.stage_section),
                                     Some(s.static_data.ability_info),
                                 ),
@@ -1054,7 +1052,7 @@ impl FigureMgr {
                         CharacterState::Boost(_) => {
                             anim::character::AlphaAnimation::update_skeleton(
                                 &target_base,
-                                (hands, rel_vel.magnitude(), time, None, None),
+                                (hands, None, None),
                                 state.state_time,
                                 &mut state_animation_rate,
                                 skeleton_attr,
@@ -1341,8 +1339,6 @@ impl FigureMgr {
                                     &target_base,
                                     (
                                         hands,
-                                        rel_vel.magnitude(),
-                                        time,
                                         Some(s.stage_section),
                                         Some(s.static_data.ability_info),
                                     ),
@@ -3605,9 +3601,7 @@ impl FigureMgr {
                                         &target_base,
                                         (
                                             active_tool_kind,
-                                            second_tool_kind,
                                             rel_vel,
-                                            state.state_time,
                                             state.acc_vel,
                                             Some(s.stage_section),
                                         ),