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

Update common/src/sys/controller.rs, common/src/sys/movement.rs, common/src/comp/energy.rs files

Browse Source
This commit is contained in:
Ben Simpson
2020-02-13 08:36:29 +00:00
parent bfd2f345b1
commit 3343f8e5c0
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/src/sys/controller.rs
View File

@ -19,7 +19,6 @@ use vek::*;
const CHARGE_COST: i32 = 200;
const ROLL_COST: i32 = 30;
/// # Controller System
/// #### Responsible for validating controller inputs and setting new Character
/// States ----
@ -570,15 +569,15 @@ impl<'a> System<'a> for Sys {
}
// Try to climb
if let (true, Some(_wall_dir)) = (
if let (true, Some(_wall_dir)) = (
(inputs.climb.is_pressed() | inputs.climb_down.is_pressed())
&& can_climb(body),
physics.on_wall,)
{
character.movement = Climb;
continue;
}
physics.on_wall,
) {
character.movement = Climb;
continue;
}
// Try to swim
if !physics.on_ground {
@ -607,7 +606,6 @@ impl<'a> System<'a> for Sys {
character.action = Charge {
time_left: Duration::from_millis(250),
};
}
continue;
}
@ -622,10 +620,10 @@ impl<'a> System<'a> for Sys {
.try_change_by(-ROLL_COST, EnergySource::Roll)
.is_ok()
{
character.action = Roll {
time_left: ROLL_DURATION,
was_wielding: character.action.is_wield(),
};
character.action = Roll {
time_left: ROLL_DURATION,
was_wielding: character.action.is_wield(),
};
}
continue;
}