From 7746c8408a5d3eb0bb335a81d0e24f1cc179045f Mon Sep 17 00:00:00 2001 From: elliay <91764038+elliay@users.noreply.github.com> Date: Thu, 5 Dec 2024 01:49:18 -0500 Subject: [PATCH 1/2] feat: play sound on player death --- assets/player/skins/fishy/fishy.player.yaml | 2 ++ assets/player/skins/orcy/orcy.player.yaml | 2 ++ assets/player/skins/pescy/pescy.player.yaml | 2 ++ assets/player/skins/sharky/sharky.player.yaml | 2 ++ assets/player/sounds/death.ogg | Bin 0 -> 21644 bytes src/core/metadata/player.rs | 3 +++ src/core/player/state/states/dead.rs | 3 +++ 7 files changed, 14 insertions(+) create mode 100644 assets/player/sounds/death.ogg diff --git a/assets/player/skins/fishy/fishy.player.yaml b/assets/player/skins/fishy/fishy.player.yaml index 79aa1b6f89..78ef4fe5e2 100644 --- 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 index 0442c4f510..0f271ab207 100644 --- 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 index cc7a1e5799..9d9c8ce0b9 100644 --- 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 index d6b48abe9f..ceaa48c60d 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..ea8fee096e84af66cc673789969a708bb4c659ed GIT binary patch literal 21644 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 literal 0 HcmV?d00001 diff --git a/src/core/metadata/player.rs b/src/core/metadata/player.rs index 397c814362..3d918bdf1f 100644 --- 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, + + pub death_volume: f64, + pub death: Handle, } 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 index f79fb87cb1..e19bb7b904 100644 --- 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, game_meta: Root, mut collision_world: CollisionWorld, + mut audio_center: ResMut, ) { 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 { From 21fc4ce0e444aa77f67e2d8a4fde493fa7835ec4 Mon Sep 17 00:00:00 2001 From: elliay <91764038+elliay@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:23:22 -0500 Subject: [PATCH 2/2] trimmed lead time in death sound --- assets/player/sounds/death.ogg | Bin 21644 -> 21644 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/player/sounds/death.ogg b/assets/player/sounds/death.ogg index ea8fee096e84af66cc673789969a708bb4c659ed..3ef2cbb888a5e919103593faf1c40a758f22791c 100644 GIT binary patch delta 105 zcmeBK$=I`!QOZ9(J(z)s0SW?GIO9RgEQyz=Crat@fcT6+{_niLDH}ul`9)$|Au2%< hAYHQs8*Mjl=l`THa{LxTh8f5-^{76$d9VF>5dhb_81euB delta 105 zcmeBK$=I`!QOZ9(J(z)s0SeMy-#H9owl@8oJ5frH2gGLt^4Y#DowYH