From d99cbe3211237c353360903e55c9ca972796d4da Mon Sep 17 00:00:00 2001
From: Talon <talon@iamtalon.me>
Date: Thu, 15 Apr 2021 01:30:13 +0200
Subject: [PATCH] Add weapons and engine to environmental effects

---
 .../DesignTimeBuild/.dtbcache.v2              | Bin 63073 -> 63073 bytes
 .vs/EvilSatellites/v16/.suo                   | Bin 95744 -> 88576 bytes
 EvilSatellites/Objects/Player.cs              |   2 ++
 EvilSatellites/ScreenManager.cs               |   2 +-
 EvilSatellites/Weapons/LaserMG.cs             |  22 ++++++++++++++++--
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2 b/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2
index 5cf0ec0ad0f017401f44a0efe43f0703bb904839..eecd96be442a0e509756f0e04d69276a9489540b 100644
GIT binary patch
delta 77
zcmWN{u>pV}3<SV}g^)l3og=tHAfI_y#ZerAp4MKkzO}>JVP5A^XqZ{e(B6;=xJJoL
c-Y9}xF$Re_l0&1@-vv6DJ8DtNa?j`e01GD?L;wH)

delta 77
zcmV~$y8(b83<bb~g&^if=LoI<m^TlrIEo|C)7pEtc3L~l>vS}BaB&%86{8_cJZshp
a1Sm8(Bq(<;0(Cpg`EErA^`Ks!`F=n2=oy^=

diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo
index cefdcea02b1d48155a53d4db986f3c94958a668e..4cfe74567f3d88de80d0a2e1e3a8d68be563df20 100644
GIT binary patch
delta 4650
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
Tv}8?%Dc(3UskFt}0tN7Q>1I($

delta 4937
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
V`tt@TiYtnWl6a9XYd||)`%iL=9_;`C

diff --git a/EvilSatellites/Objects/Player.cs b/EvilSatellites/Objects/Player.cs
index 80dc3f7..4339136 100644
--- a/EvilSatellites/Objects/Player.cs
+++ b/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();
 
diff --git a/EvilSatellites/ScreenManager.cs b/EvilSatellites/ScreenManager.cs
index d1bd1e8..a84f726 100644
--- a/EvilSatellites/ScreenManager.cs
+++ b/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;
             
diff --git a/EvilSatellites/Weapons/LaserMG.cs b/EvilSatellites/Weapons/LaserMG.cs
index e1acebb..6096f64 100644
--- a/EvilSatellites/Weapons/LaserMG.cs
+++ b/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);
         }