Fix knockback scaling with the amount of bullets from gun

hackerspace-ntnu · Jun 7, 2024 · 571c660 · 571c660
1 parent efef8b6
commit 571c660
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/Assets/Scripts/Augment/BulletModifiers/KnockbackOnShotModifier.cs b/Assets/Scripts/Augment/BulletModifiers/KnockbackOnShotModifier.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 public class KnockbackOnShotModifier : MonoBehaviour, ProjectileModifier
@@ -12,6 +13,8 @@ public class KnockbackOnShotModifier : MonoBehaviour, ProjectileModifier
 
     private float calculatedPushPower;
 
+    private (ProjectileState, List<HitboxController>) collidersHitWithShot;
+
     private void Awake()
     {
         gunController = transform.parent.GetComponent<GunController>();
@@ -33,7 +36,16 @@ public void Detach(ProjectileController projectile)
     private void KnockAwayTargets(HitboxController controller, ref ProjectileState state)
     {
         Vector3 normal = gunController.transform.forward;
+        if (collidersHitWithShot.Item1 == state && collidersHitWithShot.Item2.Contains(controller))
+            return;
+
+        if (collidersHitWithShot.Item1 != state)
+        {
+            collidersHitWithShot.Item2.Clear();
+            collidersHitWithShot.Item1 = state;
+        }
 
+        collidersHitWithShot.Item2.Add(controller);
         if (controller.health.TryGetComponent<Rigidbody>(out var rigidbody))
         {
             // If AI, enable physics for a small time frame

diff --git a/Assets/Scripts/Gamestate/PlayerManager.cs b/Assets/Scripts/Gamestate/PlayerManager.cs
@@ -191,8 +191,9 @@ private void OnDeath(HealthController healthController, float damage, DamageInfo
         {
             killer = lastPlayerThatHitMe;
         }
-        if (isAlive)
-            onDeath?.Invoke(killer, this, info);
+        if (!isAlive)
+            return;
+        onDeath?.Invoke(killer, this, info);
         isAlive = false;
         aimAssistCollider.SetActive(false);
         TurnIntoRagdoll(info);

diff --git a/Assets/Scripts/Interactables/ExplodingBarrel.cs b/Assets/Scripts/Interactables/ExplodingBarrel.cs
@@ -16,6 +16,8 @@ public class ExplodingBarrel : MonoBehaviour
 
     private HealthController healthController;
 
+    private bool isAlive = true;
+
     private void Start()
     {
         healthController = GetComponent<HealthController>();
@@ -30,11 +32,14 @@ private void OnDestroy()
 
     private void Explode(HealthController controller, float damage, DamageInfo info)
     {
+        if (!isAlive)
+            return;
         barrelMesh.enabled = false;
         GetComponentsInChildren<Collider>().ToList().ForEach(c => c.enabled = false);
         explosion.Explode(info.sourcePlayer);
         LeaveMark();
         Destroy(gameObject, 4);
+        isAlive = false;
     }
 
     private void LeaveMark()