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

Added swing duration to dash melee. Added framework for animation to be added.

Browse Source
This commit is contained in:
Sam
2020-09-11 14:56:04 -05:00
parent 6dede05a0e
commit c99e4c3c18
5 changed files with 83 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,8 +82,9 @@ pub enum CharacterAbility {
forward_speed: f32,
buildup_duration: Duration,
charge_duration: Duration,
infinite_charge: bool,
swing_duration: Duration,
recover_duration: Duration,
infinite_charge: bool,
},
BasicBlock,
Roll,
@ -330,8 +331,9 @@ impl From<&CharacterAbility> for CharacterState {
forward_speed,
buildup_duration,
charge_duration,
infinite_charge,
swing_duration,
recover_duration,
infinite_charge,
} => CharacterState::DashMelee(dash_melee::Data {
static_data: dash_melee::StaticData {
base_damage: *base_damage,
@ -345,6 +347,7 @@ impl From<&CharacterAbility> for CharacterState {
infinite_charge: *infinite_charge,
buildup_duration: *buildup_duration,
charge_duration: *charge_duration,
swing_duration: *swing_duration,
recover_duration: *recover_duration,
},
end_charge: false,