diff --git a/README.md b/README.md index f394c0f..7db1836 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,5 @@ cargo run - https://pixabay.com/sound-effects/typosonic-typing-192811 - https://pixabay.com/sound-effects/click-button-140881 +- https://pixabay.com/sound-effects/data-transmission-sound-from-14664-72309 +- https://pixabay.com/sound-effects/thrusters-loopwav-14699 diff --git a/assets/scenes/conversations.scn.ron b/assets/scenes/conversations.scn.ron index 074e101..869cdbb 100644 --- a/assets/scenes/conversations.scn.ron +++ b/assets/scenes/conversations.scn.ron @@ -21,7 +21,7 @@ name: "Icarus", label: "requested", delay: 4.0, - sound: "connect", + sound: "chat", reply: "Oh hey there!", goto: "sup", ), @@ -99,7 +99,7 @@ name: "Space Pizza™", label: "requested", delay: 5.0, - sound: "connect", + sound: "chat", reply: "Welcome to Space Pizza™, best pizza all across the Jovian rings!", goto: "ask", ), diff --git a/assets/sounds/connect.ogg b/assets/sounds/connect.ogg new file mode 100644 index 0000000..684d1b0 Binary files /dev/null and b/assets/sounds/connect.ogg differ diff --git a/assets/sounds/thruster.ogg b/assets/sounds/thruster.ogg new file mode 100644 index 0000000..1d3f6b9 Binary files /dev/null and b/assets/sounds/thruster.ogg differ diff --git a/src/actor.rs b/src/actor.rs index acbb3ac..df4d832 100644 --- a/src/actor.rs +++ b/src/actor.rs @@ -159,7 +159,6 @@ pub fn handle_input( query: Query<(&Talker, &Transform)>, player: Query<&Transform, With>, mut ew_conv: EventWriter, - mut ew_sfx: EventWriter, ) { if keyboard_input.just_pressed(settings.key_interact) { @@ -168,7 +167,6 @@ pub fn handle_input( for (talker, transform) in &query { if transform.translation.distance_squared(player.translation) <= mindist { ew_conv.send(StartConversationEvent{talker: talker.clone()}); - ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Ping)); break; } } diff --git a/src/audio.rs b/src/audio.rs index c971f5f..a3ad894 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -4,12 +4,12 @@ use crate::settings; const ASSET_CLICK: &str = "sounds/click-button-140881-crop.ogg"; const ASSET_SWITCH: &str = "sounds/typosonic-typing-192811-crop.ogg"; -const ASSET_INCOMING_MESSAGE: &str = "external/beep-6-96243.ogg"; -const ASSET_PING: &str = "external/glitch-sound-fx-pack-04-118236.ogg"; +const ASSET_INCOMING_MESSAGE: &str = "sounds/connect.ogg"; +const ASSET_PING: &str = "sounds/connect.ogg"; const ASSET_CONNECT: &str = "external/friend-request-14878.ogg"; const ASSET_RADIO: &str = "external/LP - Girls Go Wild (Official Music Video)-M7XRN0oHGIM.ogg"; const ASSET_BGM: &str = "external/FTL - Faster Than Light (2012) OST - 12 - Void (Explore)-edQw2yYXQJM.ogg"; -const ASSET_THRUSTER: &str = "external/loopingthrust-95548.ogg"; +const ASSET_THRUSTER: &str = "sounds/thruster.ogg"; const ASSET_WAKEUP: &str = "sounds/wakeup.ogg"; pub struct AudioPlugin;