try fix gun

hackerspace-ntnu · Jul 12, 2024 · 693662b · 693662b
1 parent 5806127
commit 693662b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Assets/Scripts/Augment/GunController.cs b/Assets/Scripts/Augment/GunController.cs
@@ -102,6 +102,12 @@ public void Initialize()
         localGunZOffset = transform.localPosition.z;
     }
 
+    public void Reset()
+    {
+        stats.Ammo = stats.MagazineSize;
+        isFiring = false;
+    }
+
     private void OnDestroy()
     {
         if (!barrelAnimator)

diff --git a/Assets/Scripts/Gamestate/PlayerManager.cs b/Assets/Scripts/Gamestate/PlayerManager.cs
@@ -221,7 +221,7 @@ protected void TurnIntoRagdoll(DamageInfo info)
         playerIK.enabled = false;
         // TODO display guns falling to the floor
         if (gunController)
-            gunController.gameObject.SetActive(false);
+            gunController.enabled = false;
         GunHolder.gameObject.SetActive(false);
 
         if (inputManager)
@@ -254,7 +254,11 @@ public virtual void Respawn(Transform spawnpoint)
         healthController.enabled = true;
         playerIK.enabled = true;
         if (gunController)
-            gunController.gameObject.SetActive(true);
+        {
+            gunController.enabled = false;
+            gunController.Reset();
+            gunController.Reload(1);
+        }
         GunHolder.gameObject.SetActive(true);
 
         if (inputManager)
@@ -285,8 +289,6 @@ public virtual void Respawn(Transform spawnpoint)
 
         hudController.DisplayHUD();
 
-        SetPlayerInput(inputManager);
-
         StartCoroutine(SetTransformAfterRespawn(spawnpoint));
     }