Add UI interaction sfx

Author: benfrankel

assets/audio/sfx/UI Click.ogg

@@ -126,6 +126,7 @@ impl EntityCommand for CardBackground {
                     pressed: atlas_on,
                     disabled: atlas_off,
                 },
+                InteractionSfx,
             ));
         }
     }

assets/audio/sfx/UI Click.wav

@@ -83,6 +83,10 @@ pub struct PlayingAssets {
     pub sfx_level_up: Handle<AudioSource>,
     #[asset(path = "audio/sfx/Projectile Hits Player-02.ogg")]
     pub sfx_hurt: Handle<AudioSource>,
+    #[asset(path = "audio/sfx/UI Hover.ogg")]
+    pub sfx_ui_click: Handle<AudioSource>,
+    #[asset(path = "audio/sfx/UI Click.ogg")]
+    pub sfx_ui_hover: Handle<AudioSource>,
 }
 
 impl Configure for PlayingAssets {

assets/audio/sfx/UI Hover.ogg

@@ -1,6 +1,7 @@
 use bevy::ecs::system::EntityCommand;
 use bevy::ecs::system::SystemState;
 use bevy::prelude::*;
+use bevy_kira_audio::prelude::*;
 use bevy_mod_picking::prelude::*;
 use leafwing_input_manager::common_conditions::action_just_pressed;
 use leafwing_input_manager::prelude::*;
@@ -15,6 +16,7 @@ use crate::game::card::card;
 use crate::game::card::deck::Deck;
 use crate::game::card::deck::IsDeckDisplay;
 use crate::game::card::CardConfig;
+use crate::screen::playing::PlayingAssets;
 use crate::screen::playing::PlayingMenu;
 use crate::ui::prelude::*;
 use crate::util::prelude::*;
@@ -383,29 +385,38 @@ fn card_select_right(
 }
 
 fn card_swap_left(
+    audio: Res<Audio>,
+    assets: Res<PlayingAssets>,
     deck_display_query: Query<&Selection, With<IsDeckDisplay>>,
     mut deck_query: Query<&mut Deck>,
 ) {
+    audio.play(assets.sfx_ui_hover.clone());
     for selection in &deck_display_query {
         let mut deck = c!(deck_query.get_mut(selection.0));
         deck.swap(-1);
     }
 }
 
 fn card_swap_right(
+    audio: Res<Audio>,
+    assets: Res<PlayingAssets>,
     deck_display_query: Query<&Selection, With<IsDeckDisplay>>,
     mut deck_query: Query<&mut Deck>,
 ) {
+    audio.play(assets.sfx_ui_hover.clone());
     for selection in &deck_display_query {
         let mut deck = c!(deck_query.get_mut(selection.0));
         deck.swap(1);
     }
 }
 
 fn card_discard(
+    audio: Res<Audio>,
+    assets: Res<PlayingAssets>,
     deck_display_query: Query<&Selection, With<IsDeckDisplay>>,
     mut deck_query: Query<&mut Deck>,
 ) {
+    audio.play(assets.sfx_ui_click.clone());
     for selection in &deck_display_query {
         let mut deck = c!(deck_query.get_mut(selection.0));
         deck.discard();

assets/audio/sfx/UI Hover.wav

@@ -18,6 +18,7 @@ pub mod prelude {
     pub use super::font::BOLD_FONT_HANDLE;
     pub use super::font::FONT_HANDLE;
     pub use super::font::THICK_FONT_HANDLE;
+    pub use super::interaction::InteractionSfx;
     pub use super::interaction::InteractionTable;
     pub use super::interaction::IsDisabled;
     pub use super::tooltip::Tooltip;

src/game/card.rs

@@ -1,9 +1,11 @@
 use bevy::prelude::*;
 use bevy::reflect::GetTypeRegistration;
+use bevy_kira_audio::prelude::*;
 use bevy_mod_picking::prelude::*;
 
 use crate::animation::offset::Offset;
 use crate::core::UpdateSet;
+use crate::screen::playing::PlayingAssets;
 use crate::ui::prelude::*;
 use crate::util::prelude::*;
 
@@ -15,6 +17,7 @@ pub(super) fn plugin(app: &mut App) {
         InteractionTable<ThemeColorFor<BackgroundColor>>,
         InteractionTable<TextureAtlas>,
         InteractionTable<Offset>,
+        InteractionSfx,
     )>();
 }
 
@@ -76,3 +79,42 @@ fn apply_interaction_table<C: Component + Clone>(
         .clone();
     }
 }
+
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+pub struct InteractionSfx;
+
+impl Configure for InteractionSfx {
+    fn configure(app: &mut App) {
+        app.register_type::<Self>();
+        app.add_systems(Update, play_interaction_sfx.in_set(UpdateSet::RecordInput));
+    }
+}
+
+fn play_interaction_sfx(
+    assets: Res<PlayingAssets>,
+    audio: Res<Audio>,
+    interaction_query: Query<
+        (Option<&IsDisabled>, &Interaction),
+        (
+            With<InteractionSfx>,
+            Or<(Changed<Interaction>, Changed<IsDisabled>)>,
+        ),
+    >,
+) {
+    for (is_disabled, interaction) in &interaction_query {
+        if matches!(is_disabled, Some(IsDisabled(true))) {
+            continue;
+        }
+
+        match interaction {
+            Interaction::Hovered => {
+                audio.play(assets.sfx_ui_hover.clone()).with_volume(0.6);
+            },
+            Interaction::Pressed => {
+                audio.play(assets.sfx_ui_click.clone()).with_volume(0.6);
+            },
+            _ => (),
+        }
+    }
+}

src/screen/playing.rs

@@ -54,6 +54,7 @@ pub fn menu_button(text: impl Into<String>) -> impl EntityCommand<World> {
                     pressed: Offset(Vec2::new(0.0, 2.0)),
                     ..default()
                 },
+                InteractionSfx,
             ))
             .with_children(|parent| {
                 parent.spawn((