Merge branch 'dev-update' into game-modes

AmongUs.props

@@ -2,7 +2,7 @@
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.5.0-ci.371" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.6.5" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.8.18" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />

MiraAPI/Events/Mira/MiraButtonClickEvent.cs

@@ -6,7 +6,7 @@ namespace MiraAPI.Events.Mira;
 /// Button click event for <see cref="CustomActionButton"/>s only. Do not use for vanilla <see cref="AbilityButton"/>s.
 /// </summary>
 /// <typeparam name="T">The <see cref="CustomActionButton"/> type.</typeparam>
-public sealed class MiraButtonClickEvent<T> : MiraCancelableEvent where T : CustomActionButton
+public class MiraButtonClickEvent<T> : MiraCancelableEvent where T : CustomActionButton
 {
     /// <summary>
     /// Gets the <see cref="CustomActionButton"/> that was clicked.
@@ -33,7 +33,7 @@ public sealed class MiraButtonClickEvent<T> : MiraCancelableEvent where T : Cust
 /// <summary>
 /// Button click event for <see cref="CustomActionButton"/>s only. Do not use for vanilla <see cref="AbilityButton"/>s.
 /// </summary>
-public sealed class MiraButtonClickEvent : MiraCancelableEvent
+public class MiraButtonClickEvent : MiraCancelableEvent
 {
     /// <summary>
     /// Gets the <see cref="CustomActionButton"/> that was clicked.

MiraAPI/Events/Vanilla/Meeting/Voting/HandleVoteEvent.cs

@@ -34,6 +34,11 @@ public class HandleVoteEvent : MiraCancelableEvent
     /// </summary>
     public NetworkedPlayerInfo TargetPlayerInfo { get; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether the vote event is an Overrule caused by a Judge.
+    /// </summary>
+    public bool IsOverruling { get; set; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="HandleVoteEvent"/> class.
     /// </summary>
@@ -47,4 +52,20 @@ public class HandleVoteEvent : MiraCancelableEvent
         PreventVote = false;
         TargetPlayerInfo = GameData.Instance.GetPlayerById(targetId);
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="HandleVoteEvent"/> class.
+    /// </summary>
+    /// <param name="playerVoteData">The voter's <see cref="PlayerVoteData"/>.</param>
+    /// <param name="targetId">The target's playerId.</param>
+    /// <param name="isOverruling">Whether the vote is actually for a Judge.</param>
+    public HandleVoteEvent(PlayerVoteData playerVoteData, byte targetId, bool isOverruling)
+    {
+        VoteData = playerVoteData;
+        Player = playerVoteData.Owner;
+        TargetId = targetId;
+        PreventVote = false;
+        IsOverruling = isOverruling;
+        TargetPlayerInfo = GameData.Instance.GetPlayerById(targetId);
+    }
 }

MiraAPI/Events/Vanilla/Meeting/Voting/ProcessVotesEvent.cs

@@ -33,6 +33,16 @@ public class ProcessVotesEvent(List<CustomVote> votes, NetworkedPlayerInfo? exil
     /// </summary>
     public List<CustomVote> Votes { get; } = votes;
 
+    /// <summary>
+    /// Gets or sets a value indicating whether an overruling was done. Normally set by judge but can be overwritten.
+    /// </summary>
+    public bool OverruledVote { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value specifically to determine which Judge (if any) caused the overruling. Normally set by judge but can be overwritten.
+    /// </summary>
+    public ushort OverruledNonce { get; set; }
+
     /// <summary>
     /// Gets or sets the player to be exiled. Will be <see langword="null"/> if no player is to be exiled.
     /// </summary>

MiraAPI/GameModes/AbstractGameMode.cs

@@ -21,6 +21,11 @@ public abstract class AbstractGameMode : IOptionable
     /// </summary>
     public abstract string Name { get; }
 
+    /// <summary>
+    /// Gets a value indicating whether the mode is visible in the menu. Only checked at startup.
+    /// </summary>
+    public virtual bool HideMode => false;
+
     /// <summary>
     /// Gets the game mode description.
     /// </summary>

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
 
 namespace MiraAPI.GameModes;
@@ -40,10 +39,13 @@ public static class CustomGameModeManager
             return false;
         }
 
-        IdToModeMap.Add(GetNextId(), mode);
-        pluginInfo.GameModes.Add(LastId, mode);
-        mode.ID = LastId;
-        GameModeOption.AddOption(mode);
+        if (!mode.HideMode)
+        {
+            IdToModeMap.Add(GetNextId(), mode);
+            pluginInfo.GameModes.Add(LastId, mode);
+            mode.ID = LastId;
+            GameModeOption.AddOption(mode);
+        }
         return true;
     }
 
@@ -95,10 +97,9 @@ public static class CustomGameModeManager
         // no need to add to game mode option as it already contains it
         // because we cannot have the option be created with no values
         defaultMode.ID = 0;
-        // TODO: Once Hide n Seek port is ready for release, we will remove this case.
-        if (MiraApiPlugin.IsDevBuild)
+        var hnsMode = new HideAndSeekMode();
+        if (!hnsMode.HideMode)
         {
-            var hnsMode = new HideAndSeekMode();
             IdToModeMap.Add(1, hnsMode);
             hnsMode.ID = 1;
             GameModeOption.AddOption(hnsMode);

MiraAPI/GameModes/GameModeOption.cs

@@ -109,16 +109,28 @@ public static class GameModeOption
     internal static void Set(int val)
     {
         Value = val;
+        var previousMode = CustomGameModeManager.ActiveMode;
         CustomGameModeManager.GetAndSetGameMode();
         HudPatches.SetGameModeText(CustomGameModeManager.GetMode(Values.ElementAt(_lastValue).Key).ColoredName);
         var gm = CustomGameModeManager.ActiveMode!;
-        ModdedOptionsManager.AddSettingsChangeMessage(
-            HudManager.Instance.Notifier,
-            GamemodeName,
-            gm.ColoredName,
-            new Color(0.7333f, 0.7333f, 0.7333f, 1),
-            gm.TmpIcon,
-            true);
+        if (gm != previousMode)
+        {
+            ModdedOptionsManager.AddSettingsChangeMessage(
+                HudManager.Instance.Notifier,
+                GamemodeName,
+                gm.ColoredName,
+                new Color(0.7333f, 0.7333f, 0.7333f, 1),
+                gm.TmpIcon,
+                true);
+            if (MenuState.Instance)
+            {
+                // should force reset roles for gamemodes properly
+                foreach (var roleMenu in MenuState.Instance.QueuedRoleMenuRefresh)
+                {
+                    MenuState.Instance.QueuedRoleMenuRefresh[roleMenu.Key] = true;
+                }
+            }
+        }
         // could make Values a dict of AbstractGameMode too
     }
 

MiraAPI/GameModes/HideAndSeekMode.cs

@@ -30,6 +30,9 @@ public class HideAndSeekMode : AbstractGameMode
     /// <inheritdoc/>
     public override string Description => "You can run, but you can't hide!\nOutlive the timer or eliminate the crew.";
 
+    // TODO: Once the Hide n Seek port is ready for release, we will remove this.
+    public override bool HideMode => !MiraApiPlugin.IsDevBuild;
+
     public override Color Color { get; } = new Color32(255, 88, 90, 255);
     public override LoadableAsset<Sprite>? Icon => MiraAssets.HnSGamemodeIcon;
     public override bool CanReport(DeadBody body) => false;

MiraAPI/Hud/CustomButtonManager.cs

@@ -17,6 +17,20 @@ public static class CustomButtonManager
     /// </summary>
     public static ReadOnlyCollection<CustomActionButton> Buttons { get; internal set; } = new([]);
 
+    /// <summary>
+    /// Gets a list of all registered button-specific <see cref="MiraButtonClickEvent"/>s.
+    /// </summary>
+    public static ReadOnlyDictionary<Type, Type> EventTypes { get; internal set; } = new(
+        new Dictionary<Type, Type>
+            { });
+
+    /// <summary>
+    /// Gets a list of all registered button-specific <see cref="MiraButtonCancelledEvent"/>s.
+    /// </summary>
+    public static ReadOnlyDictionary<Type, Type> CancelledEventTypes { get; internal set; } = new(
+        new Dictionary<Type, Type>
+            { });
+
     internal static readonly List<CustomActionButton> CustomButtons = [];
     internal static readonly Dictionary<Type, Type> ButtonEventTypes = [];
     internal static readonly Dictionary<Type, Type> ButtonCancelledEventTypes = [];

MiraAPI/MiraApiPlugin.cs

@@ -5,6 +5,7 @@ using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using MiraAPI.PluginLoading;
+using MiraAPI.VanillaEvents;
 using Reactor;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
@@ -62,6 +63,7 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin
     public override void Load()
     {
         Harmony.PatchAll();
+        JudgeEvents.Initialize();
 
         ReactorCredits.Register("Mira API", Version, IsDevBuild, ReactorCredits.AlwaysShow);
 

MiraAPI/Networking/MiraRpc.cs

@@ -75,6 +75,11 @@ public enum MiraRpc : uint
     /// </summary>
     CastVote,
 
+    /// <summary>
+    /// Custom RPC to replace Among Us QueueOverruleVotes.
+    /// </summary>
+    QueueOverruleVotes,
+
     /// <summary>
     /// Custom RPC to sync the Gamemode option.
     /// </summary>

MiraAPI/Patches/GameModes/ConsolePatches.cs

@@ -12,7 +12,7 @@ internal static class ConsolePatches
     {
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
-            if (CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.CanUseTasks(__instance))
+            if (CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanUseTasks(__instance))
             {
                 var task = __instance.FindTask(pc.Object);
 
@@ -40,9 +40,10 @@ internal static class ConsolePatches
     {
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
-            if (CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.CanUseSystemConsole(__instance))
+            if (CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanUseSystemConsole(__instance))
             {
-                return canUse = couldUse = true;
+                canUse = couldUse = true;
+                return true;
             }
 
             canUse = couldUse = false;
@@ -58,9 +59,10 @@ internal static class ConsolePatches
     {
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
-            if (CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.CanUseMapConsole(__instance))
+            if (CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanUseMapConsole(__instance))
             {
-                return canUse = couldUse = true;
+                canUse = couldUse = true;
+                return true;
             }
 
             canUse = couldUse = false;
@@ -77,7 +79,7 @@ internal static class ConsolePatches
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
             return CustomGameModeManager.ActiveMode == null ||
-                   CustomGameModeManager.ActiveMode!.CanUseMapConsole(__instance);
+                   CustomGameModeManager.ActiveMode.CanUseMapConsole(__instance);
         }
 
         return true;
@@ -89,7 +91,7 @@ internal static class ConsolePatches
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
             return CustomGameModeManager.ActiveMode == null ||
-                   CustomGameModeManager.ActiveMode!.CanUseSystemConsole(__instance);
+                   CustomGameModeManager.ActiveMode.CanUseSystemConsole(__instance);
         }
 
         return true;
@@ -101,7 +103,7 @@ internal static class ConsolePatches
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
             return CustomGameModeManager.ActiveMode == null ||
-                   CustomGameModeManager.ActiveMode!.CanUseTasks(__instance);
+                   CustomGameModeManager.ActiveMode.CanUseTasks(__instance);
         }
 
         return true;

MiraAPI/Patches/GameModes/TaskPanelPatch.cs

@@ -7,7 +7,7 @@ internal static class TaskPanelPatch
 {
     public static bool Prefix(TaskPanelBehaviour __instance)
     {
-        if (CustomGameModeManager.ActiveMode != null)
+        if (__instance != Roles.HudManagerPatches.RoleTab && CustomGameModeManager.ActiveMode != null)
         {
             CustomGameModeManager.ActiveMode.UpdateTaskPanel(__instance);
             return false;

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Linq;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
@@ -404,14 +404,14 @@ internal static class GameOptionsMenuPatch
     // ReSharper disable once InconsistentNaming
     public static void UpdatePatch(GameOptionsMenu __instance)
     {
-        if (MenuState.Instance.CurrentModIdx == 0 && _gameModeGroups.Count <= 0) return;
-        var num = MenuState.Instance.CurrentMenu == MenuCategory.Game ? -1.217f : 2.1f;
+        if (MenuState.Instance.CurrentModIdx == 0 && _gameModeGroups.Count <= 0)
+        {
+            return;
+        }
+        var num = 2.1f;
 
         switch (MenuState.Instance.CurrentMenu)
         {
-            case MenuCategory.Game:
-                GamemodeOptionsUpdate(ref num);
-                break;
             case MenuCategory.Modifiers:
                 ModifiersUpdate(ref num);
                 break;
@@ -422,9 +422,15 @@ internal static class GameOptionsMenuPatch
                 CustomMenuTwoUpdate(ref num);
                 break;
             default:
+                if (MenuState.Instance.CurrentModIdx == 0)
+                {
+                    num = -1.217f;
+                    GamemodeOptionsUpdate(ref num);
+                    break;
+                }
                 var filteredGroups =
                     MenuState.Instance.CurrentMod.InternalOptionGroups
-                        .Where(x => x.OptionableType == null &&
+                        .Where(x => (x.OptionableType == null || CustomGameModeManager.ActiveMode!.GetType().IsAssignableTo(x.OptionableType)) &&
                                     x.ParentMenu == MenuCategory.Game) ?? [];
 
                 foreach (var group in filteredGroups)

MiraAPI/Patches/Options/MenuState.cs

@@ -63,6 +63,8 @@ public class MenuState(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
     [HideFromIl2Cpp]
     internal Dictionary<int, bool> FinishedRoleMenus { get; } = [];
+    [HideFromIl2Cpp]
+    internal Dictionary<int, bool> QueuedRoleMenuRefresh { get; } = [];
 
     public void Awake()
     {

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -75,7 +75,24 @@ public static class RoleSettingMenuPatches
             dividerImage.gameObject.SetActive(false);
         }
 
-        if (MenuState.Instance.FinishedRoleMenus.TryGetValue(MenuState.Instance.CurrentModIdx, out var finished) && finished)
+        var queuedRefresh = false;
+        if (MenuState.Instance.QueuedRoleMenuRefresh.TryGetValue(MenuState.Instance.CurrentModIdx, out var queued) && queued)
+        {
+            queuedRefresh = true;
+            var roleOptionSettings = roleMenu.scrollBar.Inner.GetComponentsInChildren<RoleOptionSetting>(true);
+            var headers = roleMenu.scrollBar.Inner.GetComponentsInChildren<CategoryHeaderMasked>(true);
+            foreach (var child in roleOptionSettings)
+            {
+                Object.Destroy(child.gameObject);
+            }
+            foreach (var child in headers)
+            {
+                Object.Destroy(child.gameObject);
+            }
+            yield return new WaitForEndOfFrame();
+            MenuState.Instance.QueuedRoleMenuRefresh[MenuState.Instance.CurrentModIdx] = false;
+        }
+        if (!queuedRefresh && MenuState.Instance.FinishedRoleMenus.TryGetValue(MenuState.Instance.CurrentModIdx, out var finished) && finished)
         {
             var roleOptionSettings = roleMenu.scrollBar.Inner.GetComponentsInChildren<RoleOptionSetting>(true);
             foreach (var r in roleOptionSettings)
@@ -154,6 +171,17 @@ public static class RoleSettingMenuPatches
                 ScrollerNum = 0.522f;
 
                 var num4 = 0;
+                var roleOptionSettings = roleMenu.scrollBar.Inner.GetComponentsInChildren<RoleOptionSetting>(false);
+                var headers = roleMenu.scrollBar.Inner.GetComponentsInChildren<CategoryHeaderMasked>(false);
+                foreach (var child in roleOptionSettings)
+                {
+                    Object.Destroy(child.gameObject);
+                }
+                foreach (var child in headers)
+                {
+                    Object.Destroy(child.gameObject);
+                }
+                yield return new WaitForEndOfFrame();
 
                 var roleGroups = MenuState.Instance.CurrentMod.InternalRoles.Values.OfType<ICustomRole>()
                     .ToLookup(x => x.RoleOptionsGroup);
@@ -308,6 +336,7 @@ public static class RoleSettingMenuPatches
                                     RoleGroupHidden[group] = !groupHidden;
                                 }
 
+                                MenuState.Instance.QueuedRoleMenuRefresh[MenuState.Instance.CurrentModIdx] = false;
                                 MenuState.Instance.FinishedRoleMenus[MenuState.Instance.CurrentModIdx] = false;
 
                                 foreach (var child in roleMenu.RoleChancesSettings.transform)
@@ -327,6 +356,7 @@ public static class RoleSettingMenuPatches
                     }
                 }
             }
+            MenuState.Instance.QueuedRoleMenuRefresh[MenuState.Instance.CurrentModIdx] = false;
             MenuState.Instance.FinishedRoleMenus[MenuState.Instance.CurrentModIdx] = true;
         }
 
@@ -517,6 +547,26 @@ public static class RoleSettingMenuPatches
         CurrentRoleOptions = filteredOptions;
     }
 
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(RolesSettingsMenu.ChangeTab))]
+    public static void ChangeTabPatch(RolesSettingsMenu __instance)
+    {
+        var categoryHeaderMasked = __instance.AdvancedRolesSettings.transform.Find("CategoryHeaderMasked").GetComponent<CategoryHeaderMasked>();
+        categoryHeaderMasked.Title.text = TranslationController.Instance.GetString(StringNames.RoleSettingsLabel);
+        var labelBg = __instance.AdvancedRolesSettings.transform.FindChild("InfoLabelBackground");
+        var imgBg = __instance.AdvancedRolesSettings.transform.FindChild("Imagebackground");
+        imgBg.gameObject.SetActive(true);
+        __instance.roleScreenshot.gameObject.SetActive(true);
+        __instance.roleDescriptionText.transform.parent.localPosition = new Vector3(2.5176f, -0.2731f, -1f);
+        __instance.roleDescriptionText.transform.parent.localScale = new Vector3(0.0675f, 0.1494f, 0.5687f);
+        labelBg.transform.localPosition = new Vector3(1.082f, 0.1054f, -2.5f);
+        __instance.roleScreenshot.drawMode = SpriteDrawMode.Simple;
+        foreach (var optBehaviour in __instance.AdvancedRolesSettings.GetComponentsInChildren<OptionBehaviour>())
+        {
+            optBehaviour.gameObject.Destroy();
+        }
+    }
+
     private static void ChangeTab(RoleBehaviour role, RolesSettingsMenu __instance)
     {
         if (role is not ICustomRole customRole)
@@ -546,12 +596,8 @@ public static class RoleSettingMenuPatches
             __instance.roleDescriptionText.transform.parent.localScale = new Vector3(0.0675f, 0.1494f, 0.5687f);
             labelBg.transform.localPosition = new Vector3(1.082f, 0.1054f, -2.5f);
 
-            __instance.roleScreenshot.sprite = Sprite.Create(
-                role.RoleScreenshot.texture,
-                new Rect(0, 0, 370, 230),
-                Vector2.one / 2,
-                100);
-            __instance.roleScreenshot.drawMode = SpriteDrawMode.Sliced;
+            __instance.roleScreenshot.sprite = role.RoleScreenshot;
+            __instance.roleScreenshot.drawMode = SpriteDrawMode.Simple;
         }
 
         __instance.roleHeaderSprite.color = customRole.OptionsMenuColor;

MiraAPI/Patches/Voting/MeetingHudPatches.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
+using InnerNet;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Events.Vanilla.Meeting.Voting;
@@ -77,7 +78,7 @@ internal static class MeetingHudPatches
     [HarmonyPatch(nameof(MeetingHud.Update))]
     public static void ForceSkipPatch(MeetingHud __instance)
     {
-        if (__instance.state is not (MeetingHud.VoteStates.NotVoted or MeetingHud.VoteStates.Voted))
+        if (__instance.state is not (MeetingHud.MeetingStates.NotVoted or MeetingHud.MeetingStates.Voted))
         {
             return;
         }
@@ -127,13 +128,13 @@ internal static class MeetingHudPatches
             return false;
         }
 
-        var playerVoteArea = __instance.playerStates.First(pv => pv.TargetPlayerId == pc.PlayerId);
+        var playerVoteArea = __instance.playerStates.First(pv => pv.PlayerId == pc.PlayerId);
         playerVoteArea.AmDead = true;
         playerVoteArea.Overlay.gameObject.SetActive(true);
 
         foreach (var player in Helpers.GetAlivePlayers())
         {
-            var pva = __instance.playerStates.First(pv => pv.TargetPlayerId == player.PlayerId);
+            var pva = __instance.playerStates.First(pv => pv.PlayerId == player.PlayerId);
             var voteData = player.GetVoteData();
 
             if (pva.AmDead || !voteData.VotedFor(pc.PlayerId))
@@ -150,7 +151,7 @@ internal static class MeetingHudPatches
         __instance.SetDirtyBit(1U);
         __instance.CheckForEndVoting();
 
-        if (__instance.state == MeetingHud.VoteStates.Results)
+        if (__instance.state == MeetingHud.MeetingStates.Results)
         {
             __instance.SetupProceedButton();
         }
@@ -199,7 +200,7 @@ internal static class MeetingHudPatches
             })
         ]);
 
-        __instance.RpcVotingComplete(voterStates, exiled, isTie);
+        __instance.RpcVotingComplete(voterStates, exiled, isTie, @event.OverruledVote, @event.OverruledNonce);
         return false;
     }
 
@@ -223,6 +224,16 @@ internal static class MeetingHudPatches
         return false;
     }
 
+    // TODO: figure out a way to do host-authorization since right now any player can send RpcQueueOverruleVotes
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.CmdQueueOverruleVotes))]
+    // Although this method is inlined in MeetingHud.Confirm, the next patch fixes that.
+    public static bool CmdQueueOverruleVotesPatch(MeetingHud __instance, PlayerId judgePlayerId, PlayerId targetPlayerId, ushort overruleNonce)
+    {
+        VotingUtils.RpcQueueOverruleVotes(PlayerControl.LocalPlayer, judgePlayerId.Value, targetPlayerId.Value, overruleNonce);
+        return false;
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(MeetingHud.Confirm))]
     public static bool ConfirmPatch(MeetingHud __instance, [HarmonyArgument(0)] byte suspect)

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -250,6 +250,8 @@ public sealed class MiraPluginManager
         {
             // Save all buttons into a read-only collection for easy access
             CustomButtonManager.Buttons = new ReadOnlyCollection<CustomActionButton>(CustomButtonManager.CustomButtons);
+            CustomButtonManager.EventTypes = new ReadOnlyDictionary<Type, Type>(CustomButtonManager.ButtonEventTypes);
+            CustomButtonManager.CancelledEventTypes = new ReadOnlyDictionary<Type, Type>(CustomButtonManager.ButtonCancelledEventTypes);
 
             // Cache all the registered plugins into an array for easy access
             RegisteredPlugins = [.. _registeredPlugins.Values];

MiraAPI/Roles/CustomRoleManager.cs

@@ -141,11 +141,18 @@ public static class CustomRoleManager
         roleBehaviour.CanVent = customRole.Configuration.CanUseVent || customRole.Configuration.GetsVentData;
         roleBehaviour.DefaultGhostRole = customRole.Configuration.GhostRole;
         roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount;
-        roleBehaviour.RoleScreenshot = Sprite.Create(
-            customRole.Configuration.OptionsScreenshot?.LoadAsset().texture,
-            new Rect(0, 0, 370, 230),
-            Vector2.one / 2,
-            100);
+        if (customRole.Configuration.OptionsScreenshot != null)
+        {
+            roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot.LoadAsset();
+        }
+        else
+        {
+            roleBehaviour.RoleScreenshot = Sprite.Create(
+                null,
+                new Rect(0, 0, 370, 230),
+                Vector2.one / 2,
+                100);
+        }
 
         _emptySettings ??= new(0);
         _emptyKillAnimations ??= new(0);

MiraAPI/Utilities/Assets/LoadableBundleSubAsset.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using UnityEngine;
+
+namespace MiraAPI.Utilities.Assets;
+
+/// <summary>
+/// A utility class for loading multiple assets from an <see cref="LoadableBundleSubAssetHolder"/>.
+/// </summary>
+/// <param name="name">The name of the asset.</param>
+/// <param name="assetHolder">The <see cref="LoadableBundleSubAssetHolder"/> that contains the asset.</param>
+public class LoadableBundleSubAsset(string name, LoadableBundleSubAssetHolder assetHolder) : LoadableAsset<Sprite>
+{
+    /// <summary>
+    /// Loads the asset from the <see cref="LoadableBundleSubAssetHolder"/>.
+    /// </summary>
+    /// <returns>The asset.</returns>
+    /// <exception cref="Exception">The asset did not load properly.</exception>
+    public override Sprite LoadAsset()
+    {
+        if (LoadedAsset != null)
+        {
+            return LoadedAsset;
+        }
+
+        assetHolder.TryInit();
+
+        var loadedAsset = assetHolder.SubSprites.FirstOrDefault(x => x.name == name);
+
+        if (loadedAsset == null)
+        {
+            throw new InvalidOperationException($"INVALID ASSETS: {name}");
+        }
+        LoadedAsset = loadedAsset;
+        return LoadedAsset;
+    }
+}

MiraAPI/Utilities/Assets/LoadableBundleSubAssetHolder.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Linq;
+using HarmonyLib;
+using Il2CppInterop.Runtime;
+using Reactor.Utilities.Extensions;
+using UnityEngine;
+
+namespace MiraAPI.Utilities.Assets;
+
+/// <summary>
+/// A utility class for loading multiple assets from an <see cref="AssetBundle"/>.
+/// </summary>
+public class LoadableBundleSubAssetHolder
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LoadableBundleSubAssetHolder"/> class.
+    /// </summary>
+    /// <param name="names">The name of the assets to pull from.</param>
+    /// <param name="bundle">The <see cref="AssetBundle"/> that contains the assets.</param>
+    public LoadableBundleSubAssetHolder(string[] names, AssetBundle bundle)
+    {
+        Bundle = bundle;
+        SpriteNames = names;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LoadableBundleSubAssetHolder"/> class.
+    /// </summary>
+    /// <param name="name">The name of the asset.</param>
+    /// <param name="bundle">The <see cref="AssetBundle"/> that contains the assets.</param>
+    public LoadableBundleSubAssetHolder(string name, AssetBundle bundle)
+    {
+        Bundle = bundle;
+        SpriteNames = [name];
+    }
+    internal string[] SpriteNames = [];
+    internal AssetBundle Bundle;
+    public Sprite[] SubSprites = [];
+
+    public void TryInit()
+    {
+        if (SubSprites.Length == 0)
+        {
+            var newSprites = Array.Empty<Sprite>();
+            foreach (var name in SpriteNames)
+            {
+                var loadedAssets = Bundle.LoadAssetWithSubAssets(name, Il2CppType.From(typeof(Sprite))).ToArray();
+
+                if (loadedAssets == null)
+                {
+                    throw new InvalidOperationException($"INVALID ASSETS: {name}");
+                }
+                foreach (var obj in loadedAssets)
+                {
+                    var img = obj.TryCast<Sprite>();
+                    if (img != null)
+                    {
+                        img.DontDestroy().DontUnload();
+                        newSprites = newSprites.AddToArray(img);
+                    }
+                }
+            }
+
+            SubSprites = newSprites;
+        }
+    }
+
+    /// <summary>
+    /// Unloads an asset.
+    /// </summary>
+    /// <returns>True if the asset was unloaded, false otherwise.</returns>
+    public bool UnloadAsset()
+    {
+        if (SubSprites.Length == 0)
+        {
+            return false;
+        }
+
+        foreach (var sprite in SubSprites)
+        {
+            sprite.DestroyImmediate();
+        }
+        SubSprites = [];
+        return true;
+    }
+}

MiraAPI/Utilities/Assets/TmpSpriteUtils.cs

@@ -71,8 +71,8 @@ public static class TmpSpriteUtils
         {
             name = spriteName,
             hashCode = TMP_TextUtilities.GetSimpleHashCode(spriteName),
-            x = 0,
-            y = 0,
+            x = rect.x,
+            y = rect.y,
             width = rect.width,
             height = rect.height,
             xOffset = -(rect.width / 3) + (scale - 1) * (rect.width / 2),

MiraAPI/Utilities/Extensions.cs

@@ -165,7 +165,7 @@ public static class Extensions
     /// </summary>
     /// <param name="state">The <see cref="PlayerVoteArea"/>.</param>
     /// <returns>The player's <see cref="PlayerControl"/>.</returns>
-    public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.TargetPlayerId)?.Object;
+    public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.PlayerId)?.Object;
 
     /// <summary>
     /// Gets an <see langword="int"/> representing the amount of tasks a player has left.

MiraAPI/VanillaEvents/JudgeEvents.cs

@@ -0,0 +1,28 @@
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Meeting.Voting;
+using MiraAPI.Roles;
+
+namespace MiraAPI.VanillaEvents;
+
+public static class JudgeEvents
+{
+    public static void Initialize()
+    {
+        // This is required because MiraAPI isn't an IMiraPlugin (besides in the gamemodes branch)
+        MiraEventManager.RegisterEventHandler<ProcessVotesEvent>(@event => ProcessVotesEventHandler(@event), -1000);
+    }
+
+    public static void ProcessVotesEventHandler(ProcessVotesEvent @event)
+    {
+        if (MeetingHud.Instance.TryGetWinningOverrule(out var judgeOverrule, out var networkedPlayerInfo, out var networkedPlayerInfo2))
+        {
+            Error("Judge has overruled votes!");
+            @event.OverruledVote = true;
+            @event.OverruledNonce = judgeOverrule.OverruleNonce;
+
+            @event.ExiledPlayer = networkedPlayerInfo2.Role is ICustomRole { Team: not ModdedRoleTeams.Crewmate } || networkedPlayerInfo2.Role.TeamType == RoleTeamTypes.Impostor
+                ? GameData.Instance.GetPlayerById(judgeOverrule.OverruledPlayerId)
+                : networkedPlayerInfo;
+        }
+    }
+}

MiraAPI/Voting/VotingUtils.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using InnerNet;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Meeting.Voting;
 using MiraAPI.Networking;
@@ -41,9 +42,9 @@ public static class VotingUtils
     /// <param name="voteData">The player's <see cref="PlayerVoteData"/>.</param>
     /// <param name="suspectIdx">Who the player voted for.</param>
     /// <param name="cancelVote">Whether you want the vote to commence or not.</param>
-    private static void HandleVote(PlayerVoteData voteData, byte suspectIdx, out bool cancelVote)
+    private static void HandleVote(PlayerVoteData voteData, byte suspectIdx, bool byJudge, out bool cancelVote)
     {
-        var @event = new HandleVoteEvent(voteData, suspectIdx);
+        var @event = new HandleVoteEvent(voteData, suspectIdx, byJudge);
         MiraEventManager.InvokeEvent(@event);
 
         cancelVote = @event.PreventVote;
@@ -60,7 +61,14 @@ public static class VotingUtils
             return;
         }
 
-        voteData.DecreaseRemainingVotes(1);
+        if (byJudge)
+        {
+            voteData.SetRemainingVotes(0);
+        }
+        else
+        {
+            voteData.DecreaseRemainingVotes(1);
+        }
         voteData.VoteForPlayer(suspectIdx);
     }
 
@@ -75,14 +83,14 @@ public static class VotingUtils
     {
         if (!source.IsHost()) return;
 
-        MeetingHud.Instance.playerStates.First(state => state.TargetPlayerId == voterId).UnsetVote();
+        MeetingHud.Instance.playerStates.First(state => state.PlayerId == voterId).UnsetVote();
 
         if (PlayerControl.LocalPlayer.PlayerId != voterId)
         {
             return;
         }
 
-        MeetingHud.Instance.playerStates.First(state => state.TargetPlayerId == votedFor).ThumbsDown.enabled = false;
+        MeetingHud.Instance.playerStates.First(state => state.PlayerId == votedFor).ThumbsDown.enabled = false;
 
         if (!AmongUsClient.Instance.AmHost)
         {
@@ -93,13 +101,74 @@ public static class VotingUtils
 
         foreach (var t in MeetingHud.Instance.playerStates)
         {
-            t.voteComplete = false;
+            t.VoteComplete = false;
         }
 
-        MeetingHud.Instance.SkipVoteButton.voteComplete = false;
+        MeetingHud.Instance.SkipVoteButton.VoteComplete = false;
         MeetingHud.Instance.SkipVoteButton.gameObject.SetActive(true);
     }
 
+    /// <summary>
+    /// Networks the casting of a vote. We replace the vanilla solution with a custom version that works for Judge specifically.
+    /// </summary>
+    /// <param name="source">The <see cref="PlayerControl"/> who sent this RPC.</param>
+    /// <param name="srcPlayerId">The id of the player who casted the vote.</param>
+    /// <param name="suspectPlayerId">The voted player's id.</param>
+    /// <param name="overruleNonce">Data that is checked by the Judge role to determine which Judge takes priority.</param>
+    [MethodRpc((uint)MiraRpc.QueueOverruleVotes)]
+    public static void RpcQueueOverruleVotes(PlayerControl source, byte srcPlayerId, byte suspectPlayerId, ushort overruleNonce)
+    {
+        CustomCastJudgeVote(srcPlayerId, suspectPlayerId, overruleNonce);
+    }
+
+    private static void CustomCastJudgeVote(PlayerId judgePlayerId, PlayerId targetPlayerId, ushort overruleNonce)
+    {
+        var plr = GameData.Instance.GetPlayerById(judgePlayerId.Value);
+        if (!plr) return;
+
+        var voteData = plr.Object.GetVoteData();
+        if (!voteData) return;
+
+        HandleVote(voteData, targetPlayerId.Value, true, out var cancelVote);
+
+        // Handle local behaviour for the voter (for some reason checking AmOwner does not work for host)
+        if (PlayerControl.LocalPlayer.PlayerId == judgePlayerId.Value)
+        {
+            if (!cancelVote) SoundManager.Instance.PlaySound(MeetingHud.Instance.VoteLockinSound, false);
+
+            foreach (var playerVoteArea in MeetingHud.Instance.playerStates)
+            {
+                playerVoteArea.ClearButtons();
+            }
+
+            MeetingHud.Instance.SkipVoteButton.ClearButtons();
+
+            var localVoteData = PlayerControl.LocalPlayer.GetVoteData();
+            if (!localVoteData || localVoteData.VotesRemaining != 0) return;
+
+            MeetingHud.Instance.SkipVoteButton.VoteComplete = true;
+            MeetingHud.Instance.SkipVoteButton.gameObject.SetActive(false);
+        }
+
+        if (cancelVote) return;
+
+        // If player has no more votes, then make it show that the player has used all their votes.
+        if (voteData.VotesRemaining == 0)
+        {
+            MeetingHud.Instance.AddOrUpdateJudgeOverrule(judgePlayerId, targetPlayerId, overruleNonce);
+            MeetingHud.Instance.playerStates.First(x => x.PlayerId == judgePlayerId.Value).SetVote(targetPlayerId.Value);
+        }
+
+        // If host, then check end voting, and set votes/send chat if applicable
+        if (!PlayerControl.LocalPlayer.IsHost()) return;
+
+        MeetingHud.Instance.SetDirtyBit(1U);
+        MeetingHud.Instance.CheckForEndVoting();
+
+        if (voteData.VotesRemaining != 0) return;
+        PlayerControl.LocalPlayer.RpcSendChatNote(judgePlayerId.Value, ChatNoteTypes.DidVote);
+    }
+
     /// <summary>
     /// Networks the casting of a vote. We replace the vanilla solution with a custom version that works for the use case.
     /// </summary>
@@ -120,7 +189,7 @@ public static class VotingUtils
         var voteData = plr.Object.GetVoteData();
         if (!voteData) return;
 
-        HandleVote(voteData, suspectPlayerId, out var cancelVote);
+        HandleVote(voteData, suspectPlayerId, false, out var cancelVote);
 
         // Handle local behaviour for the voter (for some reason checking AmOwner does not work for host)
         if (PlayerControl.LocalPlayer.PlayerId == srcPlayerId)
@@ -137,7 +206,7 @@ public static class VotingUtils
             var localVoteData = PlayerControl.LocalPlayer.GetVoteData();
             if (!localVoteData || localVoteData.VotesRemaining != 0) return;
 
-            MeetingHud.Instance.SkipVoteButton.voteComplete = true;
+            MeetingHud.Instance.SkipVoteButton.VoteComplete = true;
             MeetingHud.Instance.SkipVoteButton.gameObject.SetActive(false);
         }
 
@@ -146,7 +215,7 @@ public static class VotingUtils
         // If player has no more votes, then make it show that the player has used all their votes.
         if (voteData.VotesRemaining == 0)
         {
-            MeetingHud.Instance.playerStates.First(x => x.TargetPlayerId == srcPlayerId).SetVote(suspectPlayerId);
+            MeetingHud.Instance.playerStates.First(x => x.PlayerId == srcPlayerId).SetVote(suspectPlayerId);
         }
 
         // If host, then check end voting, and set votes/send chat if applicable
@@ -233,7 +302,7 @@ public static class VotingUtils
                     MeetingHud.Instance.BloopAVoteIcon(playerById, num, MeetingHud.Instance.SkippedVoting.transform);
                     num++;
                 }
-                else if (vote.Suspect == playerVoteArea.TargetPlayerId)
+                else if (vote.Suspect == playerVoteArea.PlayerId)
                 {
                     if (!delays.TryAdd(vote.Suspect, 0))
                     {