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

Add minimum prepare duration to fireball and bow

Browse Source
This commit is contained in:
timokoesters
2020-03-24 14:42:31 +01:00
parent 99e7e1f785
commit ea2500e7ab
5 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,11 +17,13 @@ pub enum CharacterAbility {
max_angle: f32,
},
BasicRanged {
prepare_duration: Duration,
recover_duration: Duration,
projectile: Projectile,
projectile_body: Body,
},
CastFireball {
prepare_duration: Duration,
recover_duration: Duration,
projectile: Projectile,
projectile_body: Body,
@ -121,23 +123,26 @@ impl From<&CharacterAbility> for CharacterState {
max_angle: *max_angle,
}),
CharacterAbility::BasicRanged {
prepare_duration,
recover_duration,
projectile,
projectile_body,
} => CharacterState::BasicRanged(basic_ranged::Data {
exhausted: false,
prepare_timer: Duration::default(),
prepare_duration: *prepare_duration,
recover_duration: *recover_duration,
projectile: projectile.clone(),
projectile_body: *projectile_body,
}),
CharacterAbility::CastFireball {
prepare_duration,
recover_duration,
projectile,
projectile_body,
} => CharacterState::CastFireball(cast_fireball::Data {
exhausted: false,
prepare_timer: Duration::default(),
prepare_duration: *prepare_duration,
recover_duration: *recover_duration,
projectile: projectile.clone(),
projectile_body: *projectile_body,