Play laser fire sound even for remote players (#771)

Fixes #770.
DigitalExtinction · Oct 12, 2023 · 4b89fc3 · 4b89fc3
1 parent c5a5d96
commit 4b89fc3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/crates/combat/src/laser.rs b/crates/combat/src/laser.rs
@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::gamestate::GameState;
 use parry3d::query::Ray;
 
@@ -81,7 +80,6 @@ fn fire(
     sightline: LineOfSight,
     mut health: EventWriter<LocalUpdateHealthEvent>,
     mut trail: EventWriter<LocalLaserTrailEvent>,
-    mut start_sound: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for fire in fires.iter() {
         let observation = sightline.sight(fire.ray(), fire.max_toi(), fire.attacker());
@@ -94,10 +92,5 @@ fn fire(
         if let Some(entity) = observation.entity() {
             health.send(LocalUpdateHealthEvent::new(entity, -fire.damage()));
         }
-
-        start_sound.send(PlaySpatialAudioEvent::new(
-            Sound::LaserFire,
-            fire.ray().origin.into(),
-        ));
     }
 }
diff --git a/crates/combat/src/trail.rs b/crates/combat/src/trail.rs
@@ -11,6 +11,7 @@ use bevy::{
         },
     },
 };
+use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{
     cleanup::DespawnOnGameExit, gamestate::GameState, gconfig::GameConfig, state::AppState,
 };
@@ -35,16 +36,22 @@ impl Plugin for TrailPlugin {
                 (
                     local_laser_trail
                         .before(MessagesSet::SendMessages)
-                        .before(laser_trail),
-                    remote_laser_trail.before(laser_trail),
-                    laser_trail,
+                        .before(TrailSet::Trail),
+                    remote_laser_trail.before(TrailSet::Trail),
+                    laser_trail.in_set(TrailSet::Trail),
+                    laser_sound.in_set(TrailSet::Trail),
                     update,
                 )
                     .run_if(in_state(GameState::Playing)),
             );
     }
 }
 
+#[derive(Copy, Clone, Hash, Debug, PartialEq, Eq, SystemSet)]
+enum TrailSet {
+    Trail,
+}
+
 #[derive(Event)]
 pub(crate) struct LocalLaserTrailEvent(Ray);
 
@@ -178,6 +185,18 @@ fn laser_trail(
     }
 }
 
+fn laser_sound(
+    mut events: EventReader<LaserTrailEvent>,
+    mut sound_events: EventWriter<PlaySpatialAudioEvent>,
+) {
+    for event in events.iter() {
+        sound_events.send(PlaySpatialAudioEvent::new(
+            Sound::LaserFire,
+            event.0.origin.into(),
+        ));
+    }
+}
+
 fn update(mut commands: Commands, time: Res<Time>, mut query: Query<(Entity, &mut Trail)>) {
     for (entity, mut trail) in query.iter_mut() {
         trail.tick(time.delta());