refactor interactables

fixed no animation when interacting with a opened chest
fixed looking for interactables first and then looking for pickupables
fixed looking only for a single interactable/pickupable

Assets/_Game/Code/Interactables/Chests/Chest.cs

@@ -22,11 +22,8 @@ public class Chest : NetworkBehaviour, IInteractable
     [ServerRpc(RequireOwnership = false)]
     [ServerRpc(RequireOwnership = false)]
     private void ChestFoundServerRpc()
     private void ChestFoundServerRpc()
     {
     {
-        if (!_chestFound.Value)
-        {
-            ChestFoundClientRpc();
-            _chestFound.Value = true;
-        }
+        ChestFoundClientRpc();
+        _chestFound.Value = true;
     }
     }
 
 
     [ClientRpc]
     [ClientRpc]
@@ -38,8 +35,14 @@ public class Chest : NetworkBehaviour, IInteractable
     }
     }
 
 
 
 
-    public void Interact()
+    public bool Interact()
     {
     {
+        if (_chestFound.Value)
+        {
+            return false;
+        }
+
         ChestFoundServerRpc();
         ChestFoundServerRpc();
+        return true;
     }
     }
 }
 }
\ No newline at end of file

Assets/_Game/Code/Interactables/Doors/Door.cs

@@ -34,9 +34,10 @@ public class Door : NetworkBehaviour, IInteractable
             .SetEase(Ease.OutBounce);
             .SetEase(Ease.OutBounce);
     }
     }
 
 
-    public void Interact()
+    public bool Interact()
     {
     {
         RequestOpenDoorServerRpc();
         RequestOpenDoorServerRpc();
+        return true;
     }
     }
 
 
     [ServerRpc(RequireOwnership = false)]
     [ServerRpc(RequireOwnership = false)]

Assets/_Game/Code/Interactables/IInteractable.cs

@@ -2,5 +2,5 @@ using UnityEngine;
 
 
 public interface IInteractable
 public interface IInteractable
 {
 {
-    public void Interact();
+    public bool Interact();
 }
 }
\ No newline at end of file

Assets/_Game/Code/Player/PlayerController.cs

@@ -334,41 +334,43 @@ public class PlayerController : NetworkBehaviour
 
 
     private void CheckForPickupableAndInteractableCollision()
     private void CheckForPickupableAndInteractableCollision()
     {
     {
-        CheckForInteractableCollision();
+        if (CheckForInteractableCollision()) return;
         CheckForPickupables();
         CheckForPickupables();
     }
     }
 
 
-    private void CheckForInteractableCollision()
+
+    private bool CheckForInteractableCollision()
     {
     {
-        Collider[] hitColliders = Physics.OverlapSphere(transform.position,
+        Collider closestCollider = FindClosestCollider(transform.position,
             playerInteractionSettings.interactableRadius,
             playerInteractionSettings.interactableRadius,
             playerInteractionSettings.interactableLayer);
             playerInteractionSettings.interactableLayer);
-        foreach (var hitCollider in hitColliders)
+
+        if (closestCollider != null)
         {
         {
-            switch (hitCollider.GetComponent<IInteractable>())
+            var interactable = closestCollider.GetComponent<IInteractable>();
+            if (interactable != null)
             {
             {
-                case Chest chest:
-                    RotatePlayerTowardsTarget(hitCollider);
-                    _playerManager.playerEvents.PlayerInteract();
-                    chest.Interact();
-                    break;
-                case Door door:
-                    RotatePlayerTowardsTarget(hitCollider);
+                RotatePlayerTowardsTarget(closestCollider);
+                if (interactable.Interact())
+                {
                     _playerManager.playerEvents.PlayerInteract();
                     _playerManager.playerEvents.PlayerInteract();
-                    door.Interact();
-                    break;
+                    return true;
+                }
             }
             }
         }
         }
+
+        return false;
     }
     }
 
 
     private void CheckForPickupables()
     private void CheckForPickupables()
     {
     {
-        Collider[] hitColliders = Physics.OverlapSphere(transform.position,
+        Collider closestCollider = FindClosestCollider(transform.position,
             playerInteractionSettings.interactableRadius,
             playerInteractionSettings.interactableRadius,
             playerInteractionSettings.pickupableLayer);
             playerInteractionSettings.pickupableLayer);
-        foreach (var hitCollider in hitColliders)
+
+        if (closestCollider != null)
         {
         {
-            switch (hitCollider.GetComponent<Pickupable>())
+            switch (closestCollider.GetComponent<Pickupable>())
             {
             {
                 case Key key:
                 case Key key:
                     PickupObject(key);
                     PickupObject(key);
@@ -382,7 +384,6 @@ public class PlayerController : NetworkBehaviour
 
 
     private void PickupObject(Pickupable pickupable)
     private void PickupObject(Pickupable pickupable)
     {
     {
-        // if (!isRightHandFull)
         if (!_playerPlacements.IsRightHandFull())
         if (!_playerPlacements.IsRightHandFull())
         {
         {
             pickupable.RequestPickupObject(
             pickupable.RequestPickupObject(
@@ -393,16 +394,6 @@ public class PlayerController : NetworkBehaviour
             pickupable.RequestPutDownObject(
             pickupable.RequestPutDownObject(
                 new NetworkObjectReference(gameObject.GetComponent<NetworkObject>()));
                 new NetworkObjectReference(gameObject.GetComponent<NetworkObject>()));
         }
         }
-
-
-        //TODO: boolean should be set to true only if the object was picked up
-        //     isRightHandFull = !isRightHandFull;
-        // }
-        // else
-        // {
-        //     pickupable.RequestPutDownObject(transform.position + transform.forward);
-        //     isRightHandFull = !isRightHandFull;
-        // }
     }
     }
 
 
     private void CheckForWeapons()
     private void CheckForWeapons()
@@ -412,35 +403,19 @@ public class PlayerController : NetworkBehaviour
 
 
     private void HitObject(float weaponHitDamage)
     private void HitObject(float weaponHitDamage)
     {
     {
-        Collider[] hitColliders = Physics.OverlapSphere(transform.position,
+        Collider closestCollider = FindClosestCollider(transform.position,
             playerInteractionSettings.interactableRadius,
             playerInteractionSettings.interactableRadius,
             playerInteractionSettings.destructableLayer);
             playerInteractionSettings.destructableLayer);
 
 
-        if (hitColliders.Length > 0)
+        if (closestCollider != null)
         {
         {
-            Collider closestCollider = null;
-            float closestDistance = float.MaxValue;
-
-            foreach (var hitCollider in hitColliders)
-            {
-                float distance = Vector3.Distance(transform.position, hitCollider.transform.position);
-                if (distance < closestDistance)
-                {
-                    closestDistance = distance;
-                    closestCollider = hitCollider;
-                }
-            }
-
-            if (closestCollider != null)
+            switch (closestCollider.GetComponent<IDestrucable>())
             {
             {
-                switch (closestCollider.GetComponent<IDestrucable>())
-                {
-                    case Barrel barrel:
-                        RotatePlayerTowardsTarget(closestCollider);
-                        _playerManager.playerEvents.PlayerAttack();
-                        barrel.TakeDamage(weaponHitDamage);
-                        break;
-                }
+                case Barrel barrel:
+                    RotatePlayerTowardsTarget(closestCollider);
+                    _playerManager.playerEvents.PlayerAttack();
+                    barrel.TakeDamage(weaponHitDamage);
+                    break;
             }
             }
         }
         }
         else
         else
@@ -449,6 +424,25 @@ public class PlayerController : NetworkBehaviour
         }
         }
     }
     }
 
 
+    private Collider FindClosestCollider(Vector3 position, float radius, LayerMask layerMask)
+    {
+        Collider[] hitColliders = Physics.OverlapSphere(position, radius, layerMask);
+        Collider closestCollider = null;
+        float closestDistance = float.MaxValue;
+
+        foreach (var hitCollider in hitColliders)
+        {
+            float distance = Vector3.Distance(position, hitCollider.transform.position);
+            if (distance < closestDistance)
+            {
+                closestDistance = distance;
+                closestCollider = hitCollider;
+            }
+        }
+
+        return closestCollider;
+    }
+
     private void RotatePlayerTowardsTarget(Collider hit)
     private void RotatePlayerTowardsTarget(Collider hit)
     {
     {
         Vector3 direction = (hit.transform.position - transform.position).normalized;
         Vector3 direction = (hit.transform.position - transform.position).normalized;