Merge #284

284: sound working for chain attacks r=odecay a=odecay

Updated assets for Dev and chain system to work with sound effects on each attack.

Co-authored-by: otis <[email protected]>

Author: bors[bot]

assets/fighters/dev/dev.fighter.yaml

@@ -83,3 +83,7 @@ audio:
   effects:
     attacking:
       87: flop.ogg
+    chaining:
+      114: flop.ogg
+    followup:
+      129: flop.ogg

src/fighter_state.rs

@@ -933,6 +933,15 @@ fn chaining(
                     if !chaining.has_started {
                         chaining.has_started = true;
                         animation.play(Chaining::ANIMATION, false);
+                        // Play attack sound effect
+                        if let Some(effects) = fighter.audio.effect_handles.get(Chaining::ANIMATION)
+                        {
+                            let fx_playback = AnimationAudioPlayback::new(
+                                Chaining::ANIMATION.to_owned(),
+                                effects.clone(),
+                            );
+                            commands.entity(entity).insert(fx_playback);
+                        }
                     }
                     // Start the attack  from the beginning
 
@@ -945,6 +954,18 @@ fn chaining(
                         if chaining.link >= Chaining::LENGTH {
                             chaining.transition_to_final = true;
                         }
+                        // Play attack sound effect
+                        if let Some(effects) = fighter
+                            .audio
+                            .effect_handles
+                            .get(Chaining::FOLLOWUP_ANIMATION)
+                        {
+                            let fx_playback = AnimationAudioPlayback::new(
+                                Chaining::FOLLOWUP_ANIMATION.to_owned(),
+                                effects.clone(),
+                            );
+                            commands.entity(entity).insert(fx_playback);
+                        }
                     }
                     chaining.can_extend = false;
 
@@ -975,15 +996,6 @@ fn chaining(
                         .insert(attack.frames)
                         .id();
                     commands.entity(entity).push_children(&[attack_entity]);
-
-                    // Play attack sound effect
-                    if let Some(effects) = fighter.audio.effect_handles.get(Chaining::ANIMATION) {
-                        let fx_playback = AnimationAudioPlayback::new(
-                            Chaining::ANIMATION.to_owned(),
-                            effects.clone(),
-                        );
-                        commands.entity(entity).insert(fx_playback);
-                    }
                 }
             }