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 'sam/fix-discontinuous-roll' into 'master'

Browse Source 
Fix roll

See merge request veloren/veloren!2805
This commit is contained in:
Samuel Keiffer 2021-09-03 00:33:34 +00:00
commit 0dcfe2721b
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/src/states/roll.rs
View File

@ -97,20 +97,16 @@ impl CharacterBehavior for Data {
..*self
});
} else {
// Keeps rolling if sufficient energy, else transitions to recover section of
// stage
if input_is_pressed(data, self.static_data.ability_info.input) {
reset_state(self, data, &mut update);
} else {
update.character = CharacterState::Roll(Data {
timer: Duration::default(),
stage_section: StageSection::Recover,
..*self
});
}
// Transition to recover section of stage
update.character = CharacterState::Roll(Data {
timer: Duration::default(),
stage_section: StageSection::Recover,
..*self
});
}
},
StageSection::Recover => {
handle_move(data, &mut update, 1.0);
// Allows for jumps to interrupt recovery in roll
if self.timer < self.static_data.recover_duration
&& !handle_jump(data, &mut update, 1.5)
@ -151,19 +147,3 @@ impl CharacterBehavior for Data {
update
}
}
fn reset_state(data: &Data, join: &JoinData, update: &mut StateUpdate) {
handle_input(join, update, data.static_data.ability_info.input);
if let CharacterState::Roll(r) = &mut update.character {
r.was_combo = data.was_combo;
r.was_sneak = data.was_sneak;
r.was_wielded = data.was_wielded;
if matches!(r.stage_section, StageSection::Movement) {
r.timer = Duration::default();
r.stage_section = StageSection::Recover;
} else {
r.stage_section = StageSection::Movement;
}
}
}