diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 083c7ef964..7caad4aa6a 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -242,31 +242,31 @@ ], threshold: 0.5, ), - Attack(ComboMelee(Swing, 1), Sword): ( + Attack(ComboMelee(Action, 1), Sword): ( files: [ "voxygen.audio.sfx.abilities.swing_sword", ], threshold: 0.7, ), - Attack(ComboMelee(Swing, 2), Sword): ( + Attack(ComboMelee(Action, 2), Sword): ( files: [ "voxygen.audio.sfx.abilities.separated_second_swing", ], threshold: 0.7, ), - Attack(ComboMelee(Swing, 3), Sword): ( + Attack(ComboMelee(Action, 3), Sword): ( files: [ "voxygen.audio.sfx.abilities.separated_third_swing", ], threshold: 0.7, ), - Attack(DashMelee(Swing), Sword): ( + Attack(DashMelee(Action), Sword): ( files: [ "voxygen.audio.sfx.abilities.sword_dash", ], threshold: 0.8, ), - Attack(SpinMelee(Swing), Sword): ( + Attack(SpinMelee(Action), Sword): ( files: [ "voxygen.audio.sfx.abilities.swing_sword", ], @@ -294,19 +294,19 @@ ], threshold: 0.5, ), - Attack(ComboMelee(Swing, 1), Hammer): ( + Attack(ComboMelee(Action, 1), Hammer): ( files: [ "voxygen.audio.sfx.abilities.swing", ], threshold: 0.7, ), - Attack(ChargedMelee(Swing), Hammer): ( + Attack(ChargedMelee(Action), Hammer): ( files: [ "voxygen.audio.sfx.abilities.swing", ], threshold: 0.7, ), - Attack(LeapMelee(Swing), Hammer): ( + Attack(LeapMelee(Action), Hammer): ( files: [ "voxygen.audio.sfx.abilities.swing", ], @@ -334,25 +334,25 @@ ], threshold: 0.5, ), - Attack(ComboMelee(Swing, 1), Axe): ( + Attack(ComboMelee(Action, 1), Axe): ( files: [ "voxygen.audio.sfx.abilities.swing", ], threshold: 0.7, ), - Attack(ComboMelee(Swing, 2), Axe): ( + Attack(ComboMelee(Action, 2), Axe): ( files: [ "voxygen.audio.sfx.abilities.swing", ], threshold: 0.7, ), - Attack(SpinMelee(Swing), Axe): ( + Attack(SpinMelee(Action), Axe): ( files: [ "voxygen.audio.sfx.abilities.swing", ], threshold: 0.8, ), - Attack(LeapMelee(Swing), Axe): ( + Attack(LeapMelee(Action), Axe): ( files: [ "voxygen.audio.sfx.abilities.swing", ], @@ -470,7 +470,7 @@ ], threshold: 0.8, ), - Attack(DashMelee(Swing), Dagger): ( + Attack(DashMelee(Action), Dagger): ( files: [ "voxygen.audio.sfx.abilities.sword_dash", ], diff --git a/common/src/comp/character_state.rs b/common/src/comp/character_state.rs index 2df87fcae6..e3697f8678 100644 --- a/common/src/comp/character_state.rs +++ b/common/src/comp/character_state.rs @@ -209,10 +209,10 @@ impl CharacterState { pub fn is_forced_movement(&self) -> bool { matches!(self, - CharacterState::ComboMelee(s) if s.stage_section == StageSection::Swing) + CharacterState::ComboMelee(s) if s.stage_section == StageSection::Action) || matches!(self, CharacterState::DashMelee(s) if s.stage_section == StageSection::Charge) || matches!(self, CharacterState::LeapMelee(s) if s.stage_section == StageSection::Movement) - || matches!(self, CharacterState::SpinMelee(s) if s.stage_section == StageSection::Swing) + || matches!(self, CharacterState::SpinMelee(s) if s.stage_section == StageSection::Action) || matches!(self, CharacterState::Roll(s) if s.stage_section == StageSection::Movement) } diff --git a/common/src/states/basic_aura.rs b/common/src/states/basic_aura.rs index ff5bf6fd61..6f7b9c9dc8 100644 --- a/common/src/states/basic_aura.rs +++ b/common/src/states/basic_aura.rs @@ -101,12 +101,12 @@ impl CharacterBehavior for Data { // Build up update.character = CharacterState::BasicAura(Data { timer: Duration::default(), - stage_section: StageSection::Cast, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Cast => { + StageSection::Action => { if self.timer < self.static_data.cast_duration { // Cast update.character = CharacterState::BasicAura(Data { diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index ba49cd70eb..f7f72720be 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -89,12 +89,12 @@ impl CharacterBehavior for Data { // Build up update.character = CharacterState::BasicBeam(Data { timer: Duration::default(), - stage_section: StageSection::Cast, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Cast => { + StageSection::Action => { if input_is_pressed(data, self.static_data.ability_info.input) && (self.static_data.energy_drain <= f32::EPSILON || update.energy.current() > 0) diff --git a/common/src/states/basic_block.rs b/common/src/states/basic_block.rs index f07532d934..298fc2206e 100644 --- a/common/src/states/basic_block.rs +++ b/common/src/states/basic_block.rs @@ -51,12 +51,12 @@ impl CharacterBehavior for Data { // Transitions to swing section of stage update.character = CharacterState::BasicBlock(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if input_is_pressed(data, InputKind::Block) { // Block update.character = CharacterState::BasicBlock(Data { diff --git a/common/src/states/basic_melee.rs b/common/src/states/basic_melee.rs index 35460a510d..e32ccc5225 100644 --- a/common/src/states/basic_melee.rs +++ b/common/src/states/basic_melee.rs @@ -73,12 +73,12 @@ impl CharacterBehavior for Data { // Transitions to swing section of stage update.character = CharacterState::BasicMelee(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if !self.exhausted { update.character = CharacterState::BasicMelee(Data { timer: Duration::default(), diff --git a/common/src/states/basic_summon.rs b/common/src/states/basic_summon.rs index 562175c12c..6b2e2b943b 100644 --- a/common/src/states/basic_summon.rs +++ b/common/src/states/basic_summon.rs @@ -69,12 +69,12 @@ impl CharacterBehavior for Data { // Transitions to recover section of stage update.character = CharacterState::BasicSummon(Data { timer: Duration::default(), - stage_section: StageSection::Cast, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Cast => { + StageSection::Action => { if self.timer < self.static_data.cast_duration || self.summon_count < self.static_data.summon_amount { diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs index 7ace902d81..37691a5907 100644 --- a/common/src/states/charged_melee.rs +++ b/common/src/states/charged_melee.rs @@ -115,13 +115,13 @@ impl CharacterBehavior for Data { } else { // Transitions to swing update.character = CharacterState::ChargedMelee(Data { - stage_section: StageSection::Swing, + stage_section: StageSection::Action, timer: Duration::default(), ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if self.timer.as_millis() as f32 > self.static_data.hit_timing * self.static_data.swing_duration.as_millis() as f32 diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index fb97e4bb56..affcdfa5e9 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -188,12 +188,12 @@ impl CharacterBehavior for Data { update.character = CharacterState::ComboMelee(Data { static_data: self.static_data.clone(), timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if self.timer.as_secs_f32() > self.static_data.stage_data[stage_index].hit_timing * self.static_data.stage_data[stage_index] diff --git a/common/src/states/dash_melee.rs b/common/src/states/dash_melee.rs index 33012b8aa7..17a42fec74 100644 --- a/common/src/states/dash_melee.rs +++ b/common/src/states/dash_melee.rs @@ -215,7 +215,7 @@ impl CharacterBehavior for Data { // Stop charging now and go to swing stage section update.character = CharacterState::DashMelee(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, exhausted: false, ..*self }); @@ -238,13 +238,13 @@ impl CharacterBehavior for Data { // Transitions to swing section of stage update.character = CharacterState::DashMelee(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, exhausted: false, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if self.static_data.charge_through && !self.exhausted { // If can charge through and not exhausted, do one more melee attack diff --git a/common/src/states/leap_melee.rs b/common/src/states/leap_melee.rs index 72124f1772..8125ec4617 100644 --- a/common/src/states/leap_melee.rs +++ b/common/src/states/leap_melee.rs @@ -107,12 +107,12 @@ impl CharacterBehavior for Data { // Transitions to swing portion of state upon hitting ground update.character = CharacterState::LeapMelee(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if self.timer < self.static_data.swing_duration { // Swings weapons update.character = CharacterState::LeapMelee(Data { diff --git a/common/src/states/repeater_ranged.rs b/common/src/states/repeater_ranged.rs index 206963b5af..de55813305 100644 --- a/common/src/states/repeater_ranged.rs +++ b/common/src/states/repeater_ranged.rs @@ -69,12 +69,12 @@ impl CharacterBehavior for Data { // Transition to shoot update.character = CharacterState::RepeaterRanged(Data { timer: Duration::default(), - stage_section: StageSection::Shoot, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Shoot => { + StageSection::Action => { if self.timer < self.static_data.shoot_duration { // Draw projectile update.character = CharacterState::RepeaterRanged(Data { diff --git a/common/src/states/self_buff.rs b/common/src/states/self_buff.rs index c1c4edbdfb..6f60e283d7 100644 --- a/common/src/states/self_buff.rs +++ b/common/src/states/self_buff.rs @@ -75,12 +75,12 @@ impl CharacterBehavior for Data { // Build up update.character = CharacterState::SelfBuff(Data { timer: Duration::default(), - stage_section: StageSection::Cast, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Cast => { + StageSection::Action => { if self.timer < self.static_data.cast_duration { // Cast update.character = CharacterState::SelfBuff(Data { diff --git a/common/src/states/shockwave.rs b/common/src/states/shockwave.rs index c45805efe8..440fc4f834 100644 --- a/common/src/states/shockwave.rs +++ b/common/src/states/shockwave.rs @@ -126,12 +126,12 @@ impl CharacterBehavior for Data { // Transitions to swing update.character = CharacterState::Shockwave(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if self.timer < self.static_data.swing_duration { // Swings update.character = CharacterState::Shockwave(Data { diff --git a/common/src/states/spin_melee.rs b/common/src/states/spin_melee.rs index f955cc3263..948a75537d 100644 --- a/common/src/states/spin_melee.rs +++ b/common/src/states/spin_melee.rs @@ -97,12 +97,12 @@ impl CharacterBehavior for Data { // Transitions to swing section of stage update.character = CharacterState::SpinMelee(Data { timer: Duration::default(), - stage_section: StageSection::Swing, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Swing => { + StageSection::Action => { if !self.exhausted { update.character = CharacterState::SpinMelee(Data { timer: Duration::default(), diff --git a/common/src/states/sprite_summon.rs b/common/src/states/sprite_summon.rs index 1a3610e8bd..df354f1013 100644 --- a/common/src/states/sprite_summon.rs +++ b/common/src/states/sprite_summon.rs @@ -62,12 +62,12 @@ impl CharacterBehavior for Data { // Transitions to recover section of stage update.character = CharacterState::SpriteSummon(Data { timer: Duration::default(), - stage_section: StageSection::Cast, + stage_section: StageSection::Action, ..*self }); } }, - StageSection::Cast => { + StageSection::Action => { if self.timer < self.static_data.cast_duration { let timer_frac = self.timer.as_secs_f32() / self.static_data.cast_duration.as_secs_f32(); diff --git a/common/src/states/use_item.rs b/common/src/states/use_item.rs index e086b8c1d1..0265c5b9f6 100644 --- a/common/src/states/use_item.rs +++ b/common/src/states/use_item.rs @@ -82,7 +82,7 @@ impl CharacterBehavior for Data { update.character = CharacterState::UseItem(Data { static_data: self.static_data.clone(), timer: Duration::default(), - stage_section: StageSection::Use, + stage_section: StageSection::Action, }); if let UsePoint::BuildupUse = use_point { // Create inventory manipulation event @@ -90,7 +90,7 @@ impl CharacterBehavior for Data { } } }, - StageSection::Use => { + StageSection::Action => { if self.timer < self.static_data.use_duration { // Item use update.character = CharacterState::UseItem(Data { diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 2d6aa78b65..c9be9a3605 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -920,12 +920,7 @@ pub enum StageSection { Recover, Charge, Movement, - // TODO: Consolidate these to `Action` - // Code reviewers: comment here to remind me to open beginner issue - Swing, - Shoot, - Cast, - Use, + Action, } #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] diff --git a/voxygen/anim/src/biped_large/alpha.rs b/voxygen/anim/src/biped_large/alpha.rs index 075cd1d758..301e787c95 100644 --- a/voxygen/anim/src/biped_large/alpha.rs +++ b/voxygen/anim/src/biped_large/alpha.rs @@ -57,7 +57,7 @@ impl Animation for AlphaAnimation { * ((acc_vel * lab + PI * 0.4).sin()); let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/beam.rs b/voxygen/anim/src/biped_large/beam.rs index c3b9e9a5c8..5d227d6aed 100644 --- a/voxygen/anim/src/biped_large/beam.rs +++ b/voxygen/anim/src/biped_large/beam.rs @@ -75,7 +75,7 @@ impl Animation for BeamAnimation { next.hand_r.orientation = Quaternion::rotation_x(0.0); let (move1base, move2shake, move2base, move3) = match stage_section { Some(StageSection::Buildup) => ((anim_time.powf(0.25)).min(1.0), 0.0, 0.0, 0.0), - Some(StageSection::Cast) => ( + Some(StageSection::Action) => ( 1.0, (anim_time * 15.0 + PI).sin(), (anim_time.powf(0.1)).min(1.0), diff --git a/voxygen/anim/src/biped_large/beta.rs b/voxygen/anim/src/biped_large/beta.rs index 7ed6c398c4..4578ef6478 100644 --- a/voxygen/anim/src/biped_large/beta.rs +++ b/voxygen/anim/src/biped_large/beta.rs @@ -55,7 +55,7 @@ impl Animation for BetaAnimation { * ((acc_vel * lab + PI * 0.4).sin()); let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(6)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/chargemelee.rs b/voxygen/anim/src/biped_large/chargemelee.rs index df141df553..4ea74651ea 100644 --- a/voxygen/anim/src/biped_large/chargemelee.rs +++ b/voxygen/anim/src/biped_large/chargemelee.rs @@ -60,7 +60,7 @@ impl Animation for ChargeMeleeAnimation { 0.0, (anim_time * 100.0).sin(), ), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0, 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 0.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/dash.rs b/voxygen/anim/src/biped_large/dash.rs index ce4f84101d..d6afe76e47 100644 --- a/voxygen/anim/src/biped_large/dash.rs +++ b/voxygen/anim/src/biped_large/dash.rs @@ -73,7 +73,7 @@ impl Animation for DashAnimation { 0.0, 0.0, ), - Some(StageSection::Swing) => (1.0, 1.0, 1.0, anim_time.powf(4.0), 0.0), + Some(StageSection::Action) => (1.0, 1.0, 1.0, anim_time.powf(4.0), 0.0), Some(StageSection::Recover) => (1.1, 1.0, 1.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/leapmelee.rs b/voxygen/anim/src/biped_large/leapmelee.rs index 4880a9a6b3..9ec48da224 100644 --- a/voxygen/anim/src/biped_large/leapmelee.rs +++ b/voxygen/anim/src/biped_large/leapmelee.rs @@ -34,7 +34,7 @@ impl Animation for LeapAnimation { let (movement1, movement2, movement3, movement4) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0, 0.0), Some(StageSection::Movement) => (1.0, anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/selfbuff.rs b/voxygen/anim/src/biped_large/selfbuff.rs index 68ff2031b0..3643987ee5 100644 --- a/voxygen/anim/src/biped_large/selfbuff.rs +++ b/voxygen/anim/src/biped_large/selfbuff.rs @@ -60,7 +60,7 @@ impl Animation for SelfBuffAnimation { (anim_time * 10.0).sin(), 0.0, ), - Some(StageSection::Cast) => { + Some(StageSection::Action) => { (1.0, 0.0, (anim_time * 30.0).sin(), (anim_time * 12.0).sin()) }, Some(StageSection::Recover) => (1.0, anim_time.powi(4), 1.0, 1.0), diff --git a/voxygen/anim/src/biped_large/shockwave.rs b/voxygen/anim/src/biped_large/shockwave.rs index c55a237e67..759a6c6cbd 100644 --- a/voxygen/anim/src/biped_large/shockwave.rs +++ b/voxygen/anim/src/biped_large/shockwave.rs @@ -44,7 +44,7 @@ impl Animation for ShockwaveAnimation { let (move1, move1pow, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, anim_time.powf(0.25) as f32, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/shoot.rs b/voxygen/anim/src/biped_large/shoot.rs index 0c8348402b..1e69916a0a 100644 --- a/voxygen/anim/src/biped_large/shoot.rs +++ b/voxygen/anim/src/biped_large/shoot.rs @@ -94,7 +94,7 @@ impl Animation for ShootAnimation { Some(StageSection::Buildup) => { (anim_time, (anim_time * 10.0 + PI).sin(), 0.0, 0.0) }, - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0, 0.0), }; @@ -143,7 +143,7 @@ impl Animation for ShootAnimation { Some(ToolKind::Bow) => { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -193,7 +193,7 @@ impl Animation for ShootAnimation { "Wendigo Magic" => { let (move1base, _move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -223,7 +223,7 @@ impl Animation for ShootAnimation { "Yeti" => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -266,7 +266,7 @@ impl Animation for ShootAnimation { "Harvester" => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/spin.rs b/voxygen/anim/src/biped_large/spin.rs index c786303b21..213d8b943d 100644 --- a/voxygen/anim/src/biped_large/spin.rs +++ b/voxygen/anim/src/biped_large/spin.rs @@ -34,7 +34,7 @@ impl Animation for SpinAnimation { let (movement1, movement2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(1.8), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(1.8), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/spinmelee.rs b/voxygen/anim/src/biped_large/spinmelee.rs index eee429c8d6..57e7fa07bc 100644 --- a/voxygen/anim/src/biped_large/spinmelee.rs +++ b/voxygen/anim/src/biped_large/spinmelee.rs @@ -46,7 +46,7 @@ impl Animation for SpinMeleeAnimation { let (move1base, move2, move3) = match stage_section { Some(StageSection::Buildup) => ((anim_time.powf(0.25)), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, (anim_time * 0.05).sin() - 0.05, 0.0), + Some(StageSection::Action) => (1.0, (anim_time * 0.05).sin() - 0.05, 0.0), Some(StageSection::Recover) => (1.0, 0.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_large/spritesummon.rs b/voxygen/anim/src/biped_large/spritesummon.rs index 9a7e918e8e..0b17e9f699 100644 --- a/voxygen/anim/src/biped_large/spritesummon.rs +++ b/voxygen/anim/src/biped_large/spritesummon.rs @@ -60,7 +60,7 @@ impl Animation for SpriteSummonAnimation { Some(StageSection::Buildup) => { (anim_time, anim_time.powf(0.1), 0.0, 0.0) }, - Some(StageSection::Cast) => { + Some(StageSection::Action) => { (1.0, 1.0, (anim_time.powf(4.0) * 80.0).min(1.0), 0.0) }, Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time), diff --git a/voxygen/anim/src/biped_large/summon.rs b/voxygen/anim/src/biped_large/summon.rs index 24960c3ec9..f335e6c62e 100644 --- a/voxygen/anim/src/biped_large/summon.rs +++ b/voxygen/anim/src/biped_large/summon.rs @@ -57,7 +57,7 @@ impl Animation for SummonAnimation { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => ((anim_time.powf(0.5)), 0.0, 0.0), - Some(StageSection::Cast) => (1.0, (anim_time.powi(2)), 0.0), + Some(StageSection::Action) => (1.0, (anim_time.powi(2)), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; @@ -126,7 +126,7 @@ impl Animation for SummonAnimation { "Tidal Warrior" => { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => ((anim_time.powi(2)), 0.0, 0.0), - Some(StageSection::Cast) => (1.0, (anim_time * 30.0).sin(), 0.0), + Some(StageSection::Action) => (1.0, (anim_time * 30.0).sin(), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_small/alpha.rs b/voxygen/anim/src/biped_small/alpha.rs index 0a14e920fb..db095e6f03 100644 --- a/voxygen/anim/src/biped_small/alpha.rs +++ b/voxygen/anim/src/biped_small/alpha.rs @@ -56,7 +56,7 @@ impl Animation for AlphaAnimation { let anim_time = anim_time.min(1.0); let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_small/dash.rs b/voxygen/anim/src/biped_small/dash.rs index da2077dccb..0d3d7292b2 100644 --- a/voxygen/anim/src/biped_small/dash.rs +++ b/voxygen/anim/src/biped_small/dash.rs @@ -55,7 +55,7 @@ impl Animation for DashAnimation { let (move1base, move2base, move3, move4) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0, 0.0), Some(StageSection::Charge) => (1.0, anim_time.powi(4), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/biped_small/shoot.rs b/voxygen/anim/src/biped_small/shoot.rs index 4368f70a78..6604848f8c 100644 --- a/voxygen/anim/src/biped_small/shoot.rs +++ b/voxygen/anim/src/biped_small/shoot.rs @@ -82,7 +82,7 @@ impl Animation for ShootAnimation { Some(ToolKind::Bow) => { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; @@ -113,7 +113,7 @@ impl Animation for ShootAnimation { Some(ToolKind::Staff) => { let (move1base, _move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/bird_large/alpha.rs b/voxygen/anim/src/bird_large/alpha.rs index fef6419431..d2e718e96a 100644 --- a/voxygen/anim/src/bird_large/alpha.rs +++ b/voxygen/anim/src/bird_large/alpha.rs @@ -25,7 +25,7 @@ impl Animation for AlphaAnimation { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/bird_large/breathe.rs b/voxygen/anim/src/bird_large/breathe.rs index 798ad1cd47..94e6a8891a 100644 --- a/voxygen/anim/src/bird_large/breathe.rs +++ b/voxygen/anim/src/bird_large/breathe.rs @@ -35,7 +35,7 @@ impl Animation for BreatheAnimation { let (movement1base, movement2base, movement3, twitch) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), - Some(StageSection::Cast) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), + Some(StageSection::Action) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), Some(StageSection::Recover) => (1.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/bird_large/dash.rs b/voxygen/anim/src/bird_large/dash.rs index c177986d15..435a4aa6fb 100644 --- a/voxygen/anim/src/bird_large/dash.rs +++ b/voxygen/anim/src/bird_large/dash.rs @@ -39,7 +39,7 @@ impl Animation for DashAnimation { match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0, 0.0, anim_time), Some(StageSection::Charge) => (1.0, 1.0, 0.0, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 0.0, anim_time.powi(4), 0.0, 1.0), + Some(StageSection::Action) => (1.0, 0.0, anim_time.powi(4), 0.0, 1.0), Some(StageSection::Recover) => (1.0, 0.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/bird_large/shockwave.rs b/voxygen/anim/src/bird_large/shockwave.rs index ea40d09785..4bac2d216a 100644 --- a/voxygen/anim/src/bird_large/shockwave.rs +++ b/voxygen/anim/src/bird_large/shockwave.rs @@ -26,7 +26,7 @@ impl Animation for ShockwaveAnimation { let (movement1base, movement2base, movement3, _twitch) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.5), 0.0, 0.0, 0.0), - Some(StageSection::Cast) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), + Some(StageSection::Action) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), Some(StageSection::Recover) => (1.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/bird_large/shoot.rs b/voxygen/anim/src/bird_large/shoot.rs index 2b346cc762..17bf8b54c9 100644 --- a/voxygen/anim/src/bird_large/shoot.rs +++ b/voxygen/anim/src/bird_large/shoot.rs @@ -27,7 +27,7 @@ impl Animation for ShootAnimation { let (movement1base, movement2base, movement3, twitch) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), - Some(StageSection::Cast) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), + Some(StageSection::Action) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), Some(StageSection::Recover) => (1.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/bird_large/summon.rs b/voxygen/anim/src/bird_large/summon.rs index c650af8fc3..551d50abad 100644 --- a/voxygen/anim/src/bird_large/summon.rs +++ b/voxygen/anim/src/bird_large/summon.rs @@ -28,7 +28,7 @@ impl Animation for SummonAnimation { let (movement1base, movement2base, movement3, twitch) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), - Some(StageSection::Cast) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), + Some(StageSection::Action) => (1.0, anim_time.min(1.0).powf(0.1), 0.0, anim_time), Some(StageSection::Recover) => (1.0, 1.0, anim_time.min(1.0).powi(2), 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/alpha.rs b/voxygen/anim/src/character/alpha.rs index c7bcfbe010..b9c351f1c7 100644 --- a/voxygen/anim/src/character/alpha.rs +++ b/voxygen/anim/src/character/alpha.rs @@ -35,7 +35,7 @@ impl Animation for AlphaAnimation { let (move1, move2, move3, move2h) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(2), 0.0, anim_time.powf(0.25)), + Some(StageSection::Action) => (1.0, anim_time.powi(2), 0.0, anim_time.powf(0.25)), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; @@ -63,7 +63,7 @@ impl Animation for AlphaAnimation { Some(ToolKind::Axe) => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -79,7 +79,7 @@ impl Animation for AlphaAnimation { Some(ToolKind::Hammer) | Some(ToolKind::Pick) => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -135,7 +135,7 @@ impl Animation for AlphaAnimation { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -156,7 +156,7 @@ impl Animation for AlphaAnimation { Some(ToolKind::Hammer) | Some(ToolKind::Pick) => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/beam.rs b/voxygen/anim/src/character/beam.rs index fc6d6bbde9..fe17d583df 100644 --- a/voxygen/anim/src/character/beam.rs +++ b/voxygen/anim/src/character/beam.rs @@ -38,7 +38,7 @@ impl Animation for BeamAnimation { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Cast) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/beta.rs b/voxygen/anim/src/character/beta.rs index c84a4700c4..e22a9e1de3 100644 --- a/voxygen/anim/src/character/beta.rs +++ b/voxygen/anim/src/character/beta.rs @@ -37,7 +37,7 @@ impl Animation for BetaAnimation { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/block.rs b/voxygen/anim/src/character/block.rs index bf6edd54fc..45f96bbf60 100644 --- a/voxygen/anim/src/character/block.rs +++ b/voxygen/anim/src/character/block.rs @@ -45,7 +45,7 @@ impl Animation for BlockAnimation { let (movement1base, move2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, (anim_time * 10.0).sin(), 0.0), + Some(StageSection::Action) => (1.0, (anim_time * 10.0).sin(), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0), diff --git a/voxygen/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs index e054376e91..3cb36eefe2 100644 --- a/voxygen/anim/src/character/chargeswing.rs +++ b/voxygen/anim/src/character/chargeswing.rs @@ -50,7 +50,7 @@ impl Animation for ChargeswingAnimation { (anim_time * 18.0 * lab).sin(), 0.0, ), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0, 0.0, anim_time.powi(4)), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0, 0.0, anim_time.powi(4)), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 0.0, 1.0), _ => (0.0, 0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/consume.rs b/voxygen/anim/src/character/consume.rs index 5b25c93bbc..60d4a72177 100644 --- a/voxygen/anim/src/character/consume.rs +++ b/voxygen/anim/src/character/consume.rs @@ -30,7 +30,7 @@ impl Animation for ConsumeAnimation { Some(ItemUseKind::Consumable(ConsumableKind::Drink)) => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Use) => (1.0, (anim_time * 8.0).sin(), 0.0), + Some(StageSection::Action) => (1.0, (anim_time * 8.0).sin(), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(0.25)), _ => (0.0, 0.0, 0.0), }; @@ -59,7 +59,7 @@ impl Animation for ConsumeAnimation { Some(ItemUseKind::Consumable(ConsumableKind::Food | ConsumableKind::ComplexFood)) => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Use) => (1.0, (anim_time * 12.0).sin(), 0.0), + Some(StageSection::Action) => (1.0, (anim_time * 12.0).sin(), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(0.25)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/dash.rs b/voxygen/anim/src/character/dash.rs index f8a82a9ac5..a217f3fbb6 100644 --- a/voxygen/anim/src/character/dash.rs +++ b/voxygen/anim/src/character/dash.rs @@ -38,7 +38,7 @@ impl Animation for DashAnimation { let (movement1, movement2, movement3, move4) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), Some(StageSection::Charge) => (1.0, anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.01), 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powf(0.01), 0.0), Some(StageSection::Recover) => (1.1, 1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/leapmelee.rs b/voxygen/anim/src/character/leapmelee.rs index b9268f368d..1c65b230b2 100644 --- a/voxygen/anim/src/character/leapmelee.rs +++ b/voxygen/anim/src/character/leapmelee.rs @@ -38,7 +38,7 @@ impl Animation for LeapAnimation { let (movement1, movement2, movement3, move4) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0, 0.0), Some(StageSection::Movement) => (1.0, anim_time.powi(2), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powf(0.75), 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powf(0.75), 0.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time.powf(0.75)), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/repeater.rs b/voxygen/anim/src/character/repeater.rs index 6ef0f087c7..3da66f57a0 100644 --- a/voxygen/anim/src/character/repeater.rs +++ b/voxygen/anim/src/character/repeater.rs @@ -39,7 +39,7 @@ impl Animation for RepeaterAnimation { let (move1base, move2base, move3base, move4) = match stage_section { Some(StageSection::Movement) => (anim_time, 0.0, 0.0, 0.0), Some(StageSection::Buildup) => (1.0, anim_time, 0.0, 0.0), - Some(StageSection::Shoot) => (1.0, 1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.1, 1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/shockwave.rs b/voxygen/anim/src/character/shockwave.rs index db2c557c8f..1bb97225da 100644 --- a/voxygen/anim/src/character/shockwave.rs +++ b/voxygen/anim/src/character/shockwave.rs @@ -40,7 +40,7 @@ impl Animation for ShockwaveAnimation { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Swing) | Some(StageSection::Cast) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/shoot.rs b/voxygen/anim/src/character/shoot.rs index df7ca83f22..a21f623f37 100644 --- a/voxygen/anim/src/character/shoot.rs +++ b/voxygen/anim/src/character/shoot.rs @@ -69,7 +69,7 @@ impl Animation for ShootAnimation { Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => { let (move1, move2, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Shoot) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; @@ -123,7 +123,7 @@ impl Animation for ShootAnimation { Some(ToolKind::Bow) => { let (_move1, move2, _move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Shoot) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/spin.rs b/voxygen/anim/src/character/spin.rs index a9413004db..8aa3357bbf 100644 --- a/voxygen/anim/src/character/spin.rs +++ b/voxygen/anim/src/character/spin.rs @@ -37,7 +37,7 @@ impl Animation for SpinAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -75,7 +75,7 @@ impl Animation for SpinAnimation { Some(ToolKind::Axe) => { let (movement1, movement2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; @@ -156,7 +156,7 @@ impl Animation for SpinAnimation { Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5); let (move1, move2, _move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/character/spinmelee.rs b/voxygen/anim/src/character/spinmelee.rs index 48106230f2..f994546c4a 100644 --- a/voxygen/anim/src/character/spinmelee.rs +++ b/voxygen/anim/src/character/spinmelee.rs @@ -35,7 +35,7 @@ impl Animation for SpinMeleeAnimation { *rate = 1.0; let (movement1, movement2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(2.0)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/golem/alpha.rs b/voxygen/anim/src/golem/alpha.rs index b0c5e6eb37..af46debe38 100644 --- a/voxygen/anim/src/golem/alpha.rs +++ b/voxygen/anim/src/golem/alpha.rs @@ -26,7 +26,7 @@ impl Animation for AlphaAnimation { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/golem/beam.rs b/voxygen/anim/src/golem/beam.rs index f9d8132f9b..8a3d22a82b 100644 --- a/voxygen/anim/src/golem/beam.rs +++ b/voxygen/anim/src/golem/beam.rs @@ -25,7 +25,7 @@ impl Animation for BeamAnimation { let (move1base, move1iso, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Cast) => (1.0, 0.0, 1.0, 0.0), + Some(StageSection::Action) => (1.0, 0.0, 1.0, 0.0), Some(StageSection::Recover) => (1.0, 0.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/golem/shockwave.rs b/voxygen/anim/src/golem/shockwave.rs index 47efe596cc..d4d2a5ffaa 100644 --- a/voxygen/anim/src/golem/shockwave.rs +++ b/voxygen/anim/src/golem/shockwave.rs @@ -27,7 +27,7 @@ impl Animation for ShockwaveAnimation { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(2.0)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/golem/shoot.rs b/voxygen/anim/src/golem/shoot.rs index d5ffc61f38..8c1fa16a6b 100644 --- a/voxygen/anim/src/golem/shoot.rs +++ b/voxygen/anim/src/golem/shoot.rs @@ -27,7 +27,7 @@ impl Animation for ShootAnimation { let (move1base, move2base, move3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.4), 0.0, 0.0), - Some(StageSection::Shoot) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/golem/spinmelee.rs b/voxygen/anim/src/golem/spinmelee.rs index aef2b59288..14542de232 100644 --- a/voxygen/anim/src/golem/spinmelee.rs +++ b/voxygen/anim/src/golem/spinmelee.rs @@ -26,7 +26,7 @@ impl Animation for SpinMeleeAnimation { let (movement1, movement2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, anim_time, 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powf(4.0)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/object/shoot.rs b/voxygen/anim/src/object/shoot.rs index f3375a02db..0f08af91d4 100644 --- a/voxygen/anim/src/object/shoot.rs +++ b/voxygen/anim/src/object/shoot.rs @@ -35,7 +35,7 @@ impl Animation for ShootAnimation { let (movement1, movement2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_low/alpha.rs b/voxygen/anim/src/quadruped_low/alpha.rs index 1fb1812632..9ca4ebb5ab 100644 --- a/voxygen/anim/src/quadruped_low/alpha.rs +++ b/voxygen/anim/src/quadruped_low/alpha.rs @@ -26,7 +26,7 @@ impl Animation for AlphaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_low/beta.rs b/voxygen/anim/src/quadruped_low/beta.rs index d09eb8933f..e3b4f814f2 100644 --- a/voxygen/anim/src/quadruped_low/beta.rs +++ b/voxygen/anim/src/quadruped_low/beta.rs @@ -26,7 +26,7 @@ impl Animation for BetaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_low/breathe.rs b/voxygen/anim/src/quadruped_low/breathe.rs index c70f4bdb9a..5a8be10711 100644 --- a/voxygen/anim/src/quadruped_low/breathe.rs +++ b/voxygen/anim/src/quadruped_low/breathe.rs @@ -28,7 +28,7 @@ impl Animation for BreatheAnimation { let (movement1base, _movement2base, movement3, twitch) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0, 0.0), - Some(StageSection::Cast) => (1.0, anim_time.min(1.0), 0.0, anim_time), + Some(StageSection::Action) => (1.0, anim_time.min(1.0), 0.0, anim_time), Some(StageSection::Recover) => (1.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_low/dash.rs b/voxygen/anim/src/quadruped_low/dash.rs index c555ddee0b..aae6349ab9 100644 --- a/voxygen/anim/src/quadruped_low/dash.rs +++ b/voxygen/anim/src/quadruped_low/dash.rs @@ -28,7 +28,7 @@ impl Animation for DashAnimation { let (movement1base, chargemovementbase, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0, 0.0), Some(StageSection::Charge) => (1.0, 1.0, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_low/shoot.rs b/voxygen/anim/src/quadruped_low/shoot.rs index 9f43cc2463..e827e9e50f 100644 --- a/voxygen/anim/src/quadruped_low/shoot.rs +++ b/voxygen/anim/src/quadruped_low/shoot.rs @@ -25,7 +25,7 @@ impl Animation for ShootAnimation { let (movement1, movement2, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_low/tailwhip.rs b/voxygen/anim/src/quadruped_low/tailwhip.rs index 5cb36a14f2..e1d2dc741c 100644 --- a/voxygen/anim/src/quadruped_low/tailwhip.rs +++ b/voxygen/anim/src/quadruped_low/tailwhip.rs @@ -27,7 +27,7 @@ impl Animation for TailwhipAnimation { Some(StageSection::Charge) => { (anim_time.min(1.2), 0.0, 0.0, (anim_time * 15.0).sin(), 0.0) }, - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0, 1.0, 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0, 1.0, 0.0), Some(StageSection::Recover) => { (1.0, 1.0, anim_time.powi(6), 1.0, (anim_time * 7.0).sin()) }, diff --git a/voxygen/anim/src/quadruped_medium/alpha.rs b/voxygen/anim/src/quadruped_medium/alpha.rs index 62c920a8fc..771d7dedd0 100644 --- a/voxygen/anim/src/quadruped_medium/alpha.rs +++ b/voxygen/anim/src/quadruped_medium/alpha.rs @@ -26,7 +26,7 @@ impl Animation for AlphaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_medium/beta.rs b/voxygen/anim/src/quadruped_medium/beta.rs index 9ab747861c..7bf1bee59d 100644 --- a/voxygen/anim/src/quadruped_medium/beta.rs +++ b/voxygen/anim/src/quadruped_medium/beta.rs @@ -26,7 +26,7 @@ impl Animation for BetaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.sqrt(), 0.0), + Some(StageSection::Action) => (1.0, anim_time.sqrt(), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_medium/dash.rs b/voxygen/anim/src/quadruped_medium/dash.rs index 64e7efdd64..a3e90fbc1e 100644 --- a/voxygen/anim/src/quadruped_medium/dash.rs +++ b/voxygen/anim/src/quadruped_medium/dash.rs @@ -29,7 +29,7 @@ impl Animation for DashAnimation { match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0, 0.0, anim_time), Some(StageSection::Charge) => (1.0, 1.0, 0.0, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powi(4), 0.0, 1.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powi(4), 0.0, 1.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_medium/hoof.rs b/voxygen/anim/src/quadruped_medium/hoof.rs index a48a2dbc06..5dbc7021cd 100644 --- a/voxygen/anim/src/quadruped_medium/hoof.rs +++ b/voxygen/anim/src/quadruped_medium/hoof.rs @@ -27,7 +27,7 @@ impl Animation for HoofAnimation { let (movement1base, movement2base, movement3, twitch) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powf(0.25), 0.0, anim_time), + Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0, anim_time), Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_medium/leapmelee.rs b/voxygen/anim/src/quadruped_medium/leapmelee.rs index 2b284869c6..f3551f264f 100644 --- a/voxygen/anim/src/quadruped_medium/leapmelee.rs +++ b/voxygen/anim/src/quadruped_medium/leapmelee.rs @@ -27,7 +27,7 @@ impl Animation for LeapMeleeAnimation { let (movement1base, movement2base, movement3base, movement4) = match stage_section { Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0), Some(StageSection::Movement) => (1.0, anim_time, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time, 0.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time, 0.0), Some(StageSection::Recover) => (0.0, 1.0, 1.0, anim_time.powi(4)), _ => (0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/quadruped_small/alpha.rs b/voxygen/anim/src/quadruped_small/alpha.rs index fd46a10240..41636c5adc 100644 --- a/voxygen/anim/src/quadruped_small/alpha.rs +++ b/voxygen/anim/src/quadruped_small/alpha.rs @@ -26,7 +26,7 @@ impl Animation for AlphaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/theropod/alpha.rs b/voxygen/anim/src/theropod/alpha.rs index ba96806833..ead443e2c6 100644 --- a/voxygen/anim/src/theropod/alpha.rs +++ b/voxygen/anim/src/theropod/alpha.rs @@ -25,7 +25,7 @@ impl Animation for AlphaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powi(2), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/theropod/beta.rs b/voxygen/anim/src/theropod/beta.rs index f3dba2e2bc..51e201aafc 100644 --- a/voxygen/anim/src/theropod/beta.rs +++ b/voxygen/anim/src/theropod/beta.rs @@ -26,7 +26,7 @@ impl Animation for BetaAnimation { let (movement1base, movement2base, movement3) = match stage_section { Some(StageSection::Buildup) => (anim_time.powi(2), 0.0, 0.0), - Some(StageSection::Swing) => (1.0, anim_time.powi(4), 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(4), 0.0), Some(StageSection::Recover) => (1.0, 1.0, anim_time), _ => (0.0, 0.0, 0.0), }; diff --git a/voxygen/anim/src/theropod/dash.rs b/voxygen/anim/src/theropod/dash.rs index c93d76ae5f..31af69d589 100644 --- a/voxygen/anim/src/theropod/dash.rs +++ b/voxygen/anim/src/theropod/dash.rs @@ -27,7 +27,7 @@ impl Animation for DashAnimation { match stage_section { Some(StageSection::Buildup) => (anim_time.sqrt(), 0.0, 0.0, 0.0, anim_time), Some(StageSection::Charge) => (1.0, 1.0, 0.0, 0.0, 0.0), - Some(StageSection::Swing) => (1.0, 1.0, anim_time.powi(4), 0.0, 1.0), + Some(StageSection::Action) => (1.0, 1.0, anim_time.powi(4), 0.0, 1.0), Some(StageSection::Recover) => (1.0, 1.0, 1.0, anim_time, 1.0), _ => (0.0, 0.0, 0.0, 0.0, 0.0), }; diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 4532c412dd..05515813d4 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -147,7 +147,7 @@ fn matches_ability_stage() { exhausted: false, stage: 1, timer: Duration::default(), - stage_section: states::utils::StageSection::Swing, + stage_section: states::utils::StageSection::Action, }), &PreviousEntityState { event: SfxEvent::Idle, @@ -160,7 +160,7 @@ fn matches_ability_stage() { assert_eq!( result, SfxEvent::Attack( - CharacterAbilityType::ComboMelee(states::utils::StageSection::Swing, 1), + CharacterAbilityType::ComboMelee(states::utils::StageSection::Action, 1), ToolKind::Sword ) ); @@ -209,7 +209,7 @@ fn ignores_different_ability_stage() { exhausted: false, stage: 1, timer: Duration::default(), - stage_section: states::utils::StageSection::Swing, + stage_section: states::utils::StageSection::Action, }), &PreviousEntityState { event: SfxEvent::Idle, @@ -222,7 +222,7 @@ fn ignores_different_ability_stage() { assert_ne!( result, SfxEvent::Attack( - CharacterAbilityType::ComboMelee(states::utils::StageSection::Swing, 2), + CharacterAbilityType::ComboMelee(states::utils::StageSection::Action, 2), ToolKind::Sword ) ); diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index a27b677d6a..92dc046bbf 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -973,7 +973,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1064,7 +1064,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1094,7 +1094,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Shoot => { + StageSection::Action => { stage_time / s.static_data.shoot_duration.as_secs_f32() }, StageSection::Recover => { @@ -1151,7 +1151,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1178,7 +1178,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1206,7 +1206,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => { + StageSection::Action => { stage_time / s.static_data.cast_duration.as_secs_f32() }, StageSection::Recover => { @@ -1237,7 +1237,7 @@ impl FigureMgr { StageSection::Movement => { stage_time / s.static_data.movement_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1266,7 +1266,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1348,7 +1348,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => s.timer.as_secs_f32(), + StageSection::Action => s.timer.as_secs_f32(), StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -1377,7 +1377,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1434,7 +1434,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => stage_time, + StageSection::Action => stage_time, StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -1462,7 +1462,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Use => stage_time, + StageSection::Action => stage_time, StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -1711,7 +1711,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1900,7 +1900,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1929,7 +1929,7 @@ impl FigureMgr { stage_time / s.static_data.buildup_duration.as_secs_f32() }, StageSection::Charge => stage_time, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1959,7 +1959,7 @@ impl FigureMgr { StageSection::Movement => { stage_time / s.static_data.movement_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -1989,7 +1989,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -2231,7 +2231,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -2261,7 +2261,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -2336,7 +2336,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -2392,7 +2392,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => s.timer.as_secs_f32(), + StageSection::Action => s.timer.as_secs_f32(), StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -2418,7 +2418,7 @@ impl FigureMgr { stage_time / s.static_data.buildup_duration.as_secs_f32() }, StageSection::Charge => stage_time, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -2772,7 +2772,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -2907,7 +2907,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3147,7 +3147,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3194,7 +3194,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3331,7 +3331,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => s.timer.as_secs_f32(), + StageSection::Action => s.timer.as_secs_f32(), StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -3362,7 +3362,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3420,7 +3420,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3443,7 +3443,7 @@ impl FigureMgr { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => { + StageSection::Action => { stage_time / s.static_data.cast_duration.as_secs_f32() }, StageSection::Recover => { @@ -3475,7 +3475,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3729,7 +3729,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3760,7 +3760,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => { + StageSection::Action => { stage_time / s.static_data.cast_duration.as_secs_f32() }, StageSection::Recover => { @@ -3791,7 +3791,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3951,7 +3951,7 @@ impl FigureMgr { StageSection::Charge => { stage_time / s.static_data.charge_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -3983,7 +3983,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4047,7 +4047,7 @@ impl FigureMgr { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4078,7 +4078,7 @@ impl FigureMgr { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => { + StageSection::Action => { stage_time / s.static_data.cast_duration.as_secs_f32() }, StageSection::Recover => { @@ -4115,7 +4115,7 @@ impl FigureMgr { stage_time / s.static_data.movement_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4148,7 +4148,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4176,7 +4176,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => s.timer.as_secs_f32(), + StageSection::Action => s.timer.as_secs_f32(), StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -4204,7 +4204,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => { + StageSection::Action => { stage_time / s.static_data.cast_duration.as_secs_f32() }, StageSection::Recover => { @@ -4329,7 +4329,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / stage.base_buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / stage.base_swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4378,7 +4378,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => s.timer.as_secs_f32(), + StageSection::Action => s.timer.as_secs_f32(), StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, @@ -4400,7 +4400,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4423,7 +4423,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4446,7 +4446,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Swing => { + StageSection::Action => { stage_time / s.static_data.swing_duration.as_secs_f32() }, StageSection::Recover => { @@ -4563,7 +4563,7 @@ impl FigureMgr { StageSection::Buildup => { stage_time / s.static_data.buildup_duration.as_secs_f32() }, - StageSection::Cast => s.timer.as_secs_f32(), + StageSection::Action => s.timer.as_secs_f32(), StageSection::Recover => { stage_time / s.static_data.recover_duration.as_secs_f32() }, diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs index 7d9c032bf6..d66177fd9b 100644 --- a/voxygen/src/scene/particle.rs +++ b/voxygen/src/scene/particle.rs @@ -602,7 +602,7 @@ impl ParticleMgr { if let Some(specifier) = spin.static_data.specifier { match specifier { states::spin_melee::FrontendSpecifier::CultistVortex => { - if matches!(spin.stage_section, StageSection::Swing) { + if matches!(spin.stage_section, StageSection::Action) { let range = spin.static_data.range; // Particles for vortex let heartbeats = @@ -711,7 +711,7 @@ impl ParticleMgr { CharacterState::SelfBuff(c) => { use buff::BuffKind; if let BuffKind::Frenzied = c.static_data.buff_kind { - if matches!(c.stage_section, StageSection::Cast) { + if matches!(c.stage_section, StageSection::Action) { self.particles.resize_with( self.particles.len() + usize::from(