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

Play the Run SFX when a character lands after jumping or falling

Browse Source 
This is a small detail but makes a noticable difference.
This commit is contained in:
S Handley 2020-01-12 16:35:20 +00:00 committed by Songtronix
parent 3405d42ef1
commit 00c1493548
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
voxygen/src/audio/sfx/event_mapper/movement.rs
View File

@ -128,13 +128,11 @@ impl MovementEventMapper {
(MovementState::Climb, ..) => SfxEvent::Climb,
(MovementState::Swim, ..) => SfxEvent::Swim,
(MovementState::Run, ..) => SfxEvent::Run,
(MovementState::Fall, _, previous_event) => {
if previous_event != SfxEvent::Glide {
SfxEvent::Fall
} else {
SfxEvent::GliderClose
}
}
(MovementState::Jump, ..) => SfxEvent::Jump,
(MovementState::Fall, _, SfxEvent::Glide) => SfxEvent::GliderClose,
(MovementState::Stand, _, SfxEvent::Fall) => SfxEvent::Run,
(MovementState::Fall, _, SfxEvent::Jump) => SfxEvent::Idle,
(MovementState::Fall, _, _) => SfxEvent::Fall,
(MovementState::Glide, _, previous_event) => {
if previous_event != SfxEvent::GliderOpen && previous_event != SfxEvent::Glide {
SfxEvent::GliderOpen
@ -142,13 +140,7 @@ impl MovementEventMapper {
SfxEvent::Glide
}
}
(MovementState::Stand, _, previous_event) => {
if previous_event == SfxEvent::Glide {
SfxEvent::GliderClose
} else {
SfxEvent::Idle
}
}
(MovementState::Stand, _, SfxEvent::Glide) => SfxEvent::GliderClose,
_ => SfxEvent::Idle,
}
}
@ -287,12 +279,25 @@ mod tests {
movement: MovementState::Fall,
action: ActionState::Idle,
},
SfxEvent::Idle,
SfxEvent::Fall,
);
assert_eq!(result, SfxEvent::Fall);
}
#[test]
fn maps_land_on_ground_to_run() {
let result = MovementEventMapper::map_movement_event(
&CharacterState {
movement: MovementState::Stand,
action: ActionState::Idle,
},
SfxEvent::Fall,
);
assert_eq!(result, SfxEvent::Run);
}
#[test]
fn maps_glider_open() {
let result = MovementEventMapper::map_movement_event(