Fix training mode weapon switching (WIP)

Assets/PinAnimator.cs

@@ -1,4 +1,4 @@
-using CollectionExtensions;
+using System.Linq.Expressions;
 using UnityEngine;
 
 public class PinAnimator : AugmentAnimator
@@ -31,6 +31,8 @@ public override void OnReload(GunStats stats) { }
 
     public override void OnFire(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         if (playAudio)
             PlayCockingSound();
         transform.localPosition = Vector3.zero;

Assets/Scripts/Augment/AugmentImplementations/AugmentAnimator.cs

@@ -13,4 +13,20 @@ public abstract class AugmentAnimator : MonoBehaviour
     public abstract void OnInitialize(GunStats stats);
     public abstract void OnReload(GunStats stats);
     public abstract void OnFire(GunStats stats);
+
+    protected bool DoWeNeedToEscape()
+    {
+        try
+        {
+            if (!gameObject)
+            {
+                return true;
+            }
+        }
+        catch (System.NullReferenceException)
+        {
+            return true;
+        }
+        return false;
+    }
 }

Assets/Scripts/Augment/AugmentImplementations/BarrelFiringAnimator.cs

@@ -19,6 +19,8 @@ public override void OnReload(GunStats stats)
 
     public override void OnFire(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         animator.SetTrigger("Fire");
         // TODO wait for firing animation to end
         OnShotFiredAnimation?.Invoke();

Assets/Scripts/Augment/AugmentImplementations/CoilFiringAnimator.cs

@@ -16,6 +16,8 @@ public override void OnReload(GunStats stats)
 
     public override void OnFire(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         animator.SetTrigger("Fire");
     }
 

Assets/Scripts/Augment/AugmentImplementations/DDRBodyAnimator.cs

@@ -7,6 +7,8 @@ public class DDRBodyAnimator : AugmentAnimator
     private Animator animator;
     public override void OnFire(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         animator.SetTrigger("Vibrate");
     }
 
@@ -19,6 +21,8 @@ public override void OnInitialize(GunStats stats)
 
     public override void OnReload(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         animator.SetTrigger("Vibrate");
     }
 }

Assets/Scripts/Augment/AugmentImplementations/MowerAnimator.cs

@@ -15,6 +15,8 @@ public class MowerAnimator : AugmentAnimator
 
     public override void OnFire(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         animator.SetTrigger("PistonPump");
         handAnimator.SetTrigger("Pull");
     }
@@ -26,6 +28,8 @@ public override void OnInitialize(GunStats stats)
 
     public override void OnReload(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         exhaustParticles.Play();
     }
 }

Assets/Scripts/Augment/AugmentImplementations/PlaceholderFiringAnimator.cs

@@ -7,6 +7,8 @@ public override void OnReload(GunStats stats) { }
 
     public override void OnFire(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         OnShotFiredAnimation?.Invoke();
         OnAnimationEnd?.Invoke();
     }

Assets/Scripts/Augment/AugmentImplementations/RevolverAnimator.cs

@@ -12,7 +12,7 @@ public class RevolverAnimator : AugmentAnimator
     private GunBarrel barrel;
     private GunExtension extension;
 
-    public override void OnFire(GunStats stats){}
+    public override void OnFire(GunStats stats) { }
 
     public override void OnInitialize(GunStats stats)
     {
@@ -27,6 +27,8 @@ public override void OnInitialize(GunStats stats)
 
     public override void OnReload(GunStats stats)
     {
+        if (DoWeNeedToEscape())
+            return;
         canReload = !canReload;
         if (!canReload)
             return;

Assets/Scripts/Augment/GunController.cs

@@ -114,6 +114,22 @@ private void OnDestroy()
             MatchController.Singleton.onRoundEnd -= CancelZoom;
     }
 
+    // TODO check if this works and possibly remove
+    public void RemoveListeners()
+    {
+        onFireStart = null;
+        onFire = null;
+        onFireEnd = null;
+        onFireNoAmmo = null;
+        if (!barrelAnimator)
+            return;
+
+        if (HasRecoil)
+            barrelAnimator.OnShotFiredAnimation -= PlayRecoil;
+        barrelAnimator.OnShotFiredAnimation -= ShotFired;
+        barrelAnimator.OnAnimationEnd -= FireEnd;
+    }
+
     private bool ShouldFire() => !isFiring && fireRateController.shouldFire(triggerPressed, triggerHeld);
 
     [Client]

Assets/Scripts/Augment/GunFactory.cs

@@ -32,6 +32,7 @@ public static GameObject InstantiateGun(Item bodyPrefab, Item barrelPrefab, Item
 
         var firstPersonGunController = gun.GetComponent<GunFactory>().GunController;
         var gunAnimations = displayGun.GetComponentsInChildren<AugmentAnimator>(includeInactive: true);
+        // TODO THESE ARE NEVER UNSUBSCRIBED RIGHT?
         foreach (var animation in gunAnimations)
         {
             animation.OnInitialize(firstPersonGunController.stats);

Assets/Scripts/Gamestate/PlayerManager.cs

@@ -462,11 +462,20 @@ public void RemoveGun()
         {
             Destroy(gunController.transform.GetChild(i).gameObject);
         }
+        // gunController.RemoveListeners();
+        var gunAnimations = GunOrigin.GetComponentsInChildren<AugmentAnimator>(includeInactive: true);
+        // Unsubscribe animations (very important)
+        foreach (var animation in gunAnimations)
+        {
+            gunController.onFireStart -= animation.OnFire;
+            gunController.onReload -= animation.OnReload;
+        }
         Destroy(gunController.gameObject);
         for (int i = GunOrigin.transform.childCount - 1; i >= 0; i--)
         {
             Destroy(GunOrigin.transform.GetChild(i).gameObject);
         }
+        // GunOrigin.GetComponent<GunController>().RemoveListeners();
     }
 
     protected void SetLayerOnSubtree(GameObject node, int layer)

Assets/Scripts/Interactables/TrainingModeAugmentPlacer.cs

@@ -15,9 +15,7 @@ public class TrainingModeAugmentPlacer : MonoBehaviour
 
     private void Start()
     {
-#if UNITY_EDITOR 
         SpawnAugments();
-#endif
     }
 
     private void SpawnAugments()

Assets/SodiePopper.cs

@@ -50,8 +50,10 @@ public class SodiePopper : GunBody
     private float lastPlayerDiff = 0f;
 
     private AudioSource audioSource;
+
     [SerializeField]
     private AudioGroup slosh;
+
     public override void Start()
     {
         gunController = transform.parent?.GetComponent<GunController>();
@@ -101,7 +103,7 @@ private void FixedUpdate()
                 lastReload = Time.fixedTime;
                 if (gunController && gunController.stats.Magazine != gunController.stats.Ammo)
                     slosh.Play(audioSource);
-                    
+
                 gunController?.Reload(reload_ammount);
             }
             lastPos = meassurementPoint.position + diff.normalized * offsetMagnitude;