LICENSE.md

@@ -45,8 +45,6 @@
     - 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/)
-    - drink.ogg: [Pouring Beer into Short Glass by megashroom, CC0](https://freesound.org/s/390336/)
-    - 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).

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::ExitVehicle));
+                            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
                             commands.entity(vehicle).remove::<PlayerCamera>();
                             commands.entity(driver).insert(PlayerCamera);
                             commands.entity(vehicle).remove::<PlayerDrivesThis>();

src/audio.rs

@@ -70,10 +70,7 @@ 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::Drink, "sounds/drink.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::EnterVehicle, "sounds/growl.ogg"),
     (
         SfxType::OneOff,
         Sfx::IncomingChatMessage,
@@ -95,13 +92,10 @@ pub enum Sfx {
     Click,
     Connect,
     Crash,
-    Drink,
     ElectricMotor,
     EnterVehicle,
-    ExitVehicle,
     Gasp,
     GaspRelief,
-    Honk,
     IncomingChatMessage,
     Ion,
     Ping,
@@ -117,11 +111,7 @@ 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,
-        "drink" => Sfx::Drink,
         "woosh" => Sfx::Woosh,
         "zoom" => Sfx::Zoom,
         "chat" => Sfx::IncomingChatMessage,

src/chat.rs

@@ -947,7 +947,6 @@ pub fn handle_chat_scripts(
                 });
             }
             "drinkpizza" => {
-                ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Drink));
                 ew_achievement.send(game::AchievementEvent::DrinkPizza);
             }
             _ => {

src/chats/serenity.yaml

@@ -285,7 +285,6 @@
     - label: getcoffee
     - Coming right up your feeding tube!
     - system: Received Old Earth Soykaf
-      sound: drink
     - goto: served
   - Surprise me.:
     - Hmm...

src/game.rs

@@ -361,10 +361,7 @@ 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::Honk));
-        }
-        else {
-            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
+            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::EnterVehicle));
         }
     }
     if !settings.god_mode && !settings.dev_mode {