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

Clean-up glider boosting logic

Browse Source
This commit is contained in:
juliancoffee 2024-03-06 01:13:55 +02:00
parent d5226eadca
commit 8e34300830
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/src/states/glide.rs
View File

@ -87,6 +87,13 @@ impl Data {
impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData, output_events: &mut OutputEvents) -> StateUpdate {
let mut update = StateUpdate::from(data);
// reset booster
update.character = CharacterState::Glide(Self {
booster: None,
..*self
});
let gained_booster = self.booster;
handle_glider_input_or(data, &mut update, output_events, |_, _| {});
@ -95,17 +102,6 @@ impl CharacterBehavior for Data {
return update;
}
// Alternatively, we could end up in the same state, but gained booster
let gained_booster = if let CharacterState::Glide(Data {
booster: Some(booster),
..
}) = update.character
{
Some(booster)
} else {
None
};
// If player is on the ground and effectively doesn't have any gliding
// power left, end the glide
if data.physics.on_ground.is_some()
@ -240,13 +236,23 @@ impl CharacterBehavior for Data {
}
};
// Don't override gained booster, if any, otherwise set to None
let next_booster = if let CharacterState::Glide(Data {
booster: Some(booster),
..
}) = update.character
{
Some(booster)
} else {
None
};
update.character = CharacterState::Glide(Self {
ori,
last_vel: *data.vel,
timer: tick_attack_or_default(data, self.timer, None),
inputs_disabled,
// booster is consumed, set to None
booster: None,
booster: next_booster,
..*self
});
}