From b9198b96392bbaae258de26c2aac8afe02fcdf2f Mon Sep 17 00:00:00 2001 From: Gurge44 Date: Wed, 11 Feb 2026 10:09:42 +0100 Subject: [PATCH] Finish FastVector2 Optimization --- Gamemodes/BedWars.cs | 1 - Gamemodes/CaptureTheFlag.cs | 1 - Gamemodes/Deathrace.cs | 1 - Gamemodes/HotPotato.cs | 1 - Gamemodes/NaturalDisasters.cs | 1 - Gamemodes/Snowdown.cs | 1 - Modules/AFKDetector.cs | 1 - Modules/CustomRpcSender.cs | 1 - Modules/DisableDevice.cs | 1 - Modules/EAC.cs | 1 - Modules/ExtendedPlayerControl.cs | 1 - Modules/Extensions/FastVector2.cs | 35 +++++++++++++++++-- Patches/IntroPatch.cs | 1 - Patches/LadderPatch.cs | 1 - Patches/PetActionsPatch.cs | 4 +-- Patches/PlayerControlPatch.cs | 5 ++- Patches/SabotageSystemPatch.cs | 1 - Roles/Standard/Addons/Common/Dynamo.cs | 1 - Roles/Standard/Addons/Common/Sleep.cs | 1 - Roles/Standard/Addons/Common/Sonar.cs | 1 - Roles/Standard/Addons/Common/Spurt.cs | 1 - Roles/Standard/Coven/Banshee.cs | 1 - Roles/Standard/Coven/Dreamweaver.cs | 2 -- Roles/Standard/Coven/Empress.cs | 1 - Roles/Standard/Coven/Summoner.cs | 1 - Roles/Standard/Crewmate/Chaos/Car.cs | 1 - Roles/Standard/Crewmate/Chaos/Dad.cs | 1 - Roles/Standard/Crewmate/Chaos/ToiletMaster.cs | 1 - Roles/Standard/Crewmate/Chaos/Tree.cs | 1 - Roles/Standard/Crewmate/Investigate/Leery.cs | 2 -- Roles/Standard/Crewmate/Investigate/Sentry.cs | 1 - .../Crewmate/Investigate/Whisperer.cs | 8 +---- .../Crewmate/Miscellaneous/CameraMan.cs | 1 - .../Crewmate/Miscellaneous/PortalMaker.cs | 1 - .../Crewmate/Miscellaneous/SuperStar.cs | 5 ++- .../Crewmate/Miscellaneous/Transmitter.cs | 6 ++-- Roles/Standard/Crewmate/Power/Adventurer.cs | 6 ++-- Roles/Standard/Crewmate/Power/Astral.cs | 3 +- Roles/Standard/Crewmate/Support/Autocrat.cs | 6 ++-- Roles/Standard/Crewmate/Support/Beacon.cs | 1 - Roles/Standard/Crewmate/Support/Bodyguard.cs | 3 +- Roles/Standard/Crewmate/Support/Gardener.cs | 1 - Roles/Standard/Crewmate/Support/TimeMaster.cs | 1 - Roles/Standard/Ghost/Bloodmoon.cs | 1 - .../Standard/Impostor/Concealing/Ambusher.cs | 8 +---- .../Standard/Impostor/Concealing/Lightning.cs | 3 +- .../Standard/Impostor/Concealing/RiftMaker.cs | 3 +- .../Standard/Impostor/Concealing/Scavenger.cs | 2 +- Roles/Standard/Impostor/Concealing/Stealth.cs | 1 - Roles/Standard/Impostor/Concealing/Venerer.cs | 1 - .../Standard/Impostor/Killing/Abyssbringer.cs | 5 +-- Roles/Standard/Impostor/Killing/Bomber.cs | 7 +--- Roles/Standard/Impostor/Killing/Fireworker.cs | 3 +- Roles/Standard/Impostor/Killing/Psychopath.cs | 5 +-- Roles/Standard/Impostor/Killing/Sapper.cs | 1 - Roles/Standard/Impostor/Killing/Witch.cs | 5 +-- Roles/Standard/Impostor/Madmate/Crewpostor.cs | 7 +--- .../Impostor/Miscellaneous/AntiAdminer.cs | 1 - Roles/Standard/Impostor/Support/Librarian.cs | 3 +- Roles/Standard/Impostor/Support/Silencer.cs | 5 +-- Roles/Standard/Impostor/Support/YinYanger.cs | 33 +++++++---------- .../Standard/Neutral/Benign/Revolutionist.cs | 3 +- Roles/Standard/Neutral/Evil/Arsonist.cs | 3 +- Roles/Standard/Neutral/Killing/Bargainer.cs | 1 - Roles/Standard/Neutral/Killing/Beehive.cs | 1 - Roles/Standard/Neutral/Killing/Bubble.cs | 3 +- Roles/Standard/Neutral/Killing/Chemist.cs | 1 - Roles/Standard/Neutral/Killing/Explosivist.cs | 1 - Roles/Standard/Neutral/Killing/Infection.cs | 3 +- Roles/Standard/Neutral/Killing/Magician.cs | 4 +-- Roles/Standard/Neutral/Killing/Mycologist.cs | 1 - Roles/Standard/Neutral/Killing/Pelican.cs | 3 +- Roles/Standard/Neutral/Killing/Rogue.cs | 1 - Roles/Standard/Neutral/Killing/Samurai.cs | 2 +- .../Standard/Neutral/Killing/Sharpshooter.cs | 5 +-- Roles/Standard/Neutral/Killing/Slenderman.cs | 2 +- Roles/Standard/Neutral/Killing/Spider.cs | 1 - Roles/Standard/Neutral/Killing/Sprayer.cs | 1 - Roles/Standard/Neutral/Killing/Tiger.cs | 8 ++--- Roles/Standard/Neutral/Killing/Tremor.cs | 14 ++++---- .../Standard/Neutral/Killing/WeaponMaster.cs | 2 +- 81 files changed, 91 insertions(+), 179 deletions(-) diff --git a/Gamemodes/BedWars.cs b/Gamemodes/BedWars.cs index 5bbf1e75e..3b038ac58 100644 --- a/Gamemodes/BedWars.cs +++ b/Gamemodes/BedWars.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using Hazel; using UnityEngine; diff --git a/Gamemodes/CaptureTheFlag.cs b/Gamemodes/CaptureTheFlag.cs index c09ed1c8c..93b5ae128 100644 --- a/Gamemodes/CaptureTheFlag.cs +++ b/Gamemodes/CaptureTheFlag.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using Hazel; using UnityEngine; diff --git a/Gamemodes/Deathrace.cs b/Gamemodes/Deathrace.cs index 392b659df..2c1a063c7 100644 --- a/Gamemodes/Deathrace.cs +++ b/Gamemodes/Deathrace.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using UnityEngine; diff --git a/Gamemodes/HotPotato.cs b/Gamemodes/HotPotato.cs index 8f0638cfb..629ff7b41 100644 --- a/Gamemodes/HotPotato.cs +++ b/Gamemodes/HotPotato.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; diff --git a/Gamemodes/NaturalDisasters.cs b/Gamemodes/NaturalDisasters.cs index 619fa60e3..d928bcd13 100644 --- a/Gamemodes/NaturalDisasters.cs +++ b/Gamemodes/NaturalDisasters.cs @@ -4,7 +4,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using HarmonyLib; using UnityEngine; diff --git a/Gamemodes/Snowdown.cs b/Gamemodes/Snowdown.cs index 0463a275a..fe228112f 100644 --- a/Gamemodes/Snowdown.cs +++ b/Gamemodes/Snowdown.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using EHR.Modules.Extensions; using EHR.Roles; using Hazel; using UnityEngine; diff --git a/Modules/AFKDetector.cs b/Modules/AFKDetector.cs index f32ed43d7..0b3610cd6 100644 --- a/Modules/AFKDetector.cs +++ b/Modules/AFKDetector.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using EHR.Modules.Extensions; using UnityEngine; namespace EHR.Modules; diff --git a/Modules/CustomRpcSender.cs b/Modules/CustomRpcSender.cs index 3e0de5a3c..1baa80a93 100644 --- a/Modules/CustomRpcSender.cs +++ b/Modules/CustomRpcSender.cs @@ -6,7 +6,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using Hazel; using Il2CppInterop.Runtime.InteropTypes.Arrays; diff --git a/Modules/DisableDevice.cs b/Modules/DisableDevice.cs index bb0ad3168..071fbbcd0 100644 --- a/Modules/DisableDevice.cs +++ b/Modules/DisableDevice.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using EHR.Modules.Extensions; using EHR.Roles; using HarmonyLib; using Hazel; diff --git a/Modules/EAC.cs b/Modules/EAC.cs index 0b1627be8..981afe56c 100644 --- a/Modules/EAC.cs +++ b/Modules/EAC.cs @@ -5,7 +5,6 @@ using System.Linq; using AmongUs.GameOptions; using AmongUs.QuickChat; using BepInEx.Unity.IL2CPP.Utils.Collections; -using EHR.Modules.Extensions; using HarmonyLib; using Hazel; using InnerNet; diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs index b3d785719..fe481bdf2 100644 --- a/Modules/ExtendedPlayerControl.cs +++ b/Modules/ExtendedPlayerControl.cs @@ -8,7 +8,6 @@ using System.Reflection; using AmongUs.GameOptions; using EHR.Gamemodes; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using Hazel; using Il2CppInterop.Runtime.InteropTypes.Arrays; diff --git a/Modules/Extensions/FastVector2.cs b/Modules/Extensions/FastVector2.cs index f198a4460..6d2198bde 100644 --- a/Modules/Extensions/FastVector2.cs +++ b/Modules/Extensions/FastVector2.cs @@ -44,7 +44,7 @@ public static class FastVector2 [MethodImpl(MethodImplOptions.AggressiveInlining)] public static bool TryGetClosestInRange( in Vector2 origin, - IReadOnlyList positions, + IEnumerable positions, float range, out Vector2 closest) { @@ -72,6 +72,37 @@ public static class FastVector2 return found; } + /// + /// Finds the closest position to origin. + /// Returns true if one was found. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool TryGetClosest( + in Vector2 origin, + IEnumerable positions, + out Vector2 closest) + { + float minSq = float.MaxValue; + bool found = false; + closest = default(Vector2); + + foreach (Vector2 p in positions) + { + float dx = p.x - origin.x; + float dy = p.y - origin.y; + float sq = dx * dx + dy * dy; + + if (sq < minSq) + { + minSq = sq; + closest = p; + found = true; + } + } + + return found; + } + /// /// Finds the closest living player to origin. /// Returns true if one was found. @@ -80,7 +111,7 @@ public static class FastVector2 public static bool TryGetClosestPlayer( in Vector2 origin, out PlayerControl closest, - Predicate predicate = null) + [Annotations.InstantHandle] Predicate predicate = null) { predicate ??= _ => true; float minSq = float.MaxValue; diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs index 030ce8c6a..e40422b74 100644 --- a/Patches/IntroPatch.cs +++ b/Patches/IntroPatch.cs @@ -6,7 +6,6 @@ using AmongUs.GameOptions; using BepInEx.Unity.IL2CPP.Utils.Collections; using EHR.Gamemodes; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Patches; using EHR.Roles; using HarmonyLib; diff --git a/Patches/LadderPatch.cs b/Patches/LadderPatch.cs index 22bf7c9f7..082a91905 100644 --- a/Patches/LadderPatch.cs +++ b/Patches/LadderPatch.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using EHR.Modules.Extensions; using HarmonyLib; using Hazel; using UnityEngine; diff --git a/Patches/PetActionsPatch.cs b/Patches/PetActionsPatch.cs index f2e98f84c..20089bf22 100644 --- a/Patches/PetActionsPatch.cs +++ b/Patches/PetActionsPatch.cs @@ -1,10 +1,8 @@ using System.Collections; using System.Collections.Generic; -using System.Linq; using AmongUs.GameOptions; using EHR.Gamemodes; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using HarmonyLib; using Hazel; @@ -199,7 +197,7 @@ internal static class ExternalRpcPetPatch if (target.Is(CustomRoles.Detour)) { PlayerControl tempTarget = target; - target = Main.EnumerateAlivePlayerControls().Where(x => x.PlayerId != target.PlayerId && x.PlayerId != pc.PlayerId).MinBy(x => Vector2.Distance(x.Pos(), target.Pos())); + FastVector2.TryGetClosestPlayer(target.Pos(), out target, x => x.PlayerId != target.PlayerId && x.PlayerId != pc.PlayerId); Logger.Info($"Target was {tempTarget.GetNameWithRole()}, new target is {target.GetNameWithRole()}", "Detour"); if (tempTarget.AmOwner) diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index bf54415f6..77aee2312 100644 --- a/Patches/PlayerControlPatch.cs +++ b/Patches/PlayerControlPatch.cs @@ -137,7 +137,7 @@ internal static class CheckMurderPatch if (target.Is(CustomRoles.Detour)) { PlayerControl tempTarget = target; - target = Main.EnumerateAlivePlayerControls().Where(x => x.PlayerId != target.PlayerId && x.PlayerId != killer.PlayerId).MinBy(x => Vector2.Distance(x.Pos(), target.Pos())); + FastVector2.TryGetClosestPlayer(target.Pos(), out target, x => x.PlayerId != target.PlayerId && x.PlayerId != killer.PlayerId); Logger.Info($"Target was {tempTarget.GetNameWithRole()}, new target is {target.GetNameWithRole()}", "Detour"); if (tempTarget.AmOwner) @@ -2366,8 +2366,7 @@ static class PlayerControlRevivePatch var sender = CustomRpcSender.Create($"LIReviveSync:{__instance.GetRealName()}", SendOption.Reliable); var hasValue = sender.SyncGeneralOptions(__instance); sender.SendMessage(dispose: !hasValue); - Vector2 pos = __instance.Pos(); - __instance.TP(Main.EnumerateAlivePlayerControls().Without(__instance).Select(x => x.Pos()).Concat(ShipStatus.Instance.AllVents.Select(x => new Vector2(x.transform.position.x, x.transform.position.y + 0.3636f))).MinBy(x => Vector2.Distance(pos, x))); + __instance.TP(FastVector2.TryGetClosest(__instance.Pos(), Main.EnumerateAlivePlayerControls().Without(__instance).Select(x => x.Pos()).Concat(ShipStatus.Instance.AllVents.Select(x => new Vector2(x.transform.position.x, x.transform.position.y + 0.3636f))), out Vector2 closest) ? closest : Vector2.zero); } }, 0.2f); } diff --git a/Patches/SabotageSystemPatch.cs b/Patches/SabotageSystemPatch.cs index 148b15a9d..f10694c39 100644 --- a/Patches/SabotageSystemPatch.cs +++ b/Patches/SabotageSystemPatch.cs @@ -2,7 +2,6 @@ using System; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Roles; using HarmonyLib; using Hazel; diff --git a/Roles/Standard/Addons/Common/Dynamo.cs b/Roles/Standard/Addons/Common/Dynamo.cs index c20e5b9fb..e6198e57c 100644 --- a/Roles/Standard/Addons/Common/Dynamo.cs +++ b/Roles/Standard/Addons/Common/Dynamo.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using EHR.Modules.Extensions; using UnityEngine; namespace EHR.Roles; diff --git a/Roles/Standard/Addons/Common/Sleep.cs b/Roles/Standard/Addons/Common/Sleep.cs index 46ec68f16..8d5a38154 100644 --- a/Roles/Standard/Addons/Common/Sleep.cs +++ b/Roles/Standard/Addons/Common/Sleep.cs @@ -1,6 +1,5 @@ using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Addons/Common/Sonar.cs b/Roles/Standard/Addons/Common/Sonar.cs index 23576dd70..61b14f1e5 100644 --- a/Roles/Standard/Addons/Common/Sonar.cs +++ b/Roles/Standard/Addons/Common/Sonar.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; namespace EHR.Roles; diff --git a/Roles/Standard/Addons/Common/Spurt.cs b/Roles/Standard/Addons/Common/Spurt.cs index 4cd3248c1..83c44bc30 100644 --- a/Roles/Standard/Addons/Common/Spurt.cs +++ b/Roles/Standard/Addons/Common/Spurt.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using EHR.Modules.Extensions; using UnityEngine; using static EHR.Options; diff --git a/Roles/Standard/Coven/Banshee.cs b/Roles/Standard/Coven/Banshee.cs index 2241a7dbd..30f153f24 100644 --- a/Roles/Standard/Coven/Banshee.cs +++ b/Roles/Standard/Coven/Banshee.cs @@ -2,7 +2,6 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Coven/Dreamweaver.cs b/Roles/Standard/Coven/Dreamweaver.cs index 381eb2bbc..e66453a6a 100644 --- a/Roles/Standard/Coven/Dreamweaver.cs +++ b/Roles/Standard/Coven/Dreamweaver.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Coven/Empress.cs b/Roles/Standard/Coven/Empress.cs index 48d097cb2..f65f0db2d 100644 --- a/Roles/Standard/Coven/Empress.cs +++ b/Roles/Standard/Coven/Empress.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Coven/Summoner.cs b/Roles/Standard/Coven/Summoner.cs index e73a6abc2..cd7fe4484 100644 --- a/Roles/Standard/Coven/Summoner.cs +++ b/Roles/Standard/Coven/Summoner.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using EHR.Modules.Extensions; diff --git a/Roles/Standard/Crewmate/Chaos/Car.cs b/Roles/Standard/Crewmate/Chaos/Car.cs index a73ae423f..e86d4fd22 100644 --- a/Roles/Standard/Crewmate/Chaos/Car.cs +++ b/Roles/Standard/Crewmate/Chaos/Car.cs @@ -1,7 +1,6 @@ using System.Collections; using System.Collections.Generic; using EHR.Modules; -using EHR.Modules.Extensions; using UnityEngine; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Chaos/Dad.cs b/Roles/Standard/Crewmate/Chaos/Dad.cs index 0b1aed6b0..84350a2c9 100644 --- a/Roles/Standard/Crewmate/Chaos/Dad.cs +++ b/Roles/Standard/Crewmate/Chaos/Dad.cs @@ -4,7 +4,6 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Gamemodes; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Chaos/ToiletMaster.cs b/Roles/Standard/Crewmate/Chaos/ToiletMaster.cs index d046e7532..8df3434ef 100644 --- a/Roles/Standard/Crewmate/Chaos/ToiletMaster.cs +++ b/Roles/Standard/Crewmate/Chaos/ToiletMaster.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using UnityEngine; using static EHR.Options; diff --git a/Roles/Standard/Crewmate/Chaos/Tree.cs b/Roles/Standard/Crewmate/Chaos/Tree.cs index 985ca4295..12a49bef6 100644 --- a/Roles/Standard/Crewmate/Chaos/Tree.cs +++ b/Roles/Standard/Crewmate/Chaos/Tree.cs @@ -1,6 +1,5 @@ using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Investigate/Leery.cs b/Roles/Standard/Crewmate/Investigate/Leery.cs index 54cdf4b1d..bb6402704 100644 --- a/Roles/Standard/Crewmate/Investigate/Leery.cs +++ b/Roles/Standard/Crewmate/Investigate/Leery.cs @@ -1,7 +1,5 @@ using System; -using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Investigate/Sentry.cs b/Roles/Standard/Crewmate/Investigate/Sentry.cs index ddda31309..f575d64c8 100644 --- a/Roles/Standard/Crewmate/Investigate/Sentry.cs +++ b/Roles/Standard/Crewmate/Investigate/Sentry.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; using HarmonyLib; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Investigate/Whisperer.cs b/Roles/Standard/Crewmate/Investigate/Whisperer.cs index 374de56b0..b4c5901d4 100644 --- a/Roles/Standard/Crewmate/Investigate/Whisperer.cs +++ b/Roles/Standard/Crewmate/Investigate/Whisperer.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; @@ -83,12 +82,7 @@ public class Whisperer : RoleBase public override void OnPet(PlayerControl pc) { if (pc.GetAbilityUseLimit() < 1 || Souls.Exists(x => x.IsQuestioning)) return; - - Vector2 pos = pc.Pos(); - List souls = Souls.FindAll(x => x.IsQuestionAble && FastVector2.DistanceWithinRange(pos, x.Position, 1f)); - if (souls.Count == 0) return; - - Soul soul = souls.MinBy(x => Vector2.Distance(pos, x.Position)); + if (!FastVector2.TryGetClosestInRange(pc.Pos(), Souls.FindAll(x => x.IsQuestionAble).ToDictionary(x => x.Position, x => x), 1f, out Soul soul)) return; soul.QuestioningTime = Duration.GetInt(); CurrentlyQuestioning.Name = soul.Player.PlayerId.ColoredPlayerName(); Utils.SendRPC(CustomRPC.SyncRoleData, WhispererId, 1, CurrentlyQuestioning.Name); diff --git a/Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs b/Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs index e34547d8a..9d55ec153 100644 --- a/Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/CameraMan.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using UnityEngine; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs b/Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs index d61c4c6f8..efa30ea71 100644 --- a/Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/PortalMaker.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using Color = UnityEngine.Color; diff --git a/Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs b/Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs index 7b07dc6c5..5fbe55061 100644 --- a/Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/SuperStar.cs @@ -1,5 +1,4 @@ -using System.Linq; -using static EHR.Options; +using static EHR.Options; namespace EHR.Roles; @@ -37,7 +36,7 @@ internal class SuperStar : RoleBase public override bool OnCheckMurderAsTarget(PlayerControl killer, PlayerControl target) { - return !Main.EnumerateAlivePlayerControls().Any(x => x.PlayerId != killer.PlayerId && x.PlayerId != target.PlayerId && Vector2.Distance(x.Pos(), target.Pos()) < 2f); + return !FastVector2.TryGetClosestPlayerInRange(target.Pos(), 2f, out _, x => x.PlayerId != killer.PlayerId && x.PlayerId != target.PlayerId); } public override bool KnowRole(PlayerControl seer, PlayerControl target) diff --git a/Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs b/Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs index a48945078..25efc90c1 100644 --- a/Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs +++ b/Roles/Standard/Crewmate/Miscellaneous/Transmitter.cs @@ -1,6 +1,4 @@ -using System.Linq; - -namespace EHR.Roles; +namespace EHR.Roles; public class Transmitter : RoleBase { @@ -24,6 +22,6 @@ public class Transmitter : RoleBase public override void OnTaskComplete(PlayerControl pc, int completedTaskCount, int totalTaskCount) { - pc.TP(Main.EnumerateAlivePlayerControls().OrderBy(x => Vector2.Distance(x.Pos(), pc.Pos())).FirstOrDefault(x => x.PlayerId != pc.PlayerId) ?? pc); + pc.TP(FastVector2.TryGetClosestPlayer(pc.Pos(), out PlayerControl closest, x => x.PlayerId != pc.PlayerId) ? closest : pc); } } \ No newline at end of file diff --git a/Roles/Standard/Crewmate/Power/Adventurer.cs b/Roles/Standard/Crewmate/Power/Adventurer.cs index c04c5bf13..9cf553094 100644 --- a/Roles/Standard/Crewmate/Power/Adventurer.cs +++ b/Roles/Standard/Crewmate/Power/Adventurer.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using EHR.Patches; using Hazel; using UnityEngine; @@ -245,8 +244,7 @@ internal class Adventurer : RoleBase RemoveAndNotify(); break; - case Weapon.Prediction: - PlayerControl closest = Main.EnumerateAlivePlayerControls().Where(x => x.PlayerId != pc.PlayerId).MinBy(x => Vector2.Distance(pc.Pos(), x.Pos())); + case Weapon.Prediction when FastVector2.TryGetClosestPlayer(pc.Pos(), out PlayerControl closest, x => x.PlayerId != pc.PlayerId): RevealedPlayers.Add(closest.PlayerId); RemoveAndNotify(closest); break; @@ -297,7 +295,7 @@ internal class Adventurer : RoleBase Utils.NotifyRoles(SpecifySeer: AdventurerPC, SpecifyTarget: AdventurerPC); } - if (LastGroupingResourceTimeStamp + 20 <= now && Main.EnumerateAlivePlayerControls().Count(x => x.PlayerId != pc.PlayerId && Vector2.Distance(x.Pos(), pc.Pos()) < 2f) >= 2) + if (LastGroupingResourceTimeStamp + 20 <= now && Main.EnumerateAlivePlayerControls().Count(x => x.PlayerId != pc.PlayerId && FastVector2.DistanceWithinRange(x.Pos(), pc.Pos(), 2f)) >= 2) { if (ResourceLocations.TryGetValue(Resource.Grouping, out Vector2 location)) { diff --git a/Roles/Standard/Crewmate/Power/Astral.cs b/Roles/Standard/Crewmate/Power/Astral.cs index 97019dcc1..f45a86b32 100644 --- a/Roles/Standard/Crewmate/Power/Astral.cs +++ b/Roles/Standard/Crewmate/Power/Astral.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using EHR.Modules.Extensions; @@ -103,7 +102,7 @@ public class Astral : RoleBase if (!pc.IsInsideMap()) { Vector2 playerPosition = pc.Pos(); - Vector2 closestSpawnPosition = RandomSpawn.SpawnMap.GetSpawnMap().Positions.Values.MinBy(x => Vector2.Distance(playerPosition, x)); + Vector2 closestSpawnPosition = FastVector2.TryGetClosest(playerPosition, RandomSpawn.SpawnMap.GetSpawnMap().Positions.Values, out Vector2 closest1) ? closest1 : new Vector2(50f, 50f); Vector3 closestVentPosition = pc.GetClosestVent()?.transform.position ?? closestSpawnPosition; pc.TP(Vector2.Distance(playerPosition, closestVentPosition) < Vector2.Distance(playerPosition, closestSpawnPosition) ? closestVentPosition : closestSpawnPosition); } diff --git a/Roles/Standard/Crewmate/Support/Autocrat.cs b/Roles/Standard/Crewmate/Support/Autocrat.cs index 72940ca21..cee6f13de 100644 --- a/Roles/Standard/Crewmate/Support/Autocrat.cs +++ b/Roles/Standard/Crewmate/Support/Autocrat.cs @@ -1,6 +1,4 @@ -using System.Linq; - -namespace EHR.Roles; +namespace EHR.Roles; internal class Autocrat : RoleBase { @@ -26,6 +24,6 @@ internal class Autocrat : RoleBase { if (!pc.IsAlive()) return; - Main.EnumerateAlivePlayerControls().OrderBy(x => Vector2.Distance(x.Pos(), pc.Pos())).FirstOrDefault(x => x.PlayerId != pc.PlayerId)?.TP(pc); + (FastVector2.TryGetClosestPlayer(pc.Pos(), out PlayerControl closest, x => x.PlayerId != pc.PlayerId) ? closest : pc).TP(pc); } } \ No newline at end of file diff --git a/Roles/Standard/Crewmate/Support/Beacon.cs b/Roles/Standard/Crewmate/Support/Beacon.cs index 3870091a3..4d25427db 100644 --- a/Roles/Standard/Crewmate/Support/Beacon.cs +++ b/Roles/Standard/Crewmate/Support/Beacon.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using EHR.Modules; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Support/Bodyguard.cs b/Roles/Standard/Crewmate/Support/Bodyguard.cs index 2811d253e..b19a25366 100644 --- a/Roles/Standard/Crewmate/Support/Bodyguard.cs +++ b/Roles/Standard/Crewmate/Support/Bodyguard.cs @@ -52,8 +52,7 @@ internal class Bodyguard : RoleBase { if (bodyguard.BodyguardPC == null || bodyguard.BodyguardPC.PlayerId == target.PlayerId) continue; - float dis = Vector2.Distance(bodyguard.BodyguardPC.Pos(), target.Pos()); - if (dis > BodyguardProtectRadius.GetFloat()) return true; + if (!FastVector2.DistanceWithinRange(bodyguard.BodyguardPC.Pos(), target.Pos(), BodyguardProtectRadius.GetFloat())) continue; if (bodyguard.BodyguardPC.IsMadmate() && killer.Is(Team.Impostor)) { diff --git a/Roles/Standard/Crewmate/Support/Gardener.cs b/Roles/Standard/Crewmate/Support/Gardener.cs index e4f7dfd3b..63c7efea8 100644 --- a/Roles/Standard/Crewmate/Support/Gardener.cs +++ b/Roles/Standard/Crewmate/Support/Gardener.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Crewmate/Support/TimeMaster.cs b/Roles/Standard/Crewmate/Support/TimeMaster.cs index 32678830e..d48118926 100644 --- a/Roles/Standard/Crewmate/Support/TimeMaster.cs +++ b/Roles/Standard/Crewmate/Support/TimeMaster.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; using static EHR.Options; diff --git a/Roles/Standard/Ghost/Bloodmoon.cs b/Roles/Standard/Ghost/Bloodmoon.cs index 18cd47b16..c49e8abd1 100644 --- a/Roles/Standard/Ghost/Bloodmoon.cs +++ b/Roles/Standard/Ghost/Bloodmoon.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Impostor/Concealing/Ambusher.cs b/Roles/Standard/Impostor/Concealing/Ambusher.cs index 94835c218..b2ece93ea 100644 --- a/Roles/Standard/Impostor/Concealing/Ambusher.cs +++ b/Roles/Standard/Impostor/Concealing/Ambusher.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using Hazel; @@ -117,12 +116,7 @@ public class Ambusher : RoleBase if (!DontCheck) { - Vector2 pos = pc.Pos(); - float radius = FollowRadius.GetFloat(); - (PlayerControl pc, float distance)[] nearPlayers = Main.EnumerateAlivePlayerControls().Without(pc).Select(x => (pc: x, distance: Vector2.Distance(x.Pos(), pos))).Where(x => x.distance <= radius).ToArray(); - PlayerControl closestPlayer = nearPlayers.Length == 0 ? null : nearPlayers.MinBy(x => x.distance).pc; - - if (closestPlayer == null) + if (!FastVector2.TryGetClosestPlayerInRange(pc.Pos(), FollowRadius.GetFloat(), out PlayerControl closestPlayer, x => x.PlayerId != pc.PlayerId)) { TargetId = byte.MaxValue; TargetTimer = FollowDuration.GetFloat(); diff --git a/Roles/Standard/Impostor/Concealing/Lightning.cs b/Roles/Standard/Impostor/Concealing/Lightning.cs index a61b6148f..c567b9ca1 100644 --- a/Roles/Standard/Impostor/Concealing/Lightning.cs +++ b/Roles/Standard/Impostor/Concealing/Lightning.cs @@ -168,8 +168,7 @@ public class Lightning : RoleBase if (pc.PlayerId != gs.PlayerId && pc.IsAlive() && !pc.Is(CustomRoles.Lightning) && !IsGhost(pc) && !Pelican.IsEaten(pc.PlayerId)) { Vector3 pos = gs.Pos(); - float dis = Vector2.Distance(pos, pc.Pos()); - if (dis > 0.3f) continue; + if (!FastVector2.DistanceWithinRange(pos, pc.Pos(), 0.3f)) continue; deList.Add(gs.PlayerId); gs.Suicide(PlayerState.DeathReason.Quantization, RealKiller[gs.PlayerId]); diff --git a/Roles/Standard/Impostor/Concealing/RiftMaker.cs b/Roles/Standard/Impostor/Concealing/RiftMaker.cs index 0cf2c6b51..3ddd34420 100644 --- a/Roles/Standard/Impostor/Concealing/RiftMaker.cs +++ b/Roles/Standard/Impostor/Concealing/RiftMaker.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using static EHR.Options; using static EHR.Translator; @@ -99,7 +98,7 @@ public class RiftMaker : RoleBase if (LastTP + 5 > now) return; Vector2 pos = player.Pos(); - if (!Marks.FindFirst(x => Vector2.Distance(x, pos) <= 1f, out Vector2 nearMark)) return; + if (!Marks.FindFirst(x => FastVector2.DistanceWithinRange(x, pos, 1f), out Vector2 nearMark)) return; int index = Marks.IndexOf(nearMark); Vector2 target = Marks[1 - index]; diff --git a/Roles/Standard/Impostor/Concealing/Scavenger.cs b/Roles/Standard/Impostor/Concealing/Scavenger.cs index 8e2584fb2..15c183c08 100644 --- a/Roles/Standard/Impostor/Concealing/Scavenger.cs +++ b/Roles/Standard/Impostor/Concealing/Scavenger.cs @@ -52,7 +52,7 @@ internal class Scavenger : RoleBase { while (dur > 0) { - if (killer == null || target == null || Vector2.Distance(killer.Pos(), target.Pos()) > 2f) yield break; + if (killer == null || target == null || !FastVector2.DistanceWithinRange(killer.Pos(), target.Pos(), 2f)) yield break; dur -= Time.fixedDeltaTime; yield return null; } diff --git a/Roles/Standard/Impostor/Concealing/Stealth.cs b/Roles/Standard/Impostor/Concealing/Stealth.cs index 5237b8b3d..81f30bf47 100644 --- a/Roles/Standard/Impostor/Concealing/Stealth.cs +++ b/Roles/Standard/Impostor/Concealing/Stealth.cs @@ -2,7 +2,6 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; diff --git a/Roles/Standard/Impostor/Concealing/Venerer.cs b/Roles/Standard/Impostor/Concealing/Venerer.cs index 80b35658b..0262758fe 100644 --- a/Roles/Standard/Impostor/Concealing/Venerer.cs +++ b/Roles/Standard/Impostor/Concealing/Venerer.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; diff --git a/Roles/Standard/Impostor/Killing/Abyssbringer.cs b/Roles/Standard/Impostor/Killing/Abyssbringer.cs index 8f3652c42..068734e22 100644 --- a/Roles/Standard/Impostor/Killing/Abyssbringer.cs +++ b/Roles/Standard/Impostor/Killing/Abyssbringer.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; @@ -169,9 +168,7 @@ public class Abyssbringer : RoleBase continue; } - PlayerControl nearestPlayer = Main.EnumerateAlivePlayerControls().Without(pc).MinBy(x => Vector2.Distance(x.Pos(), blackHole.Position)); - - if (nearestPlayer != null) + if (FastVector2.TryGetClosestPlayer(blackHole.Position, out PlayerControl nearestPlayer, x => x.PlayerId != pc.PlayerId)) { Vector2 pos = nearestPlayer.Pos(); diff --git a/Roles/Standard/Impostor/Killing/Bomber.cs b/Roles/Standard/Impostor/Killing/Bomber.cs index 55fef0db0..36402c6e2 100644 --- a/Roles/Standard/Impostor/Killing/Bomber.cs +++ b/Roles/Standard/Impostor/Killing/Bomber.cs @@ -151,13 +151,8 @@ internal class Bomber : RoleBase { if (!tg.IsModdedClient()) tg.KillFlash(); - Vector2 pos = pc.Pos(); - float dis = Vector2.Distance(pos, tg.Pos()); - if (!tg.IsAlive() || Pelican.IsEaten(tg.PlayerId) || Medic.ProtectList.Contains(tg.PlayerId) || (tg.Is(CustomRoleTypes.Impostor) && ImpostorsSurviveBombs.GetBool()) || tg.inVent || tg.Is(CustomRoles.Pestilence)) continue; - - if (dis > radius) continue; - + if (!FastVector2.DistanceWithinRange(pc.Pos(), tg.Pos(), radius)) continue; if (tg.PlayerId == pc.PlayerId) continue; tg.Suicide(PlayerState.DeathReason.Bombed, pc); diff --git a/Roles/Standard/Impostor/Killing/Fireworker.cs b/Roles/Standard/Impostor/Killing/Fireworker.cs index a8159052d..53694c09c 100644 --- a/Roles/Standard/Impostor/Killing/Fireworker.cs +++ b/Roles/Standard/Impostor/Killing/Fireworker.cs @@ -164,8 +164,7 @@ public class Fireworker : RoleBase { foreach (Vector3 pos in fireworksPosition) { - float dis = Vector2.Distance(pos, target.Pos()); - if (dis > FireworksRadius) continue; + if (!FastVector2.DistanceWithinRange(pos, target.Pos(), FireworksRadius)) continue; if (target == pc) suicide = true; diff --git a/Roles/Standard/Impostor/Killing/Psychopath.cs b/Roles/Standard/Impostor/Killing/Psychopath.cs index 73487acbf..70f46a675 100644 --- a/Roles/Standard/Impostor/Killing/Psychopath.cs +++ b/Roles/Standard/Impostor/Killing/Psychopath.cs @@ -34,11 +34,8 @@ public class Psychopath : RoleBase public override void OnFixedUpdate(PlayerControl pc) { if (!GameStates.IsInTask || ExileController.Instance || AntiBlackout.SkipTasks || !pc.IsAlive() || Main.KillTimers[pc.PlayerId] > 0f || Count++ < 10) return; - var pos = pc.Pos(); var killRange = NormalGameOptionsV10.KillDistances[Mathf.Clamp(Main.NormalOptions.KillDistance, 0, 2)]; - var nearPlayers = Main.EnumerateAlivePlayerControls().Without(pc).Where(x => !x.IsImpostor()).Select(x => (pc: x, distance: Vector2.Distance(x.Pos(), pos))).Where(x => x.distance <= killRange).ToArray(); - PlayerControl closestPlayer = nearPlayers.Length == 0 ? null : nearPlayers.MinBy(x => x.distance).pc; - if (closestPlayer == null) return; + if (!FastVector2.TryGetClosestPlayerInRange(pc.Pos(), killRange, out PlayerControl closestPlayer, x => x.PlayerId != pc.PlayerId && !x.IsImpostor())) return; Count = 0; pc.RpcCheckAndMurder(closestPlayer); } diff --git a/Roles/Standard/Impostor/Killing/Sapper.cs b/Roles/Standard/Impostor/Killing/Sapper.cs index 98fb43288..cecb79862 100644 --- a/Roles/Standard/Impostor/Killing/Sapper.cs +++ b/Roles/Standard/Impostor/Killing/Sapper.cs @@ -2,7 +2,6 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; diff --git a/Roles/Standard/Impostor/Killing/Witch.cs b/Roles/Standard/Impostor/Killing/Witch.cs index 8c8433266..f031e8047 100644 --- a/Roles/Standard/Impostor/Killing/Witch.cs +++ b/Roles/Standard/Impostor/Killing/Witch.cs @@ -140,11 +140,8 @@ public class Witch : RoleBase { if (NowSwitchTrigger == SwitchTrigger.Vanish) { - var pos = pc.Pos(); var killRange = NormalGameOptionsV10.KillDistances[Mathf.Clamp(Main.NormalOptions.KillDistance, 0, 2)]; - var nearPlayers = Main.EnumerateAlivePlayerControls().Without(pc).Where(x => !x.IsImpostor()).Select(x => (pc: x, distance: Vector2.Distance(x.Pos(), pos))).Where(x => x.distance <= killRange).ToArray(); - PlayerControl target = nearPlayers.Length == 0 ? null : nearPlayers.MinBy(x => x.distance).pc; - if (target == null) return false; + if (!FastVector2.TryGetClosestPlayerInRange(pc.Pos(), killRange, out PlayerControl target, x => x.PlayerId != pc.PlayerId && !x.IsImpostor())) return false; SetSpelled(pc, target); } diff --git a/Roles/Standard/Impostor/Madmate/Crewpostor.cs b/Roles/Standard/Impostor/Madmate/Crewpostor.cs index bcde16c8b..6cadf6e2c 100644 --- a/Roles/Standard/Impostor/Madmate/Crewpostor.cs +++ b/Roles/Standard/Impostor/Madmate/Crewpostor.cs @@ -48,17 +48,12 @@ internal class Crewpostor : RoleBase SendRPC(player.PlayerId, TasksDone[player.PlayerId]); - PlayerControl[] list = Main.EnumerateAlivePlayerControls().Where(x => x.PlayerId != player.PlayerId && (CrewpostorCanKillAllies.GetBool() || !x.GetCustomRole().IsImpostorTeam())).ToArray(); - - if (list.Length == 0) + if (!FastVector2.TryGetClosestPlayer(player.Pos(), out PlayerControl target, x => x.PlayerId != player.PlayerId && (CrewpostorCanKillAllies.GetBool() || !x.GetCustomRole().IsImpostorTeam()))) Logger.Info("No target to kill", "Crewpostor"); else if (TasksDone[player.PlayerId] % CrewpostorKillAfterTask.GetInt() != 0 && TasksDone[player.PlayerId] != 0) Logger.Info($"Crewpostor task done but kill skipped, {TasksDone[player.PlayerId]} tasks completed, but it kills after {CrewpostorKillAfterTask.GetInt()} tasks", "Crewpostor"); else { - list = [.. list.OrderBy(x => Vector2.Distance(player.Pos(), x.Pos()))]; - PlayerControl target = list[0]; - if (!target.Is(CustomRoles.Pestilence)) { if (!CrewpostorLungeKill.GetBool()) diff --git a/Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs b/Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs index 552263dc9..321494763 100644 --- a/Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs +++ b/Roles/Standard/Impostor/Miscellaneous/AntiAdminer.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Impostor/Support/Librarian.cs b/Roles/Standard/Impostor/Support/Librarian.cs index 43d4186fa..b57f703c6 100644 --- a/Roles/Standard/Impostor/Support/Librarian.cs +++ b/Roles/Standard/Impostor/Support/Librarian.cs @@ -123,7 +123,8 @@ public class Librarian : RoleBase PlayerControl pc = GetPlayerById(id); if (pc == null || !pc.IsAlive()) continue; - if (Vector2.Distance(pc.Pos(), reporter.Pos()) <= silenceRadius) librarian = pc; + if (FastVector2.DistanceWithinRange(pc.Pos(), reporter.Pos(), silenceRadius)) + librarian = pc; } if (librarian == null) return true; diff --git a/Roles/Standard/Impostor/Support/Silencer.cs b/Roles/Standard/Impostor/Support/Silencer.cs index 91cb9d416..2dbc6f0f6 100644 --- a/Roles/Standard/Impostor/Support/Silencer.cs +++ b/Roles/Standard/Impostor/Support/Silencer.cs @@ -125,11 +125,8 @@ public class Silencer : RoleBase { if (SilenceMode.GetValue() == 2) { - var pos = pc.Pos(); var killRange = NormalGameOptionsV10.KillDistances[Mathf.Clamp(Main.NormalOptions.KillDistance, 0, 2)]; - var nearPlayers = Main.EnumerateAlivePlayerControls().Without(pc).Select(x => (pc: x, distance: Vector2.Distance(x.Pos(), pos))).Where(x => x.distance <= killRange).ToArray(); - PlayerControl target = nearPlayers.Length == 0 ? null : nearPlayers.MinBy(x => x.distance).pc; - if (target == null) return false; + if (!FastVector2.TryGetClosestPlayerInRange(pc.Pos(), killRange, out PlayerControl target, x => x.PlayerId != pc.PlayerId)) return false; ForSilencer = [target.PlayerId]; Utils.SendRPC(CustomRPC.SyncRoleData, pc.PlayerId, 1, target.PlayerId); diff --git a/Roles/Standard/Impostor/Support/YinYanger.cs b/Roles/Standard/Impostor/Support/YinYanger.cs index 2dc8aa2ca..f74923642 100644 --- a/Roles/Standard/Impostor/Support/YinYanger.cs +++ b/Roles/Standard/Impostor/Support/YinYanger.cs @@ -110,31 +110,22 @@ public class YinYanger : RoleBase SendRPC(true); } - public override void OnGlobalFixedUpdate(PlayerControl player, bool lowLoad) + public override void OnFixedUpdate(PlayerControl pc) { - if (!GameStates.IsInTask) return; + if (!GameStates.IsInTask || !IsEnable || YinYangedPlayers.Count < 2) return; + + PlayerControl yyPc = YinYanger_; + PlayerControl pc1 = GetPlayerById(YinYangedPlayers[0]); + PlayerControl pc2 = GetPlayerById(YinYangedPlayers[1]); - foreach (KeyValuePair state in Main.PlayerStates) + if (pc1 == null || pc2 == null || yyPc == null || !pc1.IsAlive() || !pc2.IsAlive() || !yyPc.IsAlive()) return; + + if (FastVector2.DistanceWithinRange(pc1.Pos(), pc2.Pos(), 2f)) { - if (state.Value.Role is not YinYanger { IsEnable: true, YinYangedPlayers.Count: 2 } yy) continue; + if (!yyPc.RpcCheckAndMurder(pc1, true) || !yyPc.RpcCheckAndMurder(pc2, true)) return; - PlayerControl yyPc = yy.YinYanger_; - PlayerControl pc1 = GetPlayerById(yy.YinYangedPlayers[0]); - PlayerControl pc2 = GetPlayerById(yy.YinYangedPlayers[1]); - - if (pc1 == null || pc2 == null || yyPc == null) return; - - if (!pc1.IsAlive() || !pc2.IsAlive() || !yyPc.IsAlive()) return; - - if (Vector2.Distance(pc1.Pos(), pc2.Pos()) <= 2f) - { - if (!yyPc.RpcCheckAndMurder(pc1, true) - || !yyPc.RpcCheckAndMurder(pc2, true)) - return; - - pc1.Suicide(PlayerState.DeathReason.YinYanged, yyPc); - pc2.Suicide(PlayerState.DeathReason.YinYanged, yyPc); - } + pc1.Suicide(PlayerState.DeathReason.YinYanged, yyPc); + pc2.Suicide(PlayerState.DeathReason.YinYanged, yyPc); } } diff --git a/Roles/Standard/Neutral/Benign/Revolutionist.cs b/Roles/Standard/Neutral/Benign/Revolutionist.cs index 005ec1477..03f5d735c 100644 --- a/Roles/Standard/Neutral/Benign/Revolutionist.cs +++ b/Roles/Standard/Neutral/Benign/Revolutionist.cs @@ -177,9 +177,8 @@ internal class Revolutionist : RoleBase else { float range = NormalGameOptionsV10.KillDistances[Mathf.Clamp(player.Is(CustomRoles.Reach) ? 2 : Main.NormalOptions.KillDistance, 0, 2)] + 0.5f; - float dis = Vector2.Distance(player.Pos(), rvTarget.Pos()); - if (dis <= range) + if (FastVector2.DistanceWithinRange(player.Pos(), rvTarget.Pos(), range)) RevolutionistTimer[playerId] = (rvTarget, rvTime + Time.fixedDeltaTime); else { diff --git a/Roles/Standard/Neutral/Evil/Arsonist.cs b/Roles/Standard/Neutral/Evil/Arsonist.cs index c40f45088..1a757f9f3 100644 --- a/Roles/Standard/Neutral/Evil/Arsonist.cs +++ b/Roles/Standard/Neutral/Evil/Arsonist.cs @@ -227,9 +227,8 @@ internal class Arsonist : RoleBase else { float range = NormalGameOptionsV10.KillDistances[Mathf.Clamp(player.Is(CustomRoles.Reach) ? 2 : Main.NormalOptions.KillDistance, 0, 2)] + 0.5f; - float dis = Vector2.Distance(player.Pos(), arTarget.Pos()); - if (dis <= range) + if (FastVector2.DistanceWithinRange(player.Pos(), arTarget.Pos(), range)) ArsonistTimer[playerId] = (arTarget, arTime + Time.fixedDeltaTime); else { diff --git a/Roles/Standard/Neutral/Killing/Bargainer.cs b/Roles/Standard/Neutral/Killing/Bargainer.cs index ab63e3cfb..1cceee7d1 100644 --- a/Roles/Standard/Neutral/Killing/Bargainer.cs +++ b/Roles/Standard/Neutral/Killing/Bargainer.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; using static EHR.Options; diff --git a/Roles/Standard/Neutral/Killing/Beehive.cs b/Roles/Standard/Neutral/Killing/Beehive.cs index 71020fa85..136c1bbdc 100644 --- a/Roles/Standard/Neutral/Killing/Beehive.cs +++ b/Roles/Standard/Neutral/Killing/Beehive.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Neutral/Killing/Bubble.cs b/Roles/Standard/Neutral/Killing/Bubble.cs index dcc4b7a72..0c3412418 100644 --- a/Roles/Standard/Neutral/Killing/Bubble.cs +++ b/Roles/Standard/Neutral/Killing/Bubble.cs @@ -2,7 +2,6 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using static EHR.Options; using static EHR.Utils; @@ -171,7 +170,7 @@ internal class Bubble : RoleBase if (ts + NotifyDelay.GetInt() < now) { - Main.EnumerateAlivePlayerControls().Where(x => (!LastUpdates.TryGetValue(x.PlayerId, out long la) || la != now) && Vector2.Distance(x.Pos(), encasedPc.Pos()) < 5f).Do(x => + Main.EnumerateAlivePlayerControls().Where(x => (!LastUpdates.TryGetValue(x.PlayerId, out long la) || la != now) && FastVector2.DistanceWithinRange(x.Pos(), encasedPc.Pos(), 5f)).Do(x => { NotifyRoles(SpecifySeer: x, SpecifyTarget: encasedPc); LastUpdates[x.PlayerId] = now; diff --git a/Roles/Standard/Neutral/Killing/Chemist.cs b/Roles/Standard/Neutral/Killing/Chemist.cs index bc023c547..aafe1bedf 100644 --- a/Roles/Standard/Neutral/Killing/Chemist.cs +++ b/Roles/Standard/Neutral/Killing/Chemist.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; using static EHR.Options; diff --git a/Roles/Standard/Neutral/Killing/Explosivist.cs b/Roles/Standard/Neutral/Killing/Explosivist.cs index 16a3ca79b..f457a2940 100644 --- a/Roles/Standard/Neutral/Killing/Explosivist.cs +++ b/Roles/Standard/Neutral/Killing/Explosivist.cs @@ -1,5 +1,4 @@ using AmongUs.GameOptions; -using EHR.Modules.Extensions; namespace EHR.Roles; diff --git a/Roles/Standard/Neutral/Killing/Infection.cs b/Roles/Standard/Neutral/Killing/Infection.cs index 9662ef4f6..4f708ea96 100644 --- a/Roles/Standard/Neutral/Killing/Infection.cs +++ b/Roles/Standard/Neutral/Killing/Infection.cs @@ -216,8 +216,7 @@ public class Infection : RoleBase if (oldRate >= 100) continue; // Exclude players outside the range - float distance = Vector2.Distance(player.Pos(), target.Pos()); - if (distance > InfectDistance) continue; + if (!FastVector2.DistanceWithinRange(player.Pos(), target.Pos(), InfectDistance)) continue; float newRate = oldRate + (Time.fixedDeltaTime / InfectTime * 100); newRate = Math.Clamp(newRate, 0, 100); diff --git a/Roles/Standard/Neutral/Killing/Magician.cs b/Roles/Standard/Neutral/Killing/Magician.cs index 648c4dd0f..f17a5a8bc 100644 --- a/Roles/Standard/Neutral/Killing/Magician.cs +++ b/Roles/Standard/Neutral/Killing/Magician.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -335,8 +334,7 @@ public class Magician : RoleBase foreach (Vector2 mark in PortalMarks.ToArray()) { - float dis = Vector2.Distance(mark, position); - if (dis > 2f) continue; + if (!FastVector2.DistanceWithinRange(mark, position, 2f)) continue; isTP = true; from = mark; diff --git a/Roles/Standard/Neutral/Killing/Mycologist.cs b/Roles/Standard/Neutral/Killing/Mycologist.cs index 43a132dff..553f8ca34 100644 --- a/Roles/Standard/Neutral/Killing/Mycologist.cs +++ b/Roles/Standard/Neutral/Killing/Mycologist.cs @@ -2,7 +2,6 @@ using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using static EHR.Options; using static EHR.Translator; diff --git a/Roles/Standard/Neutral/Killing/Pelican.cs b/Roles/Standard/Neutral/Killing/Pelican.cs index 6b524f637..8668e76ed 100644 --- a/Roles/Standard/Neutral/Killing/Pelican.cs +++ b/Roles/Standard/Neutral/Killing/Pelican.cs @@ -255,8 +255,7 @@ public class Pelican : RoleBase if (target == null) continue; Vector2 pos = GetBlackRoomPS(); - float dis = Vector2.Distance(pos, target.Pos()); - if (dis < 2f) continue; + if (FastVector2.DistanceWithinRange(pos, target.Pos(), 2f)) continue; target.TP(pos, log: false); Utils.NotifyRoles(SpecifySeer: target, SpecifyTarget: pc); diff --git a/Roles/Standard/Neutral/Killing/Rogue.cs b/Roles/Standard/Neutral/Killing/Rogue.cs index 944df27ad..9043fc6e9 100644 --- a/Roles/Standard/Neutral/Killing/Rogue.cs +++ b/Roles/Standard/Neutral/Killing/Rogue.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; using UnityEngine; diff --git a/Roles/Standard/Neutral/Killing/Samurai.cs b/Roles/Standard/Neutral/Killing/Samurai.cs index f2b01f533..0d81f7f73 100644 --- a/Roles/Standard/Neutral/Killing/Samurai.cs +++ b/Roles/Standard/Neutral/Killing/Samurai.cs @@ -114,7 +114,7 @@ internal class Samurai : RoleBase PlayerControl target = Utils.GetPlayerById(Target.Id); if (target == null) return; - if (Vector2.Distance(target.Pos(), pc.Pos()) > NormalGameOptionsV10.KillDistances[Mathf.Clamp(pc.Is(CustomRoles.Reach) ? 2 : Main.NormalOptions.KillDistance, 0, 2)] + 0.5f) + if (!FastVector2.DistanceWithinRange(target.Pos(), pc.Pos(), NormalGameOptionsV10.KillDistances[Mathf.Clamp(pc.Is(CustomRoles.Reach) ? 2 : Main.NormalOptions.KillDistance, 0, 2)] + 0.5f)) { Target = (byte.MaxValue, 0); pc.RpcCheckAndMurder(target); diff --git a/Roles/Standard/Neutral/Killing/Sharpshooter.cs b/Roles/Standard/Neutral/Killing/Sharpshooter.cs index bd3724b64..d6a8bbbd9 100644 --- a/Roles/Standard/Neutral/Killing/Sharpshooter.cs +++ b/Roles/Standard/Neutral/Killing/Sharpshooter.cs @@ -125,11 +125,8 @@ public class Sharpshooter : RoleBase } else { - var pos = pc.Pos(); var killRange = NormalGameOptionsV10.KillDistances[Mathf.Clamp(Main.NormalOptions.KillDistance, 0, 2)]; - var nearPlayers = Main.EnumerateAlivePlayerControls().Without(pc).Select(x => (pc: x, distance: Vector2.Distance(x.Pos(), pos))).Where(x => x.distance <= killRange).ToArray(); - PlayerControl closestPlayer = nearPlayers.Length == 0 ? null : nearPlayers.MinBy(x => x.distance).pc; - if (closestPlayer == null || !pc.RpcCheckAndMurder(closestPlayer, check: true)) return; + if (!FastVector2.TryGetClosestPlayerInRange(pc.Pos(), killRange, out PlayerControl closestPlayer, x => x.PlayerId != pc.PlayerId) || !pc.RpcCheckAndMurder(closestPlayer, check: true)) return; if (!Options.UsePets.GetBool()) pc.RpcResetAbilityCooldown(); RevertAbility(); pc.SetKillCooldown(); diff --git a/Roles/Standard/Neutral/Killing/Slenderman.cs b/Roles/Standard/Neutral/Killing/Slenderman.cs index ec45e575f..317042d1e 100644 --- a/Roles/Standard/Neutral/Killing/Slenderman.cs +++ b/Roles/Standard/Neutral/Killing/Slenderman.cs @@ -82,7 +82,7 @@ public class Slenderman : RoleBase return; } - bool inRange = Vector2.Distance(pc.Pos(), SlendermanPC.Pos()) <= BlindRange.GetFloat(); + bool inRange = FastVector2.DistanceWithinRange(pc.Pos(), SlendermanPC.Pos(), BlindRange.GetFloat()); if ((inRange && Blinded.Add(pc.PlayerId)) || (!inRange && Blinded.Remove(pc.PlayerId))) { diff --git a/Roles/Standard/Neutral/Killing/Spider.cs b/Roles/Standard/Neutral/Killing/Spider.cs index c2cefd329..275cb7c87 100644 --- a/Roles/Standard/Neutral/Killing/Spider.cs +++ b/Roles/Standard/Neutral/Killing/Spider.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using AmongUs.GameOptions; using EHR.Modules; -using EHR.Modules.Extensions; using Hazel; namespace EHR.Roles; diff --git a/Roles/Standard/Neutral/Killing/Sprayer.cs b/Roles/Standard/Neutral/Killing/Sprayer.cs index 79bb261f5..e479f97fe 100644 --- a/Roles/Standard/Neutral/Killing/Sprayer.cs +++ b/Roles/Standard/Neutral/Killing/Sprayer.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using AmongUs.GameOptions; -using EHR.Modules.Extensions; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; diff --git a/Roles/Standard/Neutral/Killing/Tiger.cs b/Roles/Standard/Neutral/Killing/Tiger.cs index 216476635..a15abccc7 100644 --- a/Roles/Standard/Neutral/Killing/Tiger.cs +++ b/Roles/Standard/Neutral/Killing/Tiger.cs @@ -160,12 +160,10 @@ internal class Tiger : RoleBase public override void OnMurder(PlayerControl killer, PlayerControl target) { - if (float.IsNaN(EnrageTimer)) return; + if (float.IsNaN(EnrageTimer) || !FastVector2.TryGetClosestPlayerInRange(killer.Pos(), Radius.GetFloat(), out PlayerControl victim, x => x.PlayerId != killer.PlayerId && x.PlayerId != target.PlayerId)) return; - PlayerControl victim = Main.EnumerateAlivePlayerControls().Where(x => x.PlayerId != killer.PlayerId && x.PlayerId != target.PlayerId).MinBy(x => Vector2.Distance(killer.Pos(), x.Pos())); - if (victim == null || Vector2.Distance(killer.Pos(), victim.Pos()) > Radius.GetFloat()) return; - - if (killer.RpcCheckAndMurder(victim, true)) victim.Suicide(realKiller: killer); + if (killer.RpcCheckAndMurder(victim, true)) + victim.Suicide(realKiller: killer); } public override string GetSuffix(PlayerControl seer, PlayerControl target, bool hud = false, bool meeting = false) diff --git a/Roles/Standard/Neutral/Killing/Tremor.cs b/Roles/Standard/Neutral/Killing/Tremor.cs index 9c26619bd..82c0a2fa0 100644 --- a/Roles/Standard/Neutral/Killing/Tremor.cs +++ b/Roles/Standard/Neutral/Killing/Tremor.cs @@ -88,13 +88,14 @@ public class Tremor : RoleBase if (!GameStates.IsInTask || ExileController.Instance || !pc.IsAlive()) return; bool wasDoom = IsDoom; + long now = Utils.TimeStamp; - if (!IsDoom && LastUpdate != Utils.TimeStamp) + if (!IsDoom && LastUpdate != now) { Timer--; Utils.SendRPC(CustomRPC.SyncRoleData, pc.PlayerId, Timer); Utils.NotifyRoles(SpecifySeer: pc, SpecifyTarget: pc); - LastUpdate = Utils.TimeStamp; + LastUpdate = now; } if (wasDoom != IsDoom) @@ -113,14 +114,11 @@ public class Tremor : RoleBase Count = 0; - Vector2 pos = pc.Pos(); - - Main.EnumerateAlivePlayerControls() - .Where(x => x.PlayerId != pc.PlayerId && Vector2.Distance(pos, x.Pos()) <= 2.5f) + FastVector2.GetPlayersInRange(pc.Pos(), 2.5f, x => x.PlayerId != pc.PlayerId) .Do(pc.Kill); - if (LastUpdate == Utils.TimeStamp) return; - LastUpdate = Utils.TimeStamp; + if (LastUpdate == now) return; + LastUpdate = now; DoomTimer--; Utils.SendRPC(CustomRPC.SyncRoleData, pc.PlayerId, DoomTimer); diff --git a/Roles/Standard/Neutral/Killing/WeaponMaster.cs b/Roles/Standard/Neutral/Killing/WeaponMaster.cs index d819889ba..2aa822dbe 100644 --- a/Roles/Standard/Neutral/Killing/WeaponMaster.cs +++ b/Roles/Standard/Neutral/Killing/WeaponMaster.cs @@ -194,7 +194,7 @@ public class WeaponMaster : RoleBase { if (Pelican.IsEaten(player.PlayerId) || player == killer || target == player || player.Is(CustomRoles.Pestilence) || Veteran.VeteranInProtect.Contains(target.PlayerId)) continue; - if (Vector2.Distance(killer.Pos(), player.Pos()) <= Radius.GetFloat()) + if (FastVector2.DistanceWithinRange(killer.Pos(), player.Pos(), Radius.GetFloat())) player.Suicide(PlayerState.DeathReason.Kill, killer); if (killer.AmOwner && player.Is(CustomRoles.Tree))