New

MiraAPI/Utilities/Extensions.cs

@@ -4,7 +4,6 @@ using MiraAPI.Modifiers;
 using MiraAPI.Networking;
 using Reactor.Networking.Attributes;
 using Reactor.Utilities;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -13,7 +12,7 @@ namespace MiraAPI.Utilities;
 
 public static class Extensions
 {
-    public static bool IsStatic(this Type type)
+    public static bool IsStatic(this System.Type type)
     {
         return type is { IsClass: true, IsAbstract: true, IsSealed: true };
     }
@@ -158,18 +157,18 @@ public static class Extensions
         player.RpcAddModifier(id);
     }
 
-    public static Color DarkenColor(this Color color)
+    public static Color DarkenColor(this Color color, float amount = 0.45f)
     {
-        return new Color(color.r - 0.45f, color.g - 0.45f, color.b - 0.45f);
+        return new Color(color.r - amount, color.g - amount, color.b - amount);
     }
-    public static Color GetAlternateColor(this Color color)
+    public static Color GetAlternateColor(this Color color, float amount = 0.45f)
     {
-        return color.IsColorDark() ? LightenColor(color) : DarkenColor(color);
+        return color.IsColorDark() ? LightenColor(color, amount) : DarkenColor(color, amount);
     }
 
-    public static Color LightenColor(this Color color)
+    public static Color LightenColor(this Color color, float amount = 0.45f)
     {
-        return new Color(color.r + 0.45f, color.g + 0.45f, color.b + 0.45f);
+        return new Color(color.r + amount, color.g + amount, color.b + amount);
     }
 
     public static bool IsColorDark(this Color color)
@@ -177,24 +176,14 @@ public static class Extensions
         return color.r < 0.5f && color is { g: < 0.5f, b: < 0.5f };
     }
 
-    public static DeadBody? NearestDeadBody(this PlayerControl playerControl, float radius)
+    public static DeadBody? GetNearestDeadBody(this PlayerControl playerControl, float radius)
     {
-        var results = new Il2CppSystem.Collections.Generic.List<Collider2D>();
-        Physics2D.OverlapCircle(playerControl.GetTruePosition(), radius, Helpers.Filter, results);
-        return results.ToArray()
-            .Where(collider2D => collider2D.CompareTag("DeadBody"))
-            .Select(collider2D => collider2D.GetComponent<DeadBody>())
-            .FirstOrDefault(component => component && !component.Reported);
+        return Helpers.GetNearestDeadBodies(playerControl.GetTruePosition(), radius).FirstOrDefault(component => component && !component.Reported);
     }
 
-    public static T? GetNearestObjectOfType<T>(this PlayerControl playerControl, float radius, string? colliderTag = null, Func<T, bool>? predicate = null) where T : Component
+    public static T? GetNearestObjectOfType<T>(this PlayerControl playerControl, float radius, string? colliderTag = null, System.Func<T, bool>? predicate = null) where T : Component
     {
-        var results = new Il2CppSystem.Collections.Generic.List<Collider2D>();
-        Physics2D.OverlapCircle(playerControl.GetTruePosition(), radius, Helpers.Filter, results);
-        return results.ToArray()
-            .Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
-            .Select(collider2D => collider2D.GetComponent<T>())
-            .FirstOrDefault(predicate ?? (component => component));
+        return Helpers.GetNearestObjectsOfType<T>(playerControl.GetTruePosition(), radius, colliderTag).FirstOrDefault(predicate ?? (component => component));
     }
 
     public static PlayerControl? GetClosestPlayer(this PlayerControl playerControl, bool includeImpostors, float distance, bool ignoreColliders = false)

MiraAPI/Utilities/Helpers.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using TMPro;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace MiraAPI.Utilities;
 
@@ -15,6 +16,46 @@ public static class Helpers
         return ShipStatus.Instance.AllRooms.ToList().Find(room => room.roomArea.OverlapPoint(pos));
     }
 
+    public static List<DeadBody> GetNearestDeadBodies(Vector2 source, float radius)
+    {
+        var results = new Il2CppSystem.Collections.Generic.List<Collider2D>();
+        Physics2D.OverlapCircle(source, radius, Filter, results);
+        return results.ToArray()
+            .Where(collider2D => collider2D.CompareTag("DeadBody"))
+            .Select(collider2D => collider2D.GetComponent<DeadBody>()).ToList();
+    }
+
+    public static List<T> GetNearestObjectsOfType<T>(Vector2 source, float radius, string colliderTag = null) where T : Component
+    {
+        var results = new Il2CppSystem.Collections.Generic.List<Collider2D>();
+        Physics2D.OverlapCircle(source, radius, Filter, results);
+        return results.ToArray()
+            .Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
+            .Select(collider2D => collider2D.GetComponent<T>()).ToList();
+    }
+
+    public static List<PlayerControl> GetClosestPlayersInCircle(Vector2 source, float radius, bool ignoreColliders = true)
+    {
+        List<PlayerControl> newList = GetNearestObjectsOfType<PlayerControl>(source, radius);
+
+        if (ignoreColliders)
+        {
+            List<PlayerControl> filteredList = new List<PlayerControl>();
+            foreach (var player in newList)
+            {
+                Vector2 vector = player.GetTruePosition() - source;
+                float magnitude = vector.magnitude;
+                if (!PhysicsHelpers.AnyNonTriggersBetween(source, vector.normalized, magnitude, Constants.ShipAndObjectsMask))
+                {
+                    filteredList.Add(player);
+                }
+            }
+
+            return filteredList;
+        }
+
+        return newList;
+    }
     public static List<PlayerControl> GetClosestPlayers(PlayerControl source, float distance = 2f, bool ignoreColliders = true, bool ignoreSource = true)
     {
         if (!ShipStatus.Instance)