Add weapons and engine to environmental effects

EvilSatellites/Objects/Player.cs

@@ -37,6 +37,8 @@ namespace EvilSatellites.Objects
             sfxWhine = Screen.Manager.Sound.Load(@"sfx/engine/int/engineWhine.wav", false);
             sfxEngine.Loop = true;
             sfxWhine.Loop = true;
+            sfxEngine.ConnectToEffect(Screen.Manager.EnvironmentEffect);
+            sfxWhine.ConnectToEffect(Screen.Manager.EnvironmentEffect);
             sfxEngine.Play();
             sfxWhine.Play();
 

EvilSatellites/ScreenManager.cs

@@ -26,7 +26,7 @@ namespace EvilSatellites
             EnvironmentEffect = Sound.CreateReverb();
             EnvironmentEffect.Delay = 0.03;
             EnvironmentEffect.Wet = 30;
-            EnvironmentEffect.T60 = 3.3;
+            EnvironmentEffect.T60 = 5;
             EnvironmentEffect.Defusion = 1;
             EnvironmentEffect.FreePath = 0.22;
             

EvilSatellites/Weapons/LaserMG.cs

@@ -37,10 +37,19 @@ namespace EvilSatellites.Weapons
             sfxSpinning = Screen.Manager.Sound.Load(@"sfx/weapons/LaserMG/spinning.wav", false);
             sfxSpinning.Loop = true;
             sfxShoot = new AudioAsset(Screen.Manager.Sound, @"sfx/weapons/LaserMG/fire", 1, 4);
+            sfxReload.ConnectToEffect(Screen.Manager.EnvironmentEffect);
+            sfxShoot.AddEffect(Screen.Manager.EnvironmentEffect);
+            sfxSpindown.ConnectToEffect(Screen.Manager.EnvironmentEffect);
+            sfxSpinup.ConnectToEffect(Screen.Manager.EnvironmentEffect);
+            sfxSpinning.ConnectToEffect(Screen.Manager.EnvironmentEffect);
         }
 
         public override void Shoot(GameTime time)
         {
+            if (State != WeaponState.Stopped)
+            {
+                return;
+            }
             State = WeaponState.Starting;
             sfxSpinup.Reset();
             sfxSpinup.Play();
@@ -49,12 +58,13 @@ namespace EvilSatellites.Weapons
 
         public override void Stop()
         {
-            if (State == WeaponState.Firing)
+            if (State != WeaponState.Stopped)
             {
                 sfxSpinning.Pause();
+                sfxSpinup.Pause();
                 sfxSpindown.Reset();
                 sfxSpindown.Play();
-                State = WeaponState.Stopped;
+                State = WeaponState.Stopping;
             }
         }
 
@@ -80,6 +90,14 @@ namespace EvilSatellites.Weapons
                     Screen.AddObject(proj);
                 }
             }
+            if (State == WeaponState.Stopping)
+            {
+                if (TimerEnd - TimerStart > 500)
+                {
+                    State = WeaponState.Stopped;
+                    TimerStart = TimerEnd;
+                }
+            }
             base.Update(time);
         }