If a turret has a greater fire rate than it should, reset it

Greenfoot5 · Nov 18, 2024 · 92c62c3 · 92c62c3
1 parent 56fcfbd
commit 92c62c3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/Tower Defence/Assets/Turrets/Choker/Choker.cs b/Tower Defence/Assets/Turrets/Choker/Choker.cs
@@ -26,19 +26,14 @@ public class Choker : DynamicTurret
         /// Rotates towards the target if the turret have one.
         /// Shoots if the turret is looking towards the target
         /// </summary>
-        private void Update()
+        private new void Update()
         {
-            // If there's no fire rate, the turret shouldn't do anything
-            if (fireRate.GetStat() == 0)
-            {
-                return;
-            }
+            base.Update();
 
             // Don't do anything if the turret doesn't have a target
             if (Target is null)
             {
                 fireCountdown -= Time.deltaTime;
-                return;
             }
 
             // Rotates the turret each frame

diff --git a/Tower Defence/Assets/Turrets/Gunner/Gunner.cs b/Tower Defence/Assets/Turrets/Gunner/Gunner.cs
@@ -36,6 +36,11 @@ public class Gunner : DynamicTurret
         /// </summary>
         private void Update()
         {
+            if (fireCountdown > fireRate.GetStat())
+            {
+                fireCountdown = 1 / fireRate.GetStat();
+            }
+
             // If there's no fire rate, the turret shouldn't do anything
             // However, it should rapidly cool down
             if (fireRate.GetStat() == 0)

diff --git a/Tower Defence/Assets/Turrets/Lancer/Lancer.cs b/Tower Defence/Assets/Turrets/Lancer/Lancer.cs
@@ -88,11 +88,7 @@ private bool HasATarget()
         /// </summary>
         private void Update()
         {
-            // If there's no fire rate, the turret shouldn't do anything
-            if (fireRate.GetStat() == 0)
-            {
-                return;
-            }
+            base.Update();
 
             // Don't do anything if no enemy is in range
             if (!HasATarget())

diff --git a/Tower Defence/Assets/Turrets/Shooter/Shooter.cs b/Tower Defence/Assets/Turrets/Shooter/Shooter.cs
@@ -23,11 +23,7 @@ public class Shooter : DynamicTurret
         /// </summary>
         private void Update()
         {
-            // If there's no fire rate, the turret shouldn't do anything
-            if (fireRate.GetStat() == 0)
-            {
-                return;
-            }
+            base.Update();
 
             // Don't do anything if the turret doesn't have a target
             if (Target is null)

diff --git a/Tower Defence/Assets/Turrets/Smasher/Smasher.cs b/Tower Defence/Assets/Turrets/Smasher/Smasher.cs
@@ -19,11 +19,7 @@ public class Smasher : Turret
         /// </summary>
         private void Update()
         {
-            // If there's no fire rate, the turret shouldn't do anything
-            if (fireRate.GetStat() == 0)
-            {
-                return;
-            }
+            base.Update();
 
             // Don't do anything if no enemy is in range
             Collider2D[] results = Physics2D.OverlapCircleAll(transform.position, range.GetStat());

diff --git a/Tower Defence/Assets/Turrets/Turret.cs b/Tower Defence/Assets/Turrets/Turret.cs
@@ -24,6 +24,20 @@ private void Awake()
         {
             rangeDisplay.SetActive(false);
         }
+
+        protected void Update()
+        {
+            // If there's no fire rate, the turret shouldn't do anything
+            if (fireRate.GetStat() == 0)
+            {
+                return;
+            }
+
+            if (fireCountdown > fireRate.GetStat())
+            {
+                fireCountdown = 1 / fireRate.GetStat();
+            }
+        }
 
         /// <summary>
         /// Update the range shader's size