From 52ee598cf1367361c6b9253bca50332f0519b1eb Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Mon, 9 Aug 2021 10:31:17 -0400
Subject: [PATCH] Consolidated Use into Action as well.

---
 common/src/states/use_item.rs         | 4 ++--
 common/src/states/utils.rs            | 1 -
 voxygen/anim/src/character/consume.rs | 4 ++--
 voxygen/src/scene/figure/mod.rs       | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/src/states/use_item.rs b/common/src/states/use_item.rs
index e086b8c1d1..0265c5b9f6 100644
--- a/common/src/states/use_item.rs
+++ b/common/src/states/use_item.rs
@@ -82,7 +82,7 @@ impl CharacterBehavior for Data {
                     update.character = CharacterState::UseItem(Data {
                         static_data: self.static_data.clone(),
                         timer: Duration::default(),
-                        stage_section: StageSection::Use,
+                        stage_section: StageSection::Action,
                     });
                     if let UsePoint::BuildupUse = use_point {
                         // Create inventory manipulation event
@@ -90,7 +90,7 @@ impl CharacterBehavior for Data {
                     }
                 }
             },
-            StageSection::Use => {
+            StageSection::Action => {
                 if self.timer < self.static_data.use_duration {
                     // Item use
                     update.character = CharacterState::UseItem(Data {
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 0d14ab2a48..81f8b599b7 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -921,7 +921,6 @@ pub enum StageSection {
     Charge,
     Movement,
     Action,
-    Use,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/voxygen/anim/src/character/consume.rs b/voxygen/anim/src/character/consume.rs
index 5b25c93bbc..60d4a72177 100644
--- a/voxygen/anim/src/character/consume.rs
+++ b/voxygen/anim/src/character/consume.rs
@@ -30,7 +30,7 @@ impl Animation for ConsumeAnimation {
             Some(ItemUseKind::Consumable(ConsumableKind::Drink)) => {
                 let (move1, move2, move3) = match stage_section {
                     Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
-                    Some(StageSection::Use) => (1.0, (anim_time * 8.0).sin(), 0.0),
+                    Some(StageSection::Action) => (1.0, (anim_time * 8.0).sin(), 0.0),
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(0.25)),
                     _ => (0.0, 0.0, 0.0),
                 };
@@ -59,7 +59,7 @@ impl Animation for ConsumeAnimation {
             Some(ItemUseKind::Consumable(ConsumableKind::Food | ConsumableKind::ComplexFood)) => {
                 let (move1, move2, move3) = match stage_section {
                     Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
-                    Some(StageSection::Use) => (1.0, (anim_time * 12.0).sin(), 0.0),
+                    Some(StageSection::Action) => (1.0, (anim_time * 12.0).sin(), 0.0),
                     Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(0.25)),
                     _ => (0.0, 0.0, 0.0),
                 };
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index bd717c341d..237f8a5eca 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -1462,7 +1462,7 @@ impl FigureMgr {
                                 StageSection::Buildup => {
                                     stage_time / s.static_data.buildup_duration.as_secs_f32()
                                 },
-                                StageSection::Use => stage_time,
+                                StageSection::Action => stage_time,
                                 StageSection::Recover => {
                                     stage_time / s.static_data.recover_duration.as_secs_f32()
                                 },