Refactor team and player type handling for units

Moved PlayerType enum to its own file in the Unit namespace and updated references accordingly. Improved collision logic for BasicRocket and BasicTankShell to use teamId for friendly fire checks. Updated GameScene to assign teamId to infantry units. Cleaned up unused usings and code in affected classes.

Author: EnesEfeTokta

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunition.cs

@@ -1,13 +1,12 @@
 using UnityEngine;
+using VehicleSystem.Vehicles;
 
 namespace AmmunitionSystem.Ammunitions
 {
     public class Ammunition : MonoBehaviour
     {
         public AmmunitionSystem.Ammunition ammunitionData;
-        public VehicleSystem.Vehicles.Vehicle ownerVehicle;
-        public virtual void SetRocket(Transform targetTransform)
-        {
-        }
+        public Vehicle ownerVehicle;
+        public virtual void SetRocket(Transform targetTransform) { }
     }
 }

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicBullet/BasicBullet.cs

@@ -1,6 +1,4 @@
 using UnityEngine;
-using VehicleSystem.Vehicles;
-using BuildingPlacement.Buildings;
 
 namespace AmmunitionSystem.Ammunitions.BasicBullet
 {
@@ -38,6 +36,5 @@ private void OnCollisionEnter(Collision collision)
 
             Destroy(gameObject);
         }
-
     }
 }

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicRocket/BasicRocket.cs

@@ -58,9 +58,16 @@ private void OnCollisionEnter(Collision collision)
             if (ownerVehicle != null && collision.gameObject == ownerVehicle.gameObject)
                 return;
 
-            if (collision.gameObject.CompareTag("Ammunition"))
+            var unit = collision.gameObject.GetComponent<Unit.Unit>();
+            if (unit == null)
                 return;
 
+            if (unit.teamId == ownerVehicle.teamId)
+                return;
+
+            Debug.Log($"Hit unit: {collision.gameObject.name}, Damage: {ammunitionData.damage}");
+            // unit.GetComponent<HealthSystem>()?.TakeDamage(ammunitionData.damage);
+
             hasExploded = true;
 
             if (explosionEffectPrefab != null)
@@ -69,12 +76,6 @@ private void OnCollisionEnter(Collision collision)
                 Destroy(explosionEffect, 2f);
             }
 
-            if (collision.gameObject.CompareTag("Enemy"))
-            {
-                Debug.Log($"Hit enemy: {collision.gameObject.name}, Damage: {ammunitionData.damage}");
-                // örn: collision.gameObject.GetComponent<Health>()?.TakeDamage(ammunitionData.damage);
-            }
-
             Destroy(gameObject);
         }
     }

Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicTankShell/BasicTankShell.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using BuildingPlacement.Buildings;
 
 namespace AmmunitionSystem.Ammunitions.Ammunitions.BasicTankShell
 {
@@ -27,9 +28,16 @@ private void OnCollisionEnter(Collision collision)
             if (ownerVehicle != null && collision.gameObject == ownerVehicle.gameObject)
                 return;
 
-            if (collision.gameObject.CompareTag("Ammunition"))
+            var unit = collision.gameObject.GetComponent<Unit.Unit>();
+            if (unit == null)
                 return;
 
+            if (unit.teamId == ownerVehicle.teamId)
+                return;
+
+            Debug.Log($"Hit unit: {collision.gameObject.name}, Damage: {ammunitionData.damage}");
+            // unit.GetComponent<HealthSystem>()?.TakeDamage(ammunitionData.damage);
+
             hasExploded = true;
 
             if (explosionEffectPrefab != null)
@@ -38,12 +46,6 @@ private void OnCollisionEnter(Collision collision)
                 Destroy(explosionEffect, 2f);
             }
 
-            if (collision.gameObject.CompareTag("Enemy"))
-            {
-                Debug.Log($"Hit enemy: {collision.gameObject.name}, Damage: {ammunitionData.damage}");
-                // örn: collision.gameObject.GetComponent<Health>()?.TakeDamage(ammunitionData.damage);
-            }
-
             Destroy(gameObject);
         }
     }

Red Strike/Assets/BuildingPlacement/Buildings/Building.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using Unit;
 
 namespace BuildingPlacement.Buildings
 {
@@ -36,10 +37,4 @@ private void OnCollisionEnter(Collision collision)
             Debug.Log($"Building {BuildingName} collided with unit: {collision.gameObject.name}");
         }
     }
-
-    public enum PlayerType
-    {
-        Red,
-        Blue
-    }
 }

Red Strike/Assets/Scenes/GameScene.unity

@@ -1056,6 +1056,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Infantry
       objectReference: {fileID: 0}
+    - target: {fileID: 3693194386570448113, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
+      propertyPath: teamId
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3693194386570448113, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
       propertyPath: targetObject
       value: 
@@ -1293,6 +1297,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Infantry (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 3693194386570448113, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
+      propertyPath: teamId
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 3693194386570448113, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
       propertyPath: targetObject
       value: 

Red Strike/Assets/Unit/PlayerType.cs

@@ -0,0 +1,8 @@
+namespace Unit
+{
+    public enum PlayerType
+    {
+        Red,
+        Blue
+    }
+}

Red Strike/Assets/Unit/PlayerType.cs.meta

@@ -1,4 +1,3 @@
-using BuildingPlacement.Buildings;
 using UnityEngine;
 
 namespace Unit
@@ -7,7 +6,6 @@ public class Unit : MonoBehaviour
     {
         [Header("Unit Info")]
         public int teamId;
-
         public PlayerType playerType;
     }
 }