From 72564cf8b46e4cd6733b17e0f2940bce96af5c85 Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Mon, 26 Aug 2019 20:05:30 +0200
Subject: [PATCH] Make action durations constants

---
 common/src/sys/combat.rs     |  3 +++
 common/src/sys/controller.rs | 10 +++++++---
 common/src/sys/movement.rs   |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/src/sys/combat.rs b/common/src/sys/combat.rs
index 9b2b74f278..586139b341 100644
--- a/common/src/sys/combat.rs
+++ b/common/src/sys/combat.rs
@@ -8,6 +8,9 @@ use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
 use std::time::Duration;
 use vek::*;
 
+pub const WIELD_DURATION: Duration = Duration::from_millis(300);
+pub const ATTACK_DURATION: Duration = Duration::from_millis(300);
+
 const BASE_DMG: i32 = 10;
 const BLOCK_EFFICIENCY: f32 = 0.9;
 
diff --git a/common/src/sys/controller.rs b/common/src/sys/controller.rs
index 7c445ba9fd..b570ed4013 100644
--- a/common/src/sys/controller.rs
+++ b/common/src/sys/controller.rs
@@ -1,3 +1,7 @@
+use super::{
+    combat::{ATTACK_DURATION, WIELD_DURATION},
+    movement::ROLL_DURATION,
+};
 use crate::{
     comp::{
         ActionState::*, Body, CharacterState, Controller, MovementState::*, PhysicsState, Stats,
@@ -97,7 +101,7 @@ impl<'a> System<'a> for Sys {
                 && (character.movement == Stand || character.movement == Run)
             {
                 character.action = Wield {
-                    time_left: Duration::from_millis(300),
+                    time_left: WIELD_DURATION,
                 };
             }
 
@@ -111,7 +115,7 @@ impl<'a> System<'a> for Sys {
                 if let Wield { time_left } = character.action {
                     if time_left == Duration::default() {
                         character.action = Attack {
-                            time_left: Duration::from_millis(300),
+                            time_left: ATTACK_DURATION,
                             applied: false,
                         };
                     }
@@ -137,7 +141,7 @@ impl<'a> System<'a> for Sys {
                 && physics.on_ground
             {
                 character.movement = Roll {
-                    time_left: Duration::from_millis(600),
+                    time_left: ROLL_DURATION,
                 };
             }
 
diff --git a/common/src/sys/movement.rs b/common/src/sys/movement.rs
index ef33e2e691..0741465318 100644
--- a/common/src/sys/movement.rs
+++ b/common/src/sys/movement.rs
@@ -11,6 +11,8 @@ use specs::{Entities, Join, Read, ReadExpect, ReadStorage, System, WriteStorage}
 use std::time::Duration;
 use vek::*;
 
+pub const ROLL_DURATION: Duration = Duration::from_millis(600);
+
 const HUMANOID_ACCEL: f32 = 70.0;
 const HUMANOID_SPEED: f32 = 120.0;
 const WIELD_ACCEL: f32 = 70.0;