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

remove unused timed_combo

Browse Source
This commit is contained in:
AdamWhitehurst
2020-03-29 13:40:03 -07:00
parent 86b0b8f644
commit dcc9d44b1c
6 changed files with 1 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,11 +41,6 @@ pub enum CharacterAbility {
},
BasicBlock,
Roll,
TimedCombo {
buildup_duration: Duration,
recover_duration: Duration,
base_damage: u32,
},
TripleStrike {
base_damage: u32,
needs_timing: bool,
@ -57,7 +52,7 @@ impl CharacterAbility {
/// applicable.
pub fn requirements_paid(&self, data: &JoinData, update: &mut StateUpdate) -> bool {
match self {
CharacterAbility::TimedCombo { .. } | CharacterAbility::TripleStrike { .. } => {
CharacterAbility::TripleStrike { .. } => {
data.physics.on_ground
&& data.body.is_humanoid()
&& data.inputs.look_dir.xy().magnitude_squared() > 0.01
@ -169,18 +164,6 @@ impl From<&CharacterAbility> for CharacterState {
remaining_duration: Duration::from_millis(500),
was_wielded: false, // false by default. utils might set it to true
}),
CharacterAbility::TimedCombo {
buildup_duration,
recover_duration,
base_damage,
} => CharacterState::TimedCombo(timed_combo::Data {
buildup_duration: *buildup_duration,
recover_duration: *recover_duration,
stage: 0,
stage_exhausted: false,
stage_time_active: Duration::default(),
base_damage: *base_damage,
}),
CharacterAbility::TripleStrike {
base_damage,
needs_timing,