diff --git a/LICENSE.md b/LICENSE.md index 17d30bb..65161e8 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/) + - 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. diff --git a/assets/sounds/drink.ogg b/assets/sounds/drink.ogg new file mode 100644 index 0000000..8145171 Binary files /dev/null and b/assets/sounds/drink.ogg differ diff --git a/src/audio.rs b/src/audio.rs index 6cfad72..a495b3d 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -70,6 +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"), @@ -94,6 +95,7 @@ pub enum Sfx { Click, Connect, Crash, + Drink, ElectricMotor, EnterVehicle, ExitVehicle, @@ -119,6 +121,7 @@ pub fn str2sfx(sfx_label: &str) -> Sfx { "exit" => Sfx::ExitVehicle, "honk" => Sfx::Honk, "click" => Sfx::Click, + "drink" => Sfx::Drink, "woosh" => Sfx::Woosh, "zoom" => Sfx::Zoom, "chat" => Sfx::IncomingChatMessage, diff --git a/src/chat.rs b/src/chat.rs index 7685091..f906d5e 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -947,6 +947,7 @@ pub fn handle_chat_scripts( }); } "drinkpizza" => { + ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Drink)); ew_achievement.send(game::AchievementEvent::DrinkPizza); } _ => { diff --git a/src/chats/serenity.yaml b/src/chats/serenity.yaml index 5892451..8ea1390 100644 --- a/src/chats/serenity.yaml +++ b/src/chats/serenity.yaml @@ -285,6 +285,7 @@ - label: getcoffee - Coming right up your feeding tube! - system: Received Old Earth Soykaf + sound: drink - goto: served - Surprise me.: - Hmm...