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

Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master'

Browse Source 
Make Axe Spin More Realistic

Closes #827

See merge request veloren/veloren!1510
This commit is contained in:
Samuel Keiffer 2020-11-14 04:15:50 +00:00
commit 0c7cd3d8fb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/states/spin_melee.rs
View File

@ -62,8 +62,13 @@ impl CharacterBehavior for Data {
let mut update = StateUpdate::from(data);
if self.static_data.is_helicopter {
update.vel.0 = Vec3::new(0.0, 0.0, update.vel.0.z + GRAVITY * data.dt.0)
+ data.inputs.move_dir * 5.0;
let delta_vel_z = if update.vel.0.z > 0.0 && update.vel.0.z <= 1.0 {
GRAVITY * data.dt.0
} else {
0.0
};
update.vel.0 =
Vec3::new(0.0, 0.0, update.vel.0.z + delta_vel_z) + data.inputs.move_dir * 5.0;
}
// Allows for other states to interrupt this state