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

prevent transition if pressing too early & timed

Browse Source
This commit is contained in:
AdamWhitehurst 2020-03-27 11:17:34 -07:00
parent e4f2bf7ebf
commit 1d51f8fc0f
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/comp/ability.rs
View File

@ -193,6 +193,7 @@ impl From<&CharacterAbility> for CharacterState {
// unless pressed at the right time.
should_transition: !*needs_timing,
initialized: false,
prevent_transition: false,
}),
}
}

23
common/src/states/triple_strike.rs
View File

@ -41,8 +41,8 @@ pub struct Data {
pub initialized: bool,
/// Whether player must time button pressed properly to continue combo
pub needs_timing: bool,
/* /// Set to prevent transitioning, true by default when `needs_timing`
* pub prevent_transition: bool, */
/// Set to prevent transitioning, true by default when `needs_timing`
pub prevent_transition: bool,
}
impl CharacterBehavior for Data {
@ -64,14 +64,20 @@ impl CharacterBehavior for Data {
// If player stops holding input, don't go to the next stage
let mut should_transition = self.should_transition;
let mut prevent_transition = self.prevent_transition;
// Check inputs based on whether `needs_timing`
if self.needs_timing {
// Player must press at right time
if data.inputs.primary.is_just_pressed()
&& stage_time_active > Duration::from_millis(TIMING_WINDOW)
{
should_transition = true;
if data.inputs.primary.is_just_pressed() {
if stage_time_active > Duration::from_millis(TIMING_WINDOW) {
// Player pressed at right time, transition
// unless prevent_transition has been set
should_transition = true;
} else {
// Player pressed too early
prevent_transition = true;
}
}
} else {
// Prevent transitioning if player ever stops holding input
@ -145,10 +151,11 @@ impl CharacterBehavior for Data {
should_transition,
initialized,
needs_timing: self.needs_timing,
prevent_transition,
})
} else if stage_time_active > Duration::from_millis(STAGE_DURATION) {
let next_stage = match self.stage {
_ if !should_transition => None,
_ if !should_transition || prevent_transition => None,
Stage::First => Some(Stage::Second),
Stage::Second => Some(Stage::Third),
Stage::Third => None,
@ -163,6 +170,7 @@ impl CharacterBehavior for Data {
should_transition,
initialized,
needs_timing: self.needs_timing,
prevent_transition,
})
} else {
// Make sure attack component is removed
@ -179,6 +187,7 @@ impl CharacterBehavior for Data {
should_transition,
initialized,
needs_timing: self.needs_timing,
prevent_transition,
})
};