From 3650c4b8420d16680cd47254eeb4ccf6461f607e Mon Sep 17 00:00:00 2001
From: Tore Bergebakken <tore.bergebakken@gmail.com>
Date: Tue, 25 Jun 2024 22:59:53 +0200
Subject: [PATCH] wip fix reload buggerino

---
 .../Animation/Augments/Lazur/Cannon_CannonAction.anim  |  9 ++++++++-
 Assets/Animation/Augments/Lazur/Lazur.controller       | 10 +++++-----
 Assets/LazurFiringAnimator.cs                          | 10 ++++++++--
 Assets/Models/GunParts/CoilBarrel.fbx.meta             |  6 +++---
 .../Scripts/Augment/AugmentImplementations/Revolver.cs |  1 -
 Assets/Scripts/Augment/GunController.cs                |  2 +-
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim b/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim
index 5ebfa5d23..7f8844f8d 100644
--- 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.3166667
+    m_StopTime: 1.3333334
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -11057,3 +11057,10 @@ AnimationClip:
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
+  - time: 1.3333334
+    functionName: EndFiring
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
diff --git a/Assets/Animation/Augments/Lazur/Lazur.controller b/Assets/Animation/Augments/Lazur/Lazur.controller
index d930fe752..c479a0d95 100644
--- a/Assets/Animation/Augments/Lazur/Lazur.controller
+++ b/Assets/Animation/Augments/Lazur/Lazur.controller
@@ -167,31 +167,31 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Outer
     m_Type: 1
     m_DefaultFloat: 0.2
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Inner
     m_Type: 1
     m_DefaultFloat: -0.3
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Spinner
     m_Type: 1
     m_DefaultFloat: 3
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Spiral
     m_Type: 1
     m_DefaultFloat: -0.25
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
diff --git a/Assets/LazurFiringAnimator.cs b/Assets/LazurFiringAnimator.cs
index f5767444d..123eca480 100644
--- a/Assets/LazurFiringAnimator.cs
+++ b/Assets/LazurFiringAnimator.cs
@@ -24,8 +24,14 @@ public void PlayChargeUpSound()
 
     public void ShootLazer()
     {
-        this.OnShotFiredAnimation?.Invoke();
-        this.OnAnimationEnd?.Invoke();
+        Debug.Log("SHOOP DA WOOP");
+        OnShotFiredAnimation?.Invoke();
+    }
+
+    public void EndFiring()
+    {
+        Debug.Log("SHOOP DONE");
+        OnAnimationEnd?.Invoke();
     }
 
     public override void OnFire(GunStats stats)
diff --git a/Assets/Models/GunParts/CoilBarrel.fbx.meta b/Assets/Models/GunParts/CoilBarrel.fbx.meta
index 7c96d9f77..7b5e9d590 100644
--- a/Assets/Models/GunParts/CoilBarrel.fbx.meta
+++ b/Assets/Models/GunParts/CoilBarrel.fbx.meta
@@ -19,8 +19,8 @@ ModelImporter:
     rigImportErrors: 
     rigImportWarnings: 
     animationImportErrors: 
-    animationImportWarnings: Event End has a time (2.079312) outside the clip's valid
-      range (0.000000..2.000000). It will never be fired
+    animationImportWarnings: Event AnimationEnd has a time (2.079312) outside the
+      clip's valid range (0.000000..2.000000). It will never be fired
     animationRetargetingWarnings: 
     animationDoRetargetingWarnings: 0
     importAnimatedCustomProperties: 0
@@ -122,7 +122,7 @@ ModelImporter:
         floatParameter: 0
         intParameter: 3
         messageOptions: 0
-      - time: 0.9980697
+      - time: 1
         functionName: AnimationEnd
         data: 
         objectReferenceParameter: {instanceID: 0}
diff --git a/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs b/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
index b3654c3f0..f7e8a91f4 100644
--- a/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
+++ b/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
@@ -51,7 +51,6 @@ protected override void Reload(GunStats stats)
             extension.transform.SetParent(attachmentSite, true);
 
         animator.SetTrigger("Reload");
-        gunController.onReload?.Invoke(stats);
     }
 
     public void TriggerSteam()
diff --git a/Assets/Scripts/Augment/GunController.cs b/Assets/Scripts/Augment/GunController.cs
index 94d578267..22b5c750f 100644
--- a/Assets/Scripts/Augment/GunController.cs
+++ b/Assets/Scripts/Augment/GunController.cs
@@ -194,7 +194,7 @@ private void RpcFireWithNoAmmo()
 
     private void FireGun()
     {
-        if (stats.Ammo <= 0)
+        if (stats.Ammo < 1)
         {
             CmdFireWithNoAmmo();
             return;