feat: play sound on player death

fishfolk · Dec 5, 2024 · 7746c84 · 7746c84
1 parent 5d92c7d
commit 7746c84
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/assets/player/skins/fishy/fishy.player.yaml b/assets/player/skins/fishy/fishy.player.yaml
@@ -9,6 +9,8 @@ sounds:
   grab_volume: 0.05
   drop: ../../sounds/drop.ogg
   drop_volume: 0.05
+  death: ../../sounds/death.ogg
+  death_volume: 0.3
 
 stats:
   air_speed: 360

diff --git a/assets/player/skins/orcy/orcy.player.yaml b/assets/player/skins/orcy/orcy.player.yaml
@@ -9,6 +9,8 @@ sounds:
   grab_volume: 0.05
   drop: ../../sounds/drop.ogg
   drop_volume: 0.05
+  death: ../../sounds/death.ogg
+  death_volume: 0.3
 
 stats:
   air_speed: 360

diff --git a/assets/player/skins/pescy/pescy.player.yaml b/assets/player/skins/pescy/pescy.player.yaml
@@ -9,6 +9,8 @@ sounds:
   grab_volume: 0.05
   drop: ../../sounds/drop.ogg
   drop_volume: 0.05
+  death: ../../sounds/death.ogg
+  death_volume: 0.3
 
 stats:
   air_speed: 360

diff --git a/assets/player/skins/sharky/sharky.player.yaml b/assets/player/skins/sharky/sharky.player.yaml
@@ -9,6 +9,8 @@ sounds:
   grab_volume: 0.05
   drop: ../../sounds/drop.ogg
   drop_volume: 0.05
+  death: ../../sounds/death.ogg
+  death_volume: 0.3
 
 stats:
   air_speed: 360

diff --git a/assets/player/sounds/death.ogg b/assets/player/sounds/death.ogg
diff --git a/src/core/metadata/player.rs b/src/core/metadata/player.rs
@@ -93,6 +93,9 @@ pub struct PlayerSoundsMeta {
 
     pub drop_volume: f64,
     pub drop: Handle<AudioSource>,
+
+    pub death_volume: f64,
+    pub death: Handle<AudioSource>,
 }
 
 fn deserialize_arc<'de, T: Deserialize<'de>, D: Deserializer<'de>>(

diff --git a/src/core/player/state/states/dead.rs b/src/core/player/state/states/dead.rs
@@ -32,6 +32,7 @@ pub fn handle_player_state(
     mut animations: CompMut<AnimationBankSprite>,
     game_meta: Root<GameMeta>,
     mut collision_world: CollisionWorld,
+    mut audio_center: ResMut<AudioCenter>,
 ) {
     for (player_ent, (state, animation, _killed_player, player_idx)) in entities.iter_with((
         &player_states,
@@ -79,6 +80,8 @@ pub fn handle_player_state(
             let player_meta = &*assets.get(player_meta_handle);
             ragdoll::use_ragdoll_collider(player_ent, player_meta, &mut collision_world);
 
+            audio_center.play_sound(player_meta.sounds.death, player_meta.sounds.death_volume);
+
             // animation.current = match killed_player.hit_from {
             //     Some(hit_from)
             //         if {