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

Fixed errors from transitioning some states to keyframes.

Browse Source
This commit is contained in:
Sam
2020-09-28 19:38:35 -05:00
committed by jiminycrick
parent 30b45fc079
commit 197755c233
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,7 +550,7 @@ impl From<&CharacterAbility> for CharacterState {
swing_duration: *swing_duration, swing_duration: *swing_duration,
recover_duration: *recover_duration, recover_duration: *recover_duration,
}, },
stage_section: StageSection::Buildup, stage_section: StageSection::Charge,
timer: Duration::default(), timer: Duration::default(),
exhausted: false, exhausted: false,
charge_amount: 0.0, charge_amount: 0.0,

4
common/src/states/repeater_ranged.rs
View File

@ -98,7 +98,7 @@ impl CharacterBehavior for Data {
update.character = CharacterState::RepeaterRanged(Data { update.character = CharacterState::RepeaterRanged(Data {
static_data: self.static_data.clone(), static_data: self.static_data.clone(),
timer: Duration::default(), timer: Duration::default(),
stage_section: StageSection::Buildup, stage_section: StageSection::Shoot,
reps_remaining: self.reps_remaining, reps_remaining: self.reps_remaining,
}); });
} }
@ -164,7 +164,7 @@ impl CharacterBehavior for Data {
update.character = CharacterState::RepeaterRanged(Data { update.character = CharacterState::RepeaterRanged(Data {
static_data: self.static_data.clone(), static_data: self.static_data.clone(),
timer: Duration::default(), timer: Duration::default(),
stage_section: StageSection::Buildup, stage_section: StageSection::Recover,
reps_remaining: self.reps_remaining, reps_remaining: self.reps_remaining,
}); });
} }

1
common/src/states/wielding.rs
View File

@ -18,6 +18,7 @@ impl CharacterBehavior for Data {
handle_ability3_input(&data, &mut update); handle_ability3_input(&data, &mut update);
handle_dodge_input(&data, &mut update); handle_dodge_input(&data, &mut update);
update update
} }