Fix infinite lazur ammo glitch

Turns out we haven't had the isFiring variable working properly for ages
hackerspace-ntnu · Feb 3, 2025 · 5c0552f · 5c0552f
1 parent 8acb19b
commit 5c0552f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim b/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim
@@ -2107,7 +2107,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1.3333334
+    m_StopTime: 1.3166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -11057,7 +11057,7 @@ AnimationClip:
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
-  - time: 1.3333334
+  - time: 1.3
     functionName: EndFiring
     data: 
     objectReferenceParameter: {fileID: 0}

diff --git a/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs b/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
@@ -53,7 +53,7 @@ protected override void Reload(GunStats stats)
 
         isReloadInProgress = true;
         animator.SetTrigger("Reload");
-        gunController.onReload?.Invoke(stats);
+        // gunController.onReload?.Invoke(stats);
     }
 
     public void TriggerSteam()

diff --git a/Assets/Scripts/Augment/GunController.cs b/Assets/Scripts/Augment/GunController.cs
@@ -155,6 +155,7 @@ private void FixedUpdate()
         }
         if (ShouldFire())
         {
+            isFiring = true;
             FireGun();
         }
     }
@@ -209,6 +210,7 @@ private void RpcFire(Quaternion rotation)
         }
         catch (Exception e)
         {
+            isFiring = false;
             Debug.LogError("Failed to fire gun!");
             Debug.LogError(e);
         }