Rebalanced and updated rotation

Greenfoot5 · Oct 11, 2023 · f29fafa · f29fafa
1 parent 8ade28a
commit f29fafa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/Tower Defence/Assets/Turrets/DynamicTurret.cs b/Tower Defence/Assets/Turrets/DynamicTurret.cs
@@ -183,11 +183,12 @@ private void UpdateTarget()
         /// </summary>
         protected void LookAtTarget()
         {
-            // Gets the rotation the turret need to end up at, and lerp each frame towards that
-            Vector2 aimDir = ((Vector2)target.position - (Vector2)transform.position).normalized;
-            Vector3 up = partToRotate.up;
-            Vector3 lookDir = Vector3.Lerp(up, aimDir, Time.deltaTime * rotationSpeed.GetStat());
-            partToRotate.rotation *= Quaternion.FromToRotation(up, lookDir);
+            Vector2 aimDir = (target.position - partToRotate.position).normalized;
+
+            float rotationAngleNeed = Vector2.SignedAngle(partToRotate.up, aimDir);
+            float zAngle = Mathf.Clamp(rotationAngleNeed, -rotationSpeed.GetStat() * Time.deltaTime,
+                rotationSpeed.GetStat() * Time.deltaTime);
+            partToRotate.Rotate(0f, 0f, zAngle);
         }
 
         /// <summary>

diff --git a/Tower Defence/Assets/Turrets/Gunner/Gunner_Turret.prefab b/Tower Defence/Assets/Turrets/Gunner/Gunner_Turret.prefab
@@ -384,7 +384,7 @@ MonoBehaviour:
     m_WaitForCompletion: 0
     m_LocalVariables: []
   damage:
-    stat: 60
+    stat: 70
     modifier: 1
   enemyTag: Enemy
   moduleHandlers: []
@@ -400,7 +400,7 @@ MonoBehaviour:
   aggressiveRetargeting: 0
   firePoint: {fileID: 1483480927}
   rotationSpeed:
-    stat: 8.5
+    stat: 85
     modifier: 1
   partToRotate: {fileID: 4656168879664339822}
   bulletPrefab: {fileID: 8554329261332597528, guid: 7918a479628b945539b9ed050eacb045, type: 3}

diff --git a/Tower Defence/Assets/Turrets/Laser/LaserBeamer.prefab b/Tower Defence/Assets/Turrets/Laser/LaserBeamer.prefab
@@ -5099,12 +5099,12 @@ MonoBehaviour:
     m_WaitForCompletion: 0
     m_LocalVariables: []
   damage:
-    stat: 130
+    stat: 200
     modifier: 1
   enemyTag: Enemy
   moduleHandlers: []
   range:
-    stat: 3
+    stat: 3.5
     modifier: 1
   rangeDisplay: {fileID: 3222738067758489047}
   fireRate:
@@ -5115,7 +5115,7 @@ MonoBehaviour:
   aggressiveRetargeting: 0
   firePoint: {fileID: 5009289029243488887}
   rotationSpeed:
-    stat: 4
+    stat: 70
     modifier: 1
   partToRotate: {fileID: 367774791884787270}
   lineRenderer: {fileID: 2486436700464072617}
@@ -5184,7 +5184,7 @@ LineRenderer:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.075
+        value: 0.1
         inSlope: 0
         outSlope: 0
         tangentMode: 0
@@ -5193,7 +5193,7 @@ LineRenderer:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 0.025
+        value: 0.05
         inSlope: 0
         outSlope: 0
         tangentMode: 0

diff --git a/Tower Defence/Assets/Turrets/Shooter/Shooter.prefab b/Tower Defence/Assets/Turrets/Shooter/Shooter.prefab
@@ -351,14 +351,14 @@ MonoBehaviour:
     modifier: 1
   rangeDisplay: {fileID: 1139687739}
   fireRate:
-    stat: 0.7
+    stat: 0.65
     modifier: 1
   fireCountdown: 0
   targetingMethod: 0
   aggressiveRetargeting: 0
   firePoint: {fileID: 1483480927}
   rotationSpeed:
-    stat: 7
+    stat: 70
     modifier: 1
   partToRotate: {fileID: 4656168879664339822}
   bulletPrefab: {fileID: 8554329261332597528, guid: 73df7aaa5f02848a59285b946c547b07, type: 3}