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

refactor transition logic (thx imbris)

Browse Source
This commit is contained in:
AdamWhitehurst
2020-04-01 08:39:18 -07:00
parent a73d010f7b
commit 2b10797db1
2 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ use crate::{
item::Item, Body, CharacterState, EnergySource, Gravity, LightEmitter, Projectile,
StateUpdate,
},
states::*,
states::{triple_strike::*, *},
sys::character_behavior::JoinData,
};
use specs::{Component, FlaggedStorage};
@ -172,12 +172,11 @@ impl From<&CharacterAbility> for CharacterState {
stage: triple_strike::Stage::First,
stage_exhausted: false,
stage_time_active: Duration::default(),
needs_timing: *needs_timing,
// If `needs_timing`, prevent tansitioning by default,
// unless pressed at the right time.
should_transition: !*needs_timing,
initialized: false,
prevent_transition: false,
transition_style: match *needs_timing {
true => TransitionStyle::Timed(TimingState::NotPressed),
false => TransitionStyle::Hold(HoldingState::Holding),
},
}),
}
}