From 298e28b7d99aca877105b726691c22719eef3e9e Mon Sep 17 00:00:00 2001
From: AdamWhitehurst <Adam.Whitehurst@live.com>
Date: Fri, 27 Mar 2020 11:00:58 -0700
Subject: [PATCH] Add triple_strike anims for axe and hammer

---
 common/src/comp/inventory/item.rs  | 34 +++++++++++++++---------------
 voxygen/src/anim/character/beta.rs |  2 +-
 voxygen/src/anim/character/spin.rs |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index ded78545c1..f8311d0fa3 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -81,28 +81,28 @@ impl ToolData {
                     base_damage: 10,
                 },
             ],
-            Axe(_) => vec![BasicMelee {
-                energy_cost: 0,
-                buildup_duration: Duration::from_millis(700),
-                recover_duration: Duration::from_millis(100),
-                base_healthchange: -8,
-                range: 3.5,
-                max_angle: 30.0,
-            }],
-            Hammer(_) => vec![
-                BasicMelee {
-                    energy_cost: 0,
-                    buildup_duration: Duration::from_millis(700),
-                    recover_duration: Duration::from_millis(300),
-                    base_healthchange: -10,
-                    range: 3.5,
-                    max_angle: 60.0,
-                },
+            Axe(_) => vec![
                 TripleStrike {
                     base_damage: 7,
                     needs_timing: true,
                 },
+                BasicMelee {
+                    energy_cost: 0,
+                    buildup_duration: Duration::from_millis(700),
+                    recover_duration: Duration::from_millis(100),
+                    base_healthchange: -8,
+                    range: 3.5,
+                    max_angle: 30.0,
+                },
             ],
+            Hammer(_) => vec![BasicMelee {
+                energy_cost: 0,
+                buildup_duration: Duration::from_millis(700),
+                recover_duration: Duration::from_millis(300),
+                base_healthchange: -10,
+                range: 3.5,
+                max_angle: 60.0,
+            }],
             Bow(_) => vec![BasicRanged {
                 energy_cost: 0,
                 holdable: true,
diff --git a/voxygen/src/anim/character/beta.rs b/voxygen/src/anim/character/beta.rs
index 0ae34b22a7..8161ba32a8 100644
--- a/voxygen/src/anim/character/beta.rs
+++ b/voxygen/src/anim/character/beta.rs
@@ -39,7 +39,7 @@ impl Animation for BetaAnimation {
 
         match active_tool_kind {
             //TODO: Inventory
-            Some(ToolKind::Sword(_)) => {
+            Some(ToolKind::Axe(_)) | Some(ToolKind::Hammer(_)) | Some(ToolKind::Sword(_)) => {
                 next.head.offset = Vec3::new(
                     0.0 + skeleton_attr.neck_right,
                     -2.0 + skeleton_attr.neck_forward,
diff --git a/voxygen/src/anim/character/spin.rs b/voxygen/src/anim/character/spin.rs
index 98f37e1c5e..44ad34c6e2 100644
--- a/voxygen/src/anim/character/spin.rs
+++ b/voxygen/src/anim/character/spin.rs
@@ -36,7 +36,7 @@ impl Animation for SpinAnimation {
 
         match active_tool_kind {
             //TODO: Inventory
-            Some(ToolKind::Sword(_)) => {
+            Some(ToolKind::Axe(_)) | Some(ToolKind::Hammer(_)) | Some(ToolKind::Sword(_)) => {
                 next.l_hand.offset = Vec3::new(0.0, 1.0, 0.0);
                 next.l_hand.ori = Quaternion::rotation_x(1.27);
                 next.l_hand.scale = Vec3::one() * 1.04;