diff --git a/LICENSE.md b/LICENSE.md index 2ed5ecd..17d30bb 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -45,6 +45,7 @@ - zoom.ogg: Recorded a screw thread scraping against a saxophone ligature - Other sounds: - achieve.ogg: UI Completed Status Alert Notification SFX001.wav [by Headphaze, CC BY 4.0](https://freesound.org/s/277033/) + - enter.ogg, exit.ogg: [Getting Out of Car.wav by kingsrow, CC0](https://freesound.org/s/181568/) - Takeoff.ogg: [By Serat, CC BY 4.0](https://freemusicarchive.org/music/serat/route-remastered/takeoff-remastered/) - JupiterRecording.ogg: An [actual Jupiter recording by NASA](https://archive.org/download/voyager-1-and-2-1990-jupiter-nasa-voyager-space-sounds-electronic), public domain. - Processed by cutting out min 1:47-3:47 and applying a 10s linear crossfade at the end. Exported as ogg with quality=3, see [.kdenlive file](src/audio/JupiterRecording.kdenlive). diff --git a/assets/sounds/enter.ogg b/assets/sounds/enter.ogg new file mode 100644 index 0000000..dbbf433 Binary files /dev/null and b/assets/sounds/enter.ogg differ diff --git a/assets/sounds/exit.ogg b/assets/sounds/exit.ogg new file mode 100644 index 0000000..b1aba52 Binary files /dev/null and b/assets/sounds/exit.ogg differ diff --git a/src/actor.rs b/src/actor.rs index 79b2f10..02f7b58 100644 --- a/src/actor.rs +++ b/src/actor.rs @@ -495,7 +495,7 @@ pub fn handle_vehicle_enter_exit( flashlight_trans.translation = Vec3::new(0.0, 0.0, 1.0); } commands.entity(driver).insert(RigidBody::Dynamic); - ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch)); + ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::ExitVehicle)); commands.entity(vehicle).remove::(); commands.entity(driver).insert(PlayerCamera); commands.entity(vehicle).remove::(); diff --git a/src/audio.rs b/src/audio.rs index d220084..6cfad72 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -70,7 +70,9 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[ (SfxType::OneOff, Sfx::Click, "sounds/click.ogg"), (SfxType::OneOff, Sfx::Connect, "sounds/connect.ogg"), (SfxType::OneOff, Sfx::Crash, "sounds/crash.ogg"), - (SfxType::OneOff, Sfx::EnterVehicle, "sounds/growl.ogg"), + (SfxType::OneOff, Sfx::EnterVehicle, "sounds/enter.ogg"), + (SfxType::OneOff, Sfx::ExitVehicle, "sounds/exit.ogg"), + (SfxType::OneOff, Sfx::Honk, "sounds/growl.ogg"), ( SfxType::OneOff, Sfx::IncomingChatMessage, @@ -94,8 +96,10 @@ pub enum Sfx { Crash, ElectricMotor, EnterVehicle, + ExitVehicle, Gasp, GaspRelief, + Honk, IncomingChatMessage, Ion, Ping, @@ -111,6 +115,9 @@ pub fn str2sfx(sfx_label: &str) -> Sfx { return match sfx_label { "achieve" => Sfx::Achieve, "switch" => Sfx::Switch, + "enter" => Sfx::EnterVehicle, + "exit" => Sfx::ExitVehicle, + "honk" => Sfx::Honk, "click" => Sfx::Click, "woosh" => Sfx::Woosh, "zoom" => Sfx::Zoom, diff --git a/src/game.rs b/src/game.rs index 2de0cc9..7b2e6a9 100644 --- a/src/game.rs +++ b/src/game.rs @@ -361,7 +361,10 @@ fn handle_cheats( if key_input.just_pressed(settings.key_cheat_god_mode) { settings.god_mode ^= true; if settings.god_mode { - ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle)); + ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Honk)); + } + else { + ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch)); } } if !settings.god_mode && !settings.dev_mode {