Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

speed tweak

Browse Source 
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
This commit is contained in:
jshipsey 2019-05-27 19:48:44 -04:00
parent f9e2828de5
commit 6cb1a75b93
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/sys/actions.rs
View File

@ -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::<Vec<_>>();

14
voxygen/src/anim/character/attack.rs
View File

@ -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(