From 6cb1a75b93132be192e43e6ee6134ed1d6975156 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Mon, 27 May 2019 19:48:44 -0400 Subject: [PATCH] speed tweak Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e --- common/src/sys/actions.rs | 2 +- voxygen/src/anim/character/attack.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/sys/actions.rs b/common/src/sys/actions.rs index 05613761f4..cf81096320 100644 --- a/common/src/sys/actions.rs +++ b/common/src/sys/actions.rs @@ -31,7 +31,7 @@ impl<'a> System<'a> for Sys { let finished_attack = (&entities, &mut attackings) .join() .filter(|(e, a)| { - a.time > 0.5 // TODO: constant + a.time > 0.25 // TODO: constant }) .map(|(e, a)| e) .collect::>(); diff --git a/voxygen/src/anim/character/attack.rs b/voxygen/src/anim/character/attack.rs index deff357ee6..9c9e8039bc 100644 --- a/voxygen/src/anim/character/attack.rs +++ b/voxygen/src/anim/character/attack.rs @@ -24,18 +24,18 @@ impl Animation for AttackAnimation { let mut next = (*skeleton).clone(); let wave = (anim_time as f32 * 4.0).sin(); - let wave_quicken = (1.0 - (anim_time as f32 * 8.0).cos()); - let wave_quicken_slow = (1.0 - (anim_time as f32 * 6.0).cos()); - let wave_quicken_double = (1.0 - (anim_time as f32 * 12.0).cos()); + let wave_quicken = (1.0 - (anim_time as f32 * 16.0).cos()); + let wave_quicken_slow = (1.0 - (anim_time as f32 * 12.0).cos()); + let wave_quicken_double = (1.0 - (anim_time as f32 * 24.0).cos()); let wave_quick = (anim_time as f32 * 0.5).sin(); let wave_cos = (anim_time as f32 * 12.0).cos(); - let wave_slow = (anim_time as f32 * 5.0 + PI).cos(); - let wave_slow_cos = (anim_time as f32 * 6.0 + PI).cos(); + let wave_slow = (anim_time as f32 * 10.0 + PI).cos(); + let wave_slow_cos = (anim_time as f32 * 12.0 + PI).cos(); let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let wave_stop = (anim_time as f32 * 3.0).min(PI / 2.0).sin(); + let wave_stop = (anim_time as f32 * 6.0).min(PI / 2.0).sin(); let wave_stop_alt = (anim_time as f32 * 28.0).min(PI / 2.0).sin(); - let wave_stop_quick = (anim_time as f32 * 8.0).min(PI / 2.0).sin(); + let wave_stop_quick = (anim_time as f32 * 16.0).min(PI / 2.0).sin(); let peakwave = 1.0 - (anim_time as f32 * 1.0).cos(); let head_look = Vec2::new(