diff --git a/voxygen/src/anim/character/cidle.rs b/voxygen/src/anim/character/cidle.rs
index 6557b97984..1c7026dacb 100644
--- a/voxygen/src/anim/character/cidle.rs
+++ b/voxygen/src/anim/character/cidle.rs
@@ -2,6 +2,7 @@ use super::{
     super::{Animation, SkeletonAttr},
     CharacterSkeleton,
 };
+use common::comp::item::Weapon;
 use std::{f32::consts::PI, ops::Mul};
 use vek::*;
 
@@ -60,166 +61,175 @@ impl Animation for CidleAnimation {
         next.shorts.ori = Quaternion::rotation_x(0.0);
         next.shorts.scale = Vec3::one();
 
-        if skeleton_attr.weapon_id == 1.0 {
-            next.l_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.5 + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.0 + wave_ultra_slow_cos * 0.5,
-                -2.0 + wave_ultra_slow * 1.0,
-            );
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
-                4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 2.0 {
-            next.l_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.5 + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.0 + wave_ultra_slow_cos * 0.5,
-                -2.0 + wave_ultra_slow * 1.0,
-            );
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
-                4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 3.0 {
-            next.l_hand.offset = Vec3::new(-7.0, 8.25, 2.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(wave_ultra_slow * 0.2);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(7.0, 7.0, -3.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(wave_ultra_slow * 0.2);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                5.0 + skeleton_attr.weapon_x,
-                8.75 + skeleton_attr.weapon_y,
-                -2.5,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(wave_ultra_slow * 0.2);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 4.0 {
-            next.l_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.5 + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.0 + wave_ultra_slow_cos * 0.5,
-                -2.0 + wave_ultra_slow * 1.0,
-            );
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
-                4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 5.0 {
-            next.l_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.5 + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.0 + wave_ultra_slow_cos * 0.5,
-                -2.0 + wave_ultra_slow * 1.0,
-            );
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
-                4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 6.0 {
-            next.l_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.5 + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.0 + wave_ultra_slow_cos * 0.5,
-                -2.0 + wave_ultra_slow * 1.0,
-            );
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
-                4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 7.0 {
-            next.l_hand.offset = Vec3::new(
-                -6.0 + wave_ultra_slow_cos * 1.0,
-                3.5 + wave_ultra_slow_cos * 0.5,
-                0.0 + wave_ultra_slow * 1.0,
-            );
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
+        match Weapon::Hammer {
+            //TODO: Inventory
+            Weapon::Sword => {
+                next.l_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.5 + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.0 + wave_ultra_slow_cos * 0.5,
+                    -2.0 + wave_ultra_slow * 1.0,
+                );
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
+                    4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Axe => {
+                next.l_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.5 + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.0 + wave_ultra_slow_cos * 0.5,
+                    -2.0 + wave_ultra_slow * 1.0,
+                );
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
+                    4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Hammer => {
+                next.l_hand.offset = Vec3::new(-7.0, 8.25, 2.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(wave_ultra_slow * 0.2);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(7.0, 7.0, -3.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(wave_ultra_slow * 0.2);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    5.0 + skeleton_attr.weapon_x,
+                    8.75 + skeleton_attr.weapon_y,
+                    -2.5,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(wave_ultra_slow * 0.2);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Staff => {
+                next.l_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.5 + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.0 + wave_ultra_slow_cos * 0.5,
+                    -2.0 + wave_ultra_slow * 1.0,
+                );
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
+                    4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::SwordShield => {
+                next.l_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.5 + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.0 + wave_ultra_slow_cos * 0.5,
+                    -2.0 + wave_ultra_slow * 1.0,
+                );
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
+                    4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Bow => {
+                next.l_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.5 + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.0 + wave_ultra_slow_cos * 0.5,
+                    -2.0 + wave_ultra_slow * 1.0,
+                );
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x + wave_ultra_slow_cos * 1.0,
+                    4.5 + skeleton_attr.weapon_y + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Daggers => {
+                next.l_hand.offset = Vec3::new(
+                    -6.0 + wave_ultra_slow_cos * 1.0,
+                    3.5 + wave_ultra_slow_cos * 0.5,
+                    0.0 + wave_ultra_slow * 1.0,
+                );
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
         }
         next.l_foot.offset = Vec3::new(-3.4, -1.5, 8.0 + wave_slow * 0.2);
         next.l_foot.ori = Quaternion::rotation_x(wave_ultra_slow_cos * 0.015);
diff --git a/voxygen/src/anim/character/cjump.rs b/voxygen/src/anim/character/cjump.rs
index 797b8c9c7c..d464f40498 100644
--- a/voxygen/src/anim/character/cjump.rs
+++ b/voxygen/src/anim/character/cjump.rs
@@ -2,6 +2,7 @@ use super::{
     super::{Animation, SkeletonAttr},
     CharacterSkeleton,
 };
+use common::comp::item::Weapon;
 use std::f32::consts::PI;
 use vek::*;
 
@@ -42,126 +43,135 @@ impl Animation for CjumpAnimation {
         next.shorts.ori = Quaternion::rotation_z(0.0);
         next.shorts.scale = Vec3::one();
 
-        if skeleton_attr.weapon_id == 1.0 {
-            next.l_hand.offset = Vec3::new(-7.0, 3.25, 0.25 + wave_stop * 2.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-7.0, 3.0, -2.0 + wave_stop * 2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -7.0 + skeleton_attr.weapon_x,
-                4.0 + skeleton_attr.weapon_y,
-                0.0 + wave_stop * 2.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 2.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 3.0 {
-            next.l_hand.offset = Vec3::new(-7.0, 8.25, 2.0 + wave_stop * 2.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(0.0);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(7.0, 7.0, -3.0 + wave_stop * 2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(0.0);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                5.0 + skeleton_attr.weapon_x,
-                8.75 + skeleton_attr.weapon_y,
-                -2.5 + wave_stop * 2.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 4.0 {
-            next.l_hand.offset = Vec3::new(-7.0, 7.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.7)
-                * Quaternion::rotation_z(1.0);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(7.0, 6.25, 1.5);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.7)
-                * Quaternion::rotation_z(1.0);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                5.0 + skeleton_attr.weapon_x,
-                8.0 + skeleton_attr.weapon_y,
-                1.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.7)
-                * Quaternion::rotation_z(1.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 5.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 6.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 7.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
+        match Weapon::Hammer {
+            //TODO: Inventory
+            Weapon::Sword => {
+                next.l_hand.offset = Vec3::new(-7.0, 3.25, 0.25 + wave_stop * 2.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-7.0, 3.0, -2.0 + wave_stop * 2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -7.0 + skeleton_attr.weapon_x,
+                    4.0 + skeleton_attr.weapon_y,
+                    0.0 + wave_stop * 2.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Axe => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Hammer => {
+                next.l_hand.offset = Vec3::new(-7.0, 8.25, 2.0 + wave_stop * 2.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(0.0);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(7.0, 7.0, -3.0 + wave_stop * 2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(0.0);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    5.0 + skeleton_attr.weapon_x,
+                    8.75 + skeleton_attr.weapon_y,
+                    -2.5 + wave_stop * 2.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Staff => {
+                next.l_hand.offset = Vec3::new(-7.0, 7.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.7)
+                    * Quaternion::rotation_z(1.0);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(7.0, 6.25, 1.5);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.7)
+                    * Quaternion::rotation_z(1.0);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    5.0 + skeleton_attr.weapon_x,
+                    8.0 + skeleton_attr.weapon_y,
+                    1.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.7)
+                    * Quaternion::rotation_z(1.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::SwordShield => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Bow => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Daggers => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
         }
 
         next.l_foot.offset = Vec3::new(-3.4, 1.0, 6.0);
diff --git a/voxygen/src/anim/character/crun.rs b/voxygen/src/anim/character/crun.rs
index 88421bc458..fcb2d617b4 100644
--- a/voxygen/src/anim/character/crun.rs
+++ b/voxygen/src/anim/character/crun.rs
@@ -2,6 +2,7 @@ use super::{
     super::{Animation, SkeletonAttr},
     CharacterSkeleton,
 };
+use common::comp::item::Weapon;
 use std::f32::consts::PI;
 use std::ops::Mul;
 use vek::*;
@@ -60,122 +61,131 @@ impl Animation for CrunAnimation {
         next.shorts.ori = Quaternion::rotation_z(wave * 0.6);
         next.shorts.scale = Vec3::one();
 
-        if skeleton_attr.weapon_id == 1.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.75, 0.25);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.0 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 2.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 3.0 {
-            next.l_hand.offset = Vec3::new(-7.0, 8.25, 3.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(wave * -0.25);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(7.0, 7.0, -1.5);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(wave * -0.25);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                5.0 + skeleton_attr.weapon_x,
-                8.75 + skeleton_attr.weapon_y,
-                -2.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(-1.2)
-                * Quaternion::rotation_z(wave * -0.25);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 4.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 5.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 6.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
-        } else if skeleton_attr.weapon_id == 7.0 {
-            next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
-            next.l_hand.ori = Quaternion::rotation_x(-0.3);
-            next.l_hand.scale = Vec3::one() * 1.01;
-            next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
-            next.r_hand.ori = Quaternion::rotation_x(-0.3);
-            next.r_hand.scale = Vec3::one() * 1.01;
-            next.weapon.offset = Vec3::new(
-                -6.0 + skeleton_attr.weapon_x,
-                4.5 + skeleton_attr.weapon_y,
-                0.0,
-            );
-            next.weapon.ori = Quaternion::rotation_x(-0.3)
-                * Quaternion::rotation_y(0.0)
-                * Quaternion::rotation_z(0.0);
-            next.weapon.scale = Vec3::one();
+        match Weapon::Hammer {
+            //TODO: Inventory
+            Weapon::Sword => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.75, 0.25);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.0 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Axe => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Hammer => {
+                next.l_hand.offset = Vec3::new(-7.0, 8.25, 3.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(wave * -0.25);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(7.0, 7.0, -1.5);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(wave * -0.25);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    5.0 + skeleton_attr.weapon_x,
+                    8.75 + skeleton_attr.weapon_y,
+                    -2.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(-1.2)
+                    * Quaternion::rotation_z(wave * -0.25);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Staff => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::SwordShield => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Bow => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
+            Weapon::Daggers => {
+                next.l_hand.offset = Vec3::new(-6.0, 3.5, 0.0);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3);
+                next.l_hand.scale = Vec3::one() * 1.01;
+                next.r_hand.offset = Vec3::new(-6.0, 3.0, -2.0);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3);
+                next.r_hand.scale = Vec3::one() * 1.01;
+                next.weapon.offset = Vec3::new(
+                    -6.0 + skeleton_attr.weapon_x,
+                    4.5 + skeleton_attr.weapon_y,
+                    0.0,
+                );
+                next.weapon.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
+                next.weapon.scale = Vec3::one();
+            }
         }
         next.l_foot.offset = Vec3::new(-3.4, 0.0 + wave_cos * 1.0, 6.0 - wave_cos_dub * 0.11);
         next.l_foot.ori = Quaternion::rotation_x(-0.0 - wave_cos * 1.5);
diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs
index a699f300df..43fcb38fca 100644
--- a/voxygen/src/anim/mod.rs
+++ b/voxygen/src/anim/mod.rs
@@ -54,7 +54,6 @@ pub struct SkeletonAttr {
     neck_right: f32,
     weapon_x: f32,
     weapon_y: f32,
-    weapon_id: f32,
 }
 
 impl Default for SkeletonAttr {
@@ -67,7 +66,6 @@ impl Default for SkeletonAttr {
             neck_right: 1.0,
             weapon_x: 1.0,
             weapon_y: 1.0,
-            weapon_id: 0.0,
         }
     }
 }
@@ -166,16 +164,6 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
                 Weapon::Bow => -2.0,
                 Weapon::Daggers => -2.0,
             },
-            weapon_id: match Weapon::Hammer {
-                // TODO: Inventory
-                Weapon::Sword => 1.0,
-                Weapon::Axe => 2.0,
-                Weapon::Hammer => 3.0,
-                Weapon::SwordShield => 4.0,
-                Weapon::Staff => 5.0,
-                Weapon::Bow => 6.0,
-                Weapon::Daggers => 7.0,
-            },
         }
     }
 }