Merge pull request #15 from SecretPocketCat/sfx

Sfx
SecretPocketCat · Apr 10, 2023 · 286c61e · 286c61e
2 parents fcaea74 + 911c393
commit 286c61e
Show file tree

Hide file tree

Showing 39 changed files with 162 additions and 82 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,8 +9,8 @@ on:
 env:
   # heads-up: this value is used as a pattern in an sed command as a workaround for a trunk issue
   #   if you use special characters, take a look at the 'Make paths relative' step in the 'build-web' job
-  GAME_EXECUTABLE_NAME: sonarscape
-  GAME_OSX_APP_NAME: sonarscape
+  GAME_EXECUTABLE_NAME: ranos
+  GAME_OSX_APP_NAME: ranos
 
 permissions:
   contents: write

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -18,13 +18,13 @@
       "cargo": {
         "args": [
           "build",
-          "--bin=sonarscape",
-          "--package=sonarscape",
+          "--bin=ranos",
+          "--package=ranos",
           "--features",
           "dev"
         ],
         "filter": {
-          "name": "sonarscape",
+          "name": "ranos",
           "kind": "bin"
         }
       },
@@ -47,13 +47,13 @@
         "args": [
           "test",
           "--no-run",
-          "--bin=sonarscape",
-          "--package=sonarscape",
+          "--bin=ranos",
+          "--package=ranos",
           "--features",
           "dev"
         ],
         "filter": {
-          "name": "sonarscape",
+          "name": "ranos",
           "kind": "bin"
         }
       },

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sonarscape"
+name = "ranos"
 version = "0.1.0"
 publish = false
 edition = "2021"

diff --git a/assets/audio/flying.ogg b/assets/audio/flying.ogg
diff --git a/assets/audio/sfx/drone.ogg b/assets/audio/sfx/drone.ogg
diff --git a/assets/audio/sfx/echo1.ogg b/assets/audio/sfx/echo1.ogg
diff --git a/assets/audio/sfx/echo2.ogg b/assets/audio/sfx/echo2.ogg
diff --git a/assets/audio/sfx/enemy_alert1.ogg b/assets/audio/sfx/enemy_alert1.ogg
diff --git a/assets/audio/sfx/enemy_alert2.ogg b/assets/audio/sfx/enemy_alert2.ogg
diff --git a/assets/audio/sfx/enemy_death1.ogg b/assets/audio/sfx/enemy_death1.ogg
diff --git a/assets/audio/sfx/enemy_death2.ogg b/assets/audio/sfx/enemy_death2.ogg
diff --git a/assets/audio/sfx/level_cleared.ogg b/assets/audio/sfx/level_cleared.ogg
diff --git a/assets/audio/sfx/player_death1.ogg b/assets/audio/sfx/player_death1.ogg
diff --git a/assets/audio/sfx/player_death2.ogg b/assets/audio/sfx/player_death2.ogg
diff --git a/assets/audio/sfx/ui/click1.ogg b/assets/audio/sfx/ui/click1.ogg
diff --git a/assets/audio/sfx/ui/click10.ogg b/assets/audio/sfx/ui/click10.ogg
diff --git a/assets/audio/sfx/ui/click11.ogg b/assets/audio/sfx/ui/click11.ogg
diff --git a/assets/audio/sfx/ui/click12.ogg b/assets/audio/sfx/ui/click12.ogg
diff --git a/assets/audio/sfx/ui/click13.ogg b/assets/audio/sfx/ui/click13.ogg
diff --git a/assets/audio/sfx/ui/click2.ogg b/assets/audio/sfx/ui/click2.ogg
diff --git a/assets/audio/sfx/ui/click3.ogg b/assets/audio/sfx/ui/click3.ogg
diff --git a/assets/audio/sfx/ui/click4.ogg b/assets/audio/sfx/ui/click4.ogg
diff --git a/assets/audio/sfx/ui/click5.ogg b/assets/audio/sfx/ui/click5.ogg
diff --git a/assets/audio/sfx/ui/click6.ogg b/assets/audio/sfx/ui/click6.ogg
diff --git a/assets/audio/sfx/ui/click7.ogg b/assets/audio/sfx/ui/click7.ogg
diff --git a/assets/audio/sfx/ui/click8.ogg b/assets/audio/sfx/ui/click8.ogg
diff --git a/assets/audio/sfx/ui/click9.ogg b/assets/audio/sfx/ui/click9.ogg
diff --git a/build/macos/src/Game.app/Contents/Info.plist b/build/macos/src/Game.app/Contents/Info.plist
@@ -5,17 +5,17 @@
         <key>CFBundleDevelopmentRegion</key>
         <string>en</string>
         <key>CFBundleDisplayName</key>
-        <string>sonarscape</string>        <!-- ToDo: this should be the same as your OSX app name in the release flow -->
+        <string>ranos</string>        <!-- ToDo: this should be the same as your OSX app name in the release flow -->
         <key>CFBundleExecutable</key>
-        <string>sonarscape</string>        <!-- ToDo: this should be the same as your executable name in the release flow -->
+        <string>ranos</string>        <!-- ToDo: this should be the same as your executable name in the release flow -->
         <key>CFBundleIconFile</key>
         <string>AppIcon.icns</string>
         <key>CFBundleIdentifier</key>
-        <string>spc.sonarscape</string>        <!-- ToDo -->
+        <string>spc.ranos</string>        <!-- ToDo -->
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleName</key>
-        <string>sonarscape</string>        <!-- ToDo -->
+        <string>ranos</string>        <!-- ToDo -->
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>sonarscape</title>
+    <title>ranos</title>
     <!-- ToDo -->
     <link data-trunk rel="copy-dir" href="assets" />
     <link data-trunk rel="copy-dir" href="credits" />

diff --git a/src/assets/audio.rs b/src/assets/audio.rs
@@ -4,24 +4,36 @@ use bevy_kira_audio::AudioSource;
 
 use super::add_dynamic_assets;
 
-#[derive(AssetCollection, Resource)]
-pub struct AudioAssets {
-    #[asset(path = "audio/flying.ogg")]
-    pub flying: Handle<AudioSource>,
-}
-
 #[derive(AssetCollection, Resource)]
 pub struct SfxAssets {
-    #[asset(key = "click", collection(typed))]
-    pub click: Vec<Handle<AudioSource>>,
+    // todo: fix echo
+    #[asset(key = "echo", collection(typed))]
+    pub echo: Vec<Handle<AudioSource>>,
+
+    #[asset(key = "player_death", collection(typed))]
+    pub player_death: Vec<Handle<AudioSource>>,
+
+    #[asset(key = "enemy_alert", collection(typed))]
+    pub enemy_alert: Vec<Handle<AudioSource>>,
+
+    #[asset(key = "enemy_death", collection(typed))]
+    pub enemy_death: Vec<Handle<AudioSource>>,
+
+    #[asset(path = "audio/sfx/level_cleared.ogg")]
+    pub level_cleared: Handle<AudioSource>,
+
+    #[asset(path = "audio/sfx/drone.ogg")]
+    pub drone: Handle<AudioSource>,
 }
 
 pub(super) fn setup_sfx_assets(mut dynamic_assets: ResMut<DynamicAssets>) {
-    add_dynamic_assets(
-        &mut dynamic_assets,
-        "click",
-        "audio/sfx/ui/click",
-        "ogg",
-        1..=13,
-    );
+    for key in ["echo", "player_death", "enemy_alert", "enemy_death"] {
+        add_dynamic_assets(
+            &mut dynamic_assets,
+            key,
+            &format!("audio/sfx/{}", key),
+            "ogg",
+            1..=2,
+        );
+    }
 }
diff --git a/src/assets/mod.rs b/src/assets/mod.rs
@@ -18,7 +18,6 @@ pub fn assets_plugin(app: &mut App) {
         .add_loading_state(LoadingState::new(AppState::Loading))
         .add_collection_to_loading_state::<_, fonts::FontAssets>(AppState::Loading)
         .add_collection_to_loading_state::<_, audio::SfxAssets>(AppState::Loading)
-        .add_collection_to_loading_state::<_, audio::AudioAssets>(AppState::Loading)
         .add_collection_to_loading_state::<_, textures::TextureAssets>(AppState::Loading)
         .add_startup_system(audio::setup_sfx_assets)
         .add_plugin(ProgressPlugin::new(AppState::Loading))

diff --git a/src/audio/sfx.rs b/src/audio/sfx.rs
@@ -1,46 +1,84 @@
+use std::time::Duration;
+
 use bevy::input::mouse::MouseButtonInput;
 use bevy::{ecs::system::Resource, prelude::*};
 use bevy_kira_audio::prelude::*;
 use rand::seq::SliceRandom;
 use rand::*;
 
 use crate::assets::audio::SfxAssets;
+use crate::echolocation::echolocation::EcholocationEv;
+use crate::enemy::EnemyEv;
 use crate::io::save::VolumeSettings;
+use crate::player::player::PlayerEv;
+use crate::state::AppState;
 
 // todo: use sfx + master volume
 pub(super) fn sfx_plugin(app: &mut bevy::prelude::App) {
     app.add_audio_channel::<SfxChannel>()
-        .add_system(
-            play_sfx_on_evt::<MouseButtonInput>
+        .add_systems(
+            (
+                play_sfx_on_evt::<EcholocationEv>,
+                play_sfx_on_evt::<PlayerEv>,
+                play_sfx_on_evt::<EnemyEv>,
+            )
                 .in_base_set(CoreSet::PostUpdate)
-                .run_if(resource_exists::<SfxAssets>()),
+                .distributive_run_if(resource_exists::<SfxAssets>()),
         )
-        .add_system(set_sfx_volume.run_if(resource_changed::<VolumeSettings>()));
+        .add_system(set_sfx_volume.run_if(resource_changed::<VolumeSettings>()))
+        .add_system(play_drone.in_schedule(OnExit(AppState::Loading)));
 }
 
 #[derive(Resource)]
 struct SfxChannel;
 
 pub trait SfxEv {
     fn get_volume(&self) -> f64;
-    fn get_sfx_handles(sfx: &SfxAssets) -> &[Handle<AudioSource>];
+    fn get_sfx_handles(&self, sfx: &SfxAssets) -> Vec<Handle<AudioSource>>;
     fn skip(&self) -> bool {
         false
     }
 }
 
-impl SfxEv for MouseButtonInput {
+impl SfxEv for EcholocationEv {
     fn get_volume(&self) -> f64 {
-        // 0.25.lerp(&1.0, &self.strength)
-        0.2
+        1.0
     }
 
-    fn get_sfx_handles(sfx: &SfxAssets) -> &[Handle<AudioSource>] {
-        &sfx.click
+    fn get_sfx_handles(&self, sfx: &SfxAssets) -> Vec<Handle<AudioSource>> {
+        sfx.echo.clone()
     }
+}
 
-    fn skip(&self) -> bool {
-        !self.state.is_pressed()
+impl SfxEv for PlayerEv {
+    fn get_volume(&self) -> f64 {
+        match self {
+            PlayerEv::ClearedLevel => 0.5,
+            PlayerEv::Died => 0.9,
+        }
+    }
+
+    fn get_sfx_handles(&self, sfx: &SfxAssets) -> Vec<Handle<AudioSource>> {
+        match self {
+            PlayerEv::ClearedLevel => vec![sfx.level_cleared.clone()],
+            PlayerEv::Died => sfx.player_death.clone(),
+        }
+    }
+}
+
+impl SfxEv for EnemyEv {
+    fn get_volume(&self) -> f64 {
+        match self {
+            EnemyEv::Killed => 0.85,
+            EnemyEv::Alarmed => 0.3,
+        }
+    }
+
+    fn get_sfx_handles(&self, sfx: &SfxAssets) -> Vec<Handle<AudioSource>> {
+        match self {
+            EnemyEv::Killed => sfx.enemy_death.clone(),
+            EnemyEv::Alarmed => sfx.enemy_alert.clone(),
+        }
     }
 }
 
@@ -57,7 +95,7 @@ fn play_sfx_on_evt<TEvt: Event + SfxEv>(
             continue;
         }
 
-        if let Some(sfx_handle) = TEvt::get_sfx_handles(&sfx).choose(&mut rand) {
+        if let Some(sfx_handle) = ev.get_sfx_handles(&sfx).choose(&mut rand) {
             audio
                 .play(sfx_handle.clone())
                 .with_volume(ev.get_volume() * volume.get_sfx_volume());
@@ -68,3 +106,14 @@ fn play_sfx_on_evt<TEvt: Event + SfxEv>(
 fn set_sfx_volume(audio: Res<AudioChannel<SfxChannel>>, volume: Res<VolumeSettings>) {
     audio.set_volume(volume.get_sfx_volume());
 }
+
+fn play_drone(audio: Res<Audio>, assets: Res<SfxAssets>) {
+    audio
+        .play(assets.drone.clone())
+        .loop_from(1.5)
+        .fade_in(AudioTween::new(
+            Duration::from_secs(2),
+            AudioEasing::OutPowi(2),
+        ))
+        .with_volume(0.2);
+}
diff --git a/src/echolocation/echolocation.rs b/src/echolocation/echolocation.rs
@@ -33,6 +33,8 @@ pub struct EcholocationHitEv {
     pub hit_e: Entity,
 }
 
+pub struct EcholocationEv;
+
 pub struct Echolocate;
 
 pub(super) fn echolocate(
@@ -42,11 +44,14 @@ pub(super) fn echolocate(
         Without<Cooldown<Echolocate>>,
     >,
     textures: Res<TextureAssets>,
+    mut ev_w: EventWriter<EcholocationEv>,
 ) {
     for (player_e, _, player_t) in input_q
         .iter()
         .filter(|(_, input, ..)| input.just_pressed(PlayerAction::Echo))
     {
+        ev_w.send(EcholocationEv);
+
         // cooldown
         cmd.entity(player_e)
             .try_insert(Cooldown::<Echolocate>::new(1.2));

diff --git a/src/echolocation/mod.rs b/src/echolocation/mod.rs
@@ -3,7 +3,9 @@ use bevy::prelude::*;
 use crate::{assets::textures::TextureAssets, state::UnpausedGame};
 
 use self::{
-    echolocation::{echo_hit, echolocate, flash_on_echolocation, EcholocationHitEv},
+    echolocation::{
+        echo_hit, echolocate, flash_on_echolocation, EcholocationEv, EcholocationHitEv,
+    },
     wave::spawn_wave,
 };
 
@@ -12,6 +14,7 @@ pub mod wave;
 
 pub fn echo_plugin(app: &mut App) {
     app.add_event::<EcholocationHitEv>()
+        .add_event::<EcholocationEv>()
         .add_systems((echolocate, echo_hit).in_set(UnpausedGame))
         .add_system(flash_on_echolocation)
         .add_system(spawn_wave.run_if(resource_exists::<TextureAssets>()));