From 2a7570f022842968aa6386702b6bb302e39b051c Mon Sep 17 00:00:00 2001 From: Atony <75191600+AtonyGit@users.noreply.github.com> Date: Thu, 22 Oct 2026 02:01:05 -0500 Subject: [PATCH] Adjust code that gets roles and modifiers list --- MiraAPI/Patches/RoleGuidePatches.cs | 54 ++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/MiraAPI/Patches/RoleGuidePatches.cs b/MiraAPI/Patches/RoleGuidePatches.cs index 7f50492f..1310bbd4 100644 --- a/MiraAPI/Patches/RoleGuidePatches.cs +++ b/MiraAPI/Patches/RoleGuidePatches.cs @@ -1187,20 +1187,43 @@ public static class RoleGuidePatches return shown; } + public static IEnumerable GetActiveModifiers() + { + return PlayerControl.LocalPlayer.GetModifiers(); + } + + public static IEnumerable GetActiveRoles() + { + IEnumerable comparisons = []; + + var curRole = PlayerControl.LocalPlayer.Data.Role; + + comparisons = comparisons.AddItem(curRole); + + if (PlayerControl.LocalPlayer && PlayerControl.LocalPlayer.Data && PlayerControl.LocalPlayer.Data.IsDead && + !comparisons.Any(x => x.Role == PlayerControl.LocalPlayer.Data.RoleWhenAlive.Value)) + { + comparisons = comparisons.AddItem(RoleManager.Instance.GetRole(PlayerControl.LocalPlayer.Data.RoleWhenAlive.Value)); + } + + return comparisons; + } + + public static List GetActiveIds() + { + var activeModifiers = GetActiveModifiers(); + List comparisons = activeModifiers.Select(x => x.TypeId).ToList(); + comparisons.AddRange(GetActiveRoles().Select(x => (uint)x.Role)); + + return comparisons; + } + private static List SortEntries(List entries, string searchText) { var activeModifiers = PlayerControl.LocalPlayer.GetModifiers().Select(x => x.TypeId); + var roles = GetActiveRoles().Select(x => (uint)x.Role).ToList(); List comparisons = activeModifiers.ToList(); - - var curRole = PlayerControl.LocalPlayer.Data.Role.Role; - - comparisons.Add((ushort)curRole); - - if (PlayerControl.LocalPlayer && PlayerControl.LocalPlayer.Data && PlayerControl.LocalPlayer.Data.IsDead && - !comparisons.Contains((ushort)PlayerControl.LocalPlayer.Data.RoleWhenAlive.Value)) - { - comparisons.Add((ushort)PlayerControl.LocalPlayer.Data.RoleWhenAlive.Value); - } + comparisons.AddRange(roles); var comparer = new BasicGuideComparer(comparisons); @@ -1675,10 +1698,15 @@ public static class RoleGuidePatches public static Sprite GetRandomRoleIcon() { - var aliveRole = PlayerControl.LocalPlayer.Data?.Role; - if (aliveRole != null && aliveRole.RoleIconSolid != null) + var roles = GetActiveRoles().Shuffle().ToList(); + foreach (var role in roles) { - return aliveRole.RoleIconSolid; + if (role.RoleIconSolid == null) + { + continue; + } + + return role.RoleIconSolid; } return GetRandomFactionIcon();