Merge pull request #52 from All-Of-Us-Mods/dev

mira api 0.2.1

.editorconfig

@@ -1,2 +1 @@
-[*.{cs,vb}]
-dotnet_diagnostic.CA1707.severity = none
+[*.{cs,vb}]

AmongUs.props

@@ -1,8 +1,8 @@
 <Project>
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.3.1" />
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.3.25" PrivateAssets="all" />
+        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.4.15" 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" />

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.2.0</VersionPrefix>
+        <VersionPrefix>0.2.1</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -6,6 +6,7 @@ using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
+using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Freezer;
@@ -19,6 +20,8 @@ public class FreezeButton : CustomActionButton<PlayerControl>
     public override int MaxUses => (int)OptionGroupSingleton<FreezerRoleSettings>.Instance.FreezeUses;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
+    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.T;
+    public override ModifierKey Modifier1 => ModifierKey.Control;
 
     protected override void OnClick()
     {

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -2,6 +2,7 @@
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities.Assets;
+using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
@@ -15,6 +16,9 @@ public class MeetingButton : CustomActionButton
     public override int MaxUses => 3;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
+    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.P;
+    public override ModifierKey Modifier1 => ModifierKey.Control;
+    public override ModifierKey Modifier2 => ModifierKey.Shift;
 
     public override bool Enabled(RoleBehaviour? role)
     {

MiraAPI.Example/Buttons/NeutralKillerButton.cs

@@ -3,6 +3,7 @@ using MiraAPI.Example.Roles;
 using MiraAPI.GameEnd;
 using MiraAPI.Hud;
 using MiraAPI.Utilities.Assets;
+using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
@@ -12,6 +13,7 @@ public class NeutralKillerButton : CustomActionButton
     public override string Name => "Win Game";
     public override float Cooldown => 0f;
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
+    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.K;
     protected override void OnClick()
     {
         CustomGameOver.Trigger<NeutralKillerGameOver>([PlayerControl.LocalPlayer.Data]);

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -5,6 +5,7 @@ using MiraAPI.GameOptions;
 using MiraAPI.Hud;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
+using Rewired;
 using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
@@ -21,7 +22,7 @@ public class TeleportButton : CustomActionButton
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
     public override Color TextOutlineColor => new Color32(221, 176, 152, 255);
     public static bool IsZoom { get; private set; }
-
+    public override KeyboardKeyCode Defaultkeybind => KeyboardKeyCode.M;
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is TeleporterRole;

MiraAPI.Example/ExampleColors.cs

@@ -6,7 +6,10 @@ namespace MiraAPI.Example;
 [RegisterCustomColors]
 public static class ExampleColors
 {
-    public static CustomColor Cerulean { get; } = new("Cerulean", new Color(0.0f, 0.48f, 0.65f));
+    public static CustomColor Cerulean { get; } = new("Cerulean", new Color(0.0f, 0.48f, 0.65f))
+    {
+        ColorBrightness = CustomColorBrightness.Lighter,
+    };
 
     public static CustomColor Rose { get; } = new("Rose", new Color(0.98f, 0.26f, 0.62f));
 

MiraAPI.Example/ExampleEventHandlers.cs

@@ -9,10 +9,7 @@ using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Example.Buttons.Freezer;
 using MiraAPI.Example.Roles;
 using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
-using TMPro;
-using UnityEngine;
 
 namespace MiraAPI.Example;
 
@@ -21,7 +18,7 @@ public static class ExampleEventHandlers
     public static void Initialize()
     {
         // You can register event handlers with the MiraEventManager class.
-        MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
+        var handle = MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
         {
             Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
         });
@@ -35,6 +32,9 @@ public static class ExampleEventHandlers
         {
             Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
         });
+
+        // You can also unregister event handlers using the handle returned from RegisterEventHandler.
+        MiraEventManager.UnregisterEventHandler(handle);
     }
 
     // If you want to add extra votes to a player, do something like this.

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,12 +1,9 @@
-using Il2CppSystem.Collections.Generic;
-using MiraAPI.Example.Options.Modifiers;
+using MiraAPI.Example.Options.Modifiers;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities.Extensions;
 using UnityEngine;
-using Random = System.Random;
 
 namespace MiraAPI.Example.Modifiers;
 

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,6 +1,4 @@
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers;
 

MiraAPI.Example/Options/ExampleOptions2.cs

@@ -10,6 +10,8 @@ public class ExampleOptions2 : AbstractOptionGroup
 
     public override uint GroupPriority => 0; // This group will be displayed first. The default value is uint.MaxValue.
 
+    public ModdedPlayerOption PlayerOption2 { get; } = new("YOU MUST CHOSE A PLAYER", false);
+    public ModdedPlayerOption PlayerOption { get; } = new("Eh whatever");
     public ModdedToggleOption ToggleOpt1 { get; } = new("Toggle Option 1", false);
 
     public ModdedToggleOption ToggleOpt2 { get; } = new("Toggle Option 2", false)

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,4 +1,5 @@
 using AmongUs.GameOptions;
+using MiraAPI.Patches.Stubs;
 using MiraAPI.Roles;
 using Reactor.Utilities;
 using TMPro;
@@ -14,6 +15,8 @@ public class ChameloenRole : CrewmateRole, ICustomRole
     public Color RoleColor => Palette.AcceptedGreen;
     public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
 
+    private bool _shouldHide;
+
     public CustomRoleConfiguration Configuration => new(this)
     {
         OptionsScreenshot = ExampleAssets.Banner,
@@ -22,35 +25,54 @@ public class ChameloenRole : CrewmateRole, ICustomRole
 
     public override void Initialize(PlayerControl player)
     {
-        Player = player;
-        Logger<ExamplePlugin>.Error("Initializing ChamelonRole for player: " + player.PlayerId);
+        Logger<ExamplePlugin>.Info("Initializing ChamelonRole for player: " + player.PlayerId);
+        RoleBehaviourStubs.Initialize(this, player);
+        _shouldHide = true;
     }
 
-    public void PlayerControlFixedUpdate(PlayerControl playerControl)
+    public void FixedUpdate()
     {
-        if (playerControl.MyPhysics.Velocity.magnitude > 0)
+        if (!Player || !_shouldHide)
         {
-            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            TextMeshPro tmp = playerControl.cosmetics.nameText;
+            return;
+        }
+
+        if (Player.MyPhysics.Velocity.magnitude > 0)
+        {
+            var rend = Player.cosmetics.currentBodySprite.BodySprite;
+            var tmp = Player.cosmetics.nameText;
             tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, 1), Time.deltaTime * 4f);
             rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
 
-            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
+            foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
             {
                 cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, 1), Time.deltaTime * 4f);
             }
         }
         else
         {
-            SpriteRenderer rend = playerControl.cosmetics.currentBodySprite.BodySprite;
-            TextMeshPro tmp = playerControl.cosmetics.nameText;
-            tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
-            rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+            SpriteRenderer rend = Player.cosmetics.currentBodySprite.BodySprite;
+            TextMeshPro tmp = Player.cosmetics.nameText;
+            tmp.color = Color.Lerp(tmp.color, new Color(tmp.color.r, tmp.color.g, tmp.color.b, Player.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+            rend.color = Color.Lerp(rend.color, new Color(1, 1, 1, Player.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
 
-            foreach (var cosmetic in playerControl.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
+            foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>())
             {
-                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, playerControl.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
+                cosmetic.color = Color.Lerp(cosmetic.color, new Color(1, 1, 1, Player.AmOwner ? 0.3f : 0), Time.deltaTime * 4f);
             }
         }
     }
+
+    public override void Deinitialize(PlayerControl targetPlayer)
+    {
+        Logger<ExamplePlugin>.Info("Deinitializing ChamelonRole for player: " + targetPlayer.PlayerId);
+        RoleBehaviourStubs.Deinitialize(this, targetPlayer);
+        _shouldHide = false;
+        foreach (var cosmetic in Player.cosmetics.transform.GetComponentsInChildren<SpriteRenderer>(true))
+        {
+            cosmetic.color = Color.white;
+        }
+        Player.cosmetics.currentBodySprite.BodySprite.color = Color.white;
+        Player.cosmetics.nameText.color = Color.white;
+    }
 }

MiraAPI/Colors/CustomColor.cs

@@ -13,19 +13,24 @@ namespace MiraAPI.Colors;
 public sealed class CustomColor(StringNames name, Color32 mainColor, Color32 shadowColor)
 {
     /// <summary>
-    /// Gets the main color.
+    /// Gets or sets the main color.
     /// </summary>
-    public Color32 MainColor { get; } = mainColor;
+    public Color32 MainColor { get; set; } = mainColor;
 
     /// <summary>
-    /// Gets the shadow color.
+    /// Gets or sets the shadow color.
     /// </summary>
-    public Color32 ShadowColor { get; } = shadowColor;
+    public Color32 ShadowColor { get; set; } = shadowColor;
 
     /// <summary>
-    /// Gets the name of the color.
+    /// Gets or sets the name of the color.
     /// </summary>
-    public StringNames Name { get; } = name;
+    public StringNames Name { get; set; } = name;
+
+    /// <summary>
+    /// Gets or sets whether the color is lighter or darker. Can be used to help with colorblind stuff.
+    /// </summary>
+    public CustomColorBrightness ColorBrightness { get; set; } = CustomColorBrightness.Darker;
 
     /// <inheritdoc />
     public CustomColor(StringNames name, Color32 mainColor) : this(name, mainColor, mainColor.GetShadowColor(60))
@@ -42,3 +47,19 @@ public sealed class CustomColor(StringNames name, Color32 mainColor, Color32 sha
     {
     }
 }
+
+/// <summary>
+/// Can be used to help with colorblind stuff.
+/// </summary>
+public enum CustomColorBrightness
+{
+    /// <summary>
+    /// A lighter color.
+    /// </summary>
+    Lighter,
+
+    /// <summary>
+    /// A darker color.
+    /// </summary>
+    Darker,
+}

MiraAPI/Events/MiraEventHandle.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace MiraAPI.Events;
+
+/// <summary>
+/// Event handle to use when unregistering an event.
+/// </summary>
+public class MiraEventHandle
+{
+    /// <summary>
+    /// Gets the type of event.
+    /// </summary>
+    public Type EventType { get; }
+
+    internal MiraEventWrapper EventWrapper { get; }
+
+    internal MiraEventHandle(Type type, MiraEventWrapper eventWrapper)
+    {
+        EventType = type;
+        EventWrapper = eventWrapper;
+    }
+}

MiraAPI/Events/MiraEventManager.cs

@@ -28,7 +28,14 @@ public static class MiraEventManager
 
         foreach (var handler in handlers)
         {
-            ((Action<T>)handler.EventHandler).Invoke(eventInstance);
+            try
+            {
+                ((Action<T>)handler.EventHandler).Invoke(eventInstance);
+            }
+            catch (Exception ex)
+            {
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {typeof(T).Name}: {ex.ToString()}");
+            }
         }
 
         return true;
@@ -50,7 +57,14 @@ public static class MiraEventManager
 
         foreach (var handler in handlers)
         {
-            handler.EventHandler.DynamicInvoke(eventInstance);
+            try
+            {
+                handler.EventHandler.DynamicInvoke(eventInstance);
+            }
+            catch (Exception ex)
+            {
+                Logger<MiraApiPlugin>.Error($"Error invoking event handler for {type.Name}: {ex.ToString()}");
+            }
         }
 
         return true;
@@ -62,12 +76,12 @@ public static class MiraEventManager
     /// <param name="type">The type of event.</param>
     /// <param name="methodInfo">The MethodInfo of the event handler.</param>
     /// <param name="priority">The priority of the event handler. Lower values are called first.</param>
-    public static void RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
+    /// <returns>An event handle to use when unregistering the event.</returns>
+    public static MiraEventHandle RegisterEventHandler(Type type, MethodInfo methodInfo, int priority = 0)
     {
         if (!type.IsSubclassOf(typeof(MiraEvent)))
         {
-            Logger<MiraApiPlugin>.Error($"Type must be a subclass of MiraEvent: {type.FullName}");
-            return;
+            throw new InvalidOperationException($"Type must be a subclass of MiraEvent: {type.FullName}");
         }
 
         EventWrappers.TryAdd(type, []);
@@ -84,6 +98,7 @@ public static class MiraEventManager
         }
 
         handlers.Insert(index, eventWrapper);
+        return new MiraEventHandle(type, eventWrapper);
     }
 
     /// <summary>
@@ -92,7 +107,8 @@ public static class MiraEventManager
     /// <param name="handler">The callback method/handler for the event.</param>
     /// <param name="priority">The priority of the event handler. Lower values are called first.</param>
     /// <typeparam name="T">Type of event.</typeparam>
-    public static void RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
+    /// <returns>An event handle to use when unregistering the event.</returns>
+    public static MiraEventHandle RegisterEventHandler<T>(Action<T> handler, int priority = 0) where T : MiraEvent
     {
         EventWrappers.TryAdd(typeof(T), []);
 
@@ -107,5 +123,30 @@ public static class MiraEventManager
         }
 
         handlers.Insert(index, eventWrapper);
+        return new MiraEventHandle(typeof(T), eventWrapper);
+    }
+
+    /// <summary>
+    /// Unregister an event using the event handle.
+    /// </summary>
+    /// <param name="eventHandle">A handle to the event.</param>
+    /// <returns>True if the event was unregistered successfully, false otherwise.</returns>
+    public static bool UnregisterEventHandler(MiraEventHandle eventHandle)
+    {
+        if (!EventWrappers.TryGetValue(eventHandle.EventType, out var handlers))
+        {
+            return false;
+        }
+
+        if (!handlers.Remove(eventHandle.EventWrapper))
+        {
+            return false;
+        }
+
+        if (handlers.Count == 0)
+        {
+            EventWrappers.Remove(eventHandle.EventType);
+        }
+        return true;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -15,14 +15,21 @@ public class AfterMurderEvent : MiraEvent
     /// </summary>
     public PlayerControl Target { get; }
 
+    /// <summary>
+    /// Gets the player's body, if it exists.
+    /// </summary>
+    public DeadBody? DeadBody { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
     /// </summary>
     /// <param name="source">The killer.</param>
     /// <param name="target">The killed player.</param>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target)
+    /// <param name="deadBody">The player's vody, if it exists.</param>
+    public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody)
     {
         Source = source;
         Target = target;
+        DeadBody = deadBody;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/BeforeGameEndEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// Invoked before RpcEndGame is called, allowing cancellation of the game end entirely.
+/// </summary>
+public class BeforeGameEndEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets the reason for the game end.
+    /// </summary>
+    public GameOverReason Reason { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BeforeGameEndEvent"/> class.
+    /// </summary>
+    /// <param name="reason">The reason for the game end.</param>
+    public BeforeGameEndEvent(GameOverReason reason)
+    {
+        Reason = reason;
+    }
+}

MiraAPI/Events/Vanilla/Gameplay/BeforeRoundStartEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// Event invoked on IntroCutscene.OnDestroy and ExileController.WrapUp to determine if it should run the round event or not.
+/// </summary>
+public class BeforeRoundStartEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets a value indicating whether the event was triggered by the IntroCutscene or ExileController.
+    /// </summary>
+    public bool TriggeredByIntro { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BeforeRoundStartEvent"/> class.
+    /// </summary>
+    /// <param name="triggeredByIntro">Whether the event was triggered by the intro or not.</param>
+    public BeforeRoundStartEvent(bool triggeredByIntro)
+    {
+        TriggeredByIntro = triggeredByIntro;
+    }
+}

MiraAPI/Events/Vanilla/Gameplay/RoundStartEvent.cs

@@ -1,7 +1,7 @@
 namespace MiraAPI.Events.Vanilla.Gameplay;
 
 /// <summary>
-/// Start Round event, invoked on IntroCutscene.OnDestroy and ExileController.WrapUp.
+/// Start Round event, invoked on IntroCutscene.OnDestroy and ExileController.WrapUp if the event isn't cancelled.
 /// </summary>
 public class RoundStartEvent : MiraEvent
 {

MiraAPI/Events/Vanilla/Map/UpdateSystemEvent.cs

@@ -24,6 +24,7 @@ public class UpdateSystemEvent : MiraCancelableEvent
     ///  Initializes a new instance of the <see cref="UpdateSystemEvent"/> class.
     /// </summary>
     /// <param name="systemType">The SystemType being updated.</param>
+    /// <param name="player">The player that is updating the system.</param>
     /// <param name="amount">Amount to update System to.</param>
     public UpdateSystemEvent(SystemTypes systemType, PlayerControl player, byte amount)
     {

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

@@ -0,0 +1,44 @@
+using System;
+using MiraAPI.Utilities;
+using MiraAPI.Voting;
+
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// Invoked before the dummy selects their vote. If canceled, the dummy won't vote.
+/// </summary>
+public class DummyVoteEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets the dummy that needs to vote.
+    /// </summary>
+    public DummyBehaviour Dummy { get; }
+
+    /// <summary>
+    /// Gets the instance of the dummy's vote data.
+    /// </summary>
+    public PlayerVoteData VoteData { get; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the dummy can vote to skip the meeting.
+    /// </summary>
+    public bool CanSkip { get; set; }
+
+    /// <summary>
+    /// Gets or sets a predicate for validating whether the dummy can vote on a player.
+    /// By default, excludes dead and disconnected players.
+    /// </summary>
+    public Predicate<PlayerControl> PlayerIsValid { get; set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DummyVoteEvent"/> class.
+    /// </summary>
+    /// <param name="dummy">The voting dummy.</param>
+    public DummyVoteEvent(DummyBehaviour dummy)
+    {
+        Dummy = dummy;
+        VoteData = dummy.myPlayer.GetVoteData();
+        CanSkip = true;
+        PlayerIsValid = x => !x.Data.IsDead && !x.Data.Disconnected;
+    }
+}

MiraAPI/Events/Vanilla/Player/PlayerDeathEvent.cs

@@ -15,14 +15,21 @@ public class PlayerDeathEvent : MiraEvent
     /// </summary>
     public DeathReason DeathReason { get; }
 
+    /// <summary>
+    /// Gets the dead body associated with the player, if any.
+    /// </summary>
+    public DeadBody? DeadBody { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="PlayerDeathEvent"/> class.
     /// </summary>
     /// <param name="player">The player who died.</param>
     /// <param name="reason">The reason the player died.</param>
-    public PlayerDeathEvent(PlayerControl player, DeathReason reason)
+    /// <param name="deadBody">The player's body, if it exists.</param>
+    public PlayerDeathEvent(PlayerControl player, DeathReason reason, DeadBody? deadBody)
     {
         Player = player;
         DeathReason = reason;
+        DeadBody = deadBody;
     }
 }

MiraAPI/GameModes/.editorconfig

@@ -0,0 +1,2 @@
+[*.cs]
+dotnet_diagnostic.CS1591.severity = none

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -21,7 +21,7 @@ public static class CustomGameModeManager
     }
 
     /// <summary>
-    /// Current gamemode.
+    /// Gets the current gamemode.
     /// </summary>
     public static CustomGameMode? ActiveMode { get; internal set; } = new DefaultMode();
 

MiraAPI/GameOptions/IModdedOption.cs

@@ -62,9 +62,10 @@ public interface IModdedOption
     /// <param name="toggleOpt">The ToggleOption template.</param>
     /// <param name="numberOpt">The NumberOption template.</param>
     /// <param name="stringOpt">The StringOption template.</param>
+    /// <param name="playerOpt">The PlayerOption template.</param>
     /// <param name="container">>The Transform container for the option.</param>
     /// <returns>>The created OptionBehaviour object.</returns>
-    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container);
+    OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container);
 
     /// <summary>
     /// Gets the value as a float.

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using BepInEx.Configuration;
 using HarmonyLib;
 using MiraAPI.GameOptions.Attributes;
+using MiraAPI.GameOptions.OptionTypes;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
@@ -21,6 +23,7 @@ public static class ModdedOptionsManager
     private static readonly Dictionary<PropertyInfo, ModdedOptionAttribute> OptionAttributes = [];
     private static readonly Dictionary<Type, AbstractOptionGroup> TypeToGroup = [];
 
+    internal static readonly Dictionary<OptionBehaviour, ModdedPlayerOption> CreatedPlayerOptions = [];
     internal static readonly Dictionary<uint, IModdedOption> ModdedOptions = [];
     internal static readonly List<AbstractOptionGroup> Groups = [];
 
@@ -45,7 +48,9 @@ public static class ModdedOptionsManager
         pluginInfo.InternalOptionGroups.Add(group);
 
         typeof(OptionGroupSingleton<>).MakeGenericType(type)
+#pragma warning disable S3011
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
+#pragma warning restore S3011
             .SetValue(null, group);
 
         return true;
@@ -173,8 +178,10 @@ public static class ModdedOptionsManager
     /// </summary>
     /// <param name="__originalMethod">The original setter method.</param>
     /// <param name="value">The new object value.</param>
-    // ReSharper disable once InconsistentNaming
+#pragma warning disable CA1707
+    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony naming convention")]
     public static void PropertySetterPatch(MethodBase __originalMethod, object value)
+#pragma warning restore CA1707
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetSetMethod() == __originalMethod).Value;
         attribute.SetValue(value);
@@ -186,8 +193,10 @@ public static class ModdedOptionsManager
     /// <param name="__originalMethod">The original getter method.</param>
     /// <param name="__result">The result of the property getter.</param>
     /// <returns>False so the original getter gets skipped.</returns>
-    // ReSharper disable InconsistentNaming
+#pragma warning disable CA1707
+    [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony naming convention")]
     public static bool PropertyGetterPatch(MethodBase __originalMethod, ref object __result)
+#pragma warning restore CA1707
     {
         var attribute = OptionAttributes.First(pair => pair.Key.GetGetMethod() == __originalMethod).Value;
         __result = attribute.GetValue();

MiraAPI/GameOptions/ModifierOptionGroup.cs

@@ -2,7 +2,9 @@
 
 namespace MiraAPI.GameOptions;
 
+#pragma warning disable CA1852
 internal class ModifierOptionGroup : AbstractOptionGroup
+#pragma warning restore CA1852
 {
     public override string GroupName { get; }
 

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -44,7 +44,7 @@ public class ModdedEnumOption : ModdedOption<int>
     }
 
     /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
 
@@ -135,7 +135,7 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
     }
 
     /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
 

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -93,6 +93,7 @@ public class ModdedNumberOption : ModdedOption<float>
         ToggleOption toggleOpt,
         NumberOption numberOpt,
         StringOption stringOpt,
+        PlayerOption playerOpt,
         Transform container)
     {
         var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -37,6 +37,7 @@ public abstract class ModdedOption<T> : IModdedOption
         {
             if (_parentMod != null || value == null) return;
             _parentMod = value;
+
             var entry = _parentMod.GetConfigFile().Bind(ConfigDefinition, DefaultValue);
             Value = entry.Value;
         }
@@ -177,6 +178,7 @@ public abstract class ModdedOption<T> : IModdedOption
         ToggleOption toggleOpt,
         NumberOption numberOpt,
         StringOption stringOpt,
+        PlayerOption playerOpt,
         Transform container);
 
     /// <summary>

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using Il2CppSystem.Collections.Generic;
+using MiraAPI.Networking;
+using MiraAPI.Utilities;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace MiraAPI.GameOptions.OptionTypes;
+
+/// <summary>
+/// An option for selecting an ingame player. It returns an index of the values list, NOT A PLAYER ID. To get a player out of this, index the Values list.
+/// </summary>
+public class ModdedPlayerOption : ModdedOption<int>
+{
+    /// <summary>
+    /// Gets or sets the included players.
+    /// </summary>
+    public List<NetworkedPlayerInfo> Values { get; set; }
+
+    /// <summary>
+    /// Gets or sets a filter for the players included in the option.
+    /// </summary>
+    public Func<NetworkedPlayerInfo, bool>? PlayerFilter { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the option includes a "None" option. If None is selected, value will return -1.
+    /// </summary>
+    public bool AllowNone { get; set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ModdedPlayerOption"/> class.
+    /// </summary>
+    /// <param name="title">The title of the option.</param>
+    /// <param name="allowNone">Whether the option includes a none option. If None is selected, value will return -1.</param>
+    public ModdedPlayerOption(string title, bool allowNone = true) : base(title, allowNone ? -1 : 0, false)
+    {
+        Data = ScriptableObject.CreateInstance<PlayerSelectionGameSetting>();
+        var data = (PlayerSelectionGameSetting)Data;
+
+        data.Title = StringName;
+        data.Type = global::OptionTypes.Player;
+
+        Values = new List<NetworkedPlayerInfo>();
+        AllowNone = allowNone;
+        Value = DefaultValue;
+    }
+
+    /// <inheritdoc />
+    public override OptionBehaviour CreateOption(
+        ToggleOption toggleOpt,
+        NumberOption numberOpt,
+        StringOption stringOpt,
+        PlayerOption playerOpt,
+        Transform container)
+    {
+        var playerOption = Object.Instantiate(playerOpt, container);
+
+        var filteredList = GetFilteredPlayers();
+        Values = filteredList.ToIl2CppList();
+
+        playerOption.SetUpFromData(Data, 20);
+        playerOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
+
+        playerOption.Title = StringName;
+        playerOption.TitleText.text = TranslationController.Instance.GetString(StringName);
+        playerOption.Values = Values;
+        playerOption.Value = Value;
+        playerOption.playerIndex = filteredList.FindIndex(p => p.PlayerId == Value);
+
+        OptionBehaviour = playerOption;
+        ModdedOptionsManager.CreatedPlayerOptions.TryAdd(playerOption, this);
+
+        playerOption.SetValueText();
+        playerOption.AdjustButtonsActiveState();
+
+        return playerOption;
+    }
+
+    /// <summary>
+    /// Returns a player ran through the filter.
+    /// </summary>
+    /// <returns>A list of filtered players.</returns>
+    public System.Collections.Generic.List<NetworkedPlayerInfo> GetFilteredPlayers()
+    {
+        return GameData.Instance.AllPlayers.ToArray()
+            .Where(x => PlayerFilter?.Invoke(x) ?? true)
+            .ToList();
+    }
+
+    /// <summary>
+    /// Returns a player from the value. If AllowNone is enabled and none is enabled this will return null.
+    /// </summary>
+    /// <returns>A player or null if chosen none.</returns>
+    public NetworkedPlayerInfo? GetPlayerValue()
+    {
+        return Value < 0 ? null : Values[Value];
+    }
+
+    /// <inheritdoc />
+    public override float GetFloatData()
+    {
+        return Value;
+    }
+
+    /// <inheritdoc />
+    public override NetData GetNetData()
+    {
+        return new NetData(Id, BitConverter.GetBytes(Value));
+    }
+
+    /// <inheritdoc />
+    public override void HandleNetData(byte[] data)
+    {
+        SetValue(BitConverter.ToInt32(data));
+    }
+
+    /// <inheritdoc />
+    public override int GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
+    {
+        return optionBehaviour.GetInt();
+    }
+
+    /// <inheritdoc />
+    protected override void OnValueChanged(int newValue)
+    {
+        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
+        if (!OptionBehaviour)
+        {
+            return;
+        }
+
+        if (OptionBehaviour is PlayerOption opt)
+        {
+            opt.Value = newValue;
+        }
+    }
+}

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -26,7 +26,7 @@ public class ModdedToggleOption : ModdedOption<bool>
     }
 
     /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container)
+    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container);
 

MiraAPI/Hud/CustomActionButton.cs

@@ -3,7 +3,9 @@ using System.Globalization;
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
 using MiraAPI.Patches;
+using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
+using Rewired;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -36,6 +38,11 @@ public abstract class CustomActionButton
     /// </summary>
     public abstract LoadableAsset<Sprite> Sprite { get; }
 
+    /// <summary>
+    /// Gets the format string for the cooldown timer.
+    /// </summary>
+    public virtual string CooldownTimerFormatString => "0";
+
     /// <summary>
     /// Gets the button's effect duration in seconds. If the button has no effect, set to 0.
     /// </summary>
@@ -46,6 +53,28 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual int MaxUses => 0;
 
+    /// <summary>
+    /// Gets or sets the current key binding for this button.
+    /// </summary>
+    public abstract KeyboardKeyCode Defaultkeybind { get; }
+
+    /// <summary>
+    /// The first optional modifier key (e.g., Control, Shift, Alt) that must be held with the main key to activate the button.
+    /// </summary>
+    public virtual ModifierKey Modifier1 => ModifierKey.None;
+
+    /// <summary>
+    /// The second optional modifier key.
+    /// Set to <see cref="ModifierKey.None"/> if unused.
+    /// </summary>
+    public virtual ModifierKey Modifier2 => ModifierKey.None;
+
+    /// <summary>
+    /// The third optional modifier key.
+    /// Set to <see cref="ModifierKey.None"/> if unused.
+    /// </summary>
+    public virtual ModifierKey Modifier3 => ModifierKey.None;
+
     /// <summary>
     /// Gets the button's text outline color.
     /// </summary>
@@ -178,9 +207,12 @@ public abstract class CustomActionButton
 
         this.Location = location;
 
-        if (!moveButton) return;
+        if (!moveButton)
+        {
+            return;
+        }
 
-        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
+        if (HudManagerPatches.BottomLeft == null || HudManagerPatches.BottomRight == null)
         {
             return;
         }
@@ -188,17 +220,17 @@ public abstract class CustomActionButton
         switch (location)
         {
             case ButtonLocation.BottomLeft:
-                var gridArrange = HudManagerPatches._bottomLeft.GetComponent<GridArrange>();
-                var aspectPosition = HudManagerPatches._bottomLeft.GetComponent<AspectPosition>();
+                var gridArrange = HudManagerPatches.BottomLeft.GetComponent<GridArrange>();
+                var aspectPosition = HudManagerPatches.BottomLeft.GetComponent<AspectPosition>();
 
-                Button.transform.SetParent(HudManagerPatches._bottomLeft.transform);
+                Button.transform.SetParent(HudManagerPatches.BottomLeft.transform);
 
                 gridArrange.Start();
                 gridArrange.ArrangeChilds();
                 aspectPosition.AdjustPosition();
                 break;
             case ButtonLocation.BottomRight:
-                Button.transform.SetParent(HudManagerPatches._bottomRight);
+                Button.transform.SetParent(HudManagerPatches.BottomRight);
                 break;
         }
     }
@@ -435,23 +467,23 @@ public abstract class CustomActionButton
         {
             if (CanUse())
             {
-                Button.SetEnabled();
+                Button!.SetEnabled();
             }
             else
             {
-                Button.SetDisabled();
+                Button!.SetDisabled();
             }
 
             if (EffectActive)
             {
                 Button.SetFillUp(Timer, EffectDuration);
 
-                Button.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
+                Button.cooldownTimerText.text = Timer.ToString(CooldownTimerFormatString, NumberFormatInfo.InvariantInfo);
                 Button.cooldownTimerText.gameObject.SetActive(true);
             }
             else
             {
-                Button.SetCoolDown(Timer, Cooldown);
+                Button.SetCooldownFormat(Timer, Cooldown, CooldownTimerFormatString);
             }
         }
 

MiraAPI/Hud/CustomButtonManager.cs

@@ -31,7 +31,9 @@ public static class CustomButtonManager
         CustomButtons.Add(button);
         pluginInfo.InternalButtons.Add(button);
         typeof(CustomButtonSingleton<>).MakeGenericType(buttonType)
+#pragma warning disable S3011
             .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
+#pragma warning restore S3011
             .SetValue(null, button);
 
         ButtonEventTypes.Add(buttonType, typeof(MiraButtonClickEvent<>).MakeGenericType(buttonType));

MiraAPI/Hud/CustomButtonSingleton.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace MiraAPI.Hud;
 
@@ -13,7 +14,6 @@ public static class CustomButtonSingleton<T> where T : CustomActionButton
     /// <summary>
     /// Gets the instance of the button.
     /// </summary>
-#pragma warning disable CA1000
+    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "This is a utility class to get the instance of a custom action button.")]
     public static T Instance => _instance ??= CustomButtonManager.CustomButtons.OfType<T>().Single();
-#pragma warning restore CA1000
 }

MiraAPI/Hud/InputBox.cs

@@ -1,114 +0,0 @@
-using System;
-using MiraAPI.Utilities.Assets;
-using Reactor.Utilities.Attributes;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
-
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// Simple input box for user input.
-/// </summary>
-[RegisterInIl2Cpp]
-public class InputBox : MonoBehaviour
-{
-    public InputField inputField = null!;
-
-    public void CreateDialog(string title, string placeholder, string submitText, Action<string> onSubmit)
-    {
-        var canvasObj = new GameObject("DialogCanvas");
-        canvasObj.transform.SetParent(transform);
-        canvasObj.layer = LayerMask.NameToLayer("UI");
-
-        var canvas = canvasObj.AddComponent<Canvas>();
-        canvas.renderMode = RenderMode.ScreenSpaceOverlay;
-        canvas.overrideSorting = true;
-        canvas.sortingOrder = 1000; // Ensure the canvas is on top of other UI elements
-
-        canvasObj.AddComponent<CanvasScaler>().uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
-        canvasObj.AddComponent<GraphicRaycaster>();
-
-        var panelObj = new GameObject("DialogPanel");
-        panelObj.transform.SetParent(canvasObj.transform);
-        var panelRect = panelObj.AddComponent<RectTransform>();
-        var img = panelObj.AddComponent<Image>();
-
-        img.color = new Color(1, 1, 1, 0.9f);
-        img.raycastTarget = true;
-        img.sprite = MiraAssets.RoundedBox.LoadAsset();
-        img.type = Image.Type.Sliced;
-
-        panelRect.sizeDelta = new Vector2(300, 200);
-        panelRect.anchoredPosition = Vector2.zero;
-
-        var titleText = CreateText(panelObj, title);
-        titleText.alignment = TextAnchor.MiddleCenter;
-        titleText.fontSize = 26;
-        titleText.fontStyle = FontStyle.Bold;
-        titleText.color = Color.white;
-
-        var titleRect = titleText.GetComponent<RectTransform>();
-        titleRect.sizeDelta = new Vector2(280, 50);
-        titleRect.anchoredPosition = new Vector2(0, 70);
-
-        var inputObj = new GameObject("InputField");
-        inputObj.transform.SetParent(panelObj.transform);
-        var inputRect = inputObj.AddComponent<RectTransform>();
-        inputRect.sizeDelta = new Vector2(220, 40);
-        inputRect.anchoredPosition = new Vector2(0, 20);
-
-        var inputBg = inputObj.AddComponent<Image>();
-        inputBg.color = new Color(1, 1, 1, 0.8f);
-
-        inputField = inputObj.AddComponent<InputField>();
-        inputField.textComponent = CreateText(inputObj, string.Empty, 18, Color.black);
-        inputField.placeholder = CreateText(inputObj, placeholder, 18, new Color(0.5f, 0.5f, 0.5f));
-
-        var buttonObj = new GameObject("SubmitButton");
-        buttonObj.transform.SetParent(panelObj.transform);
-        var button = buttonObj.AddComponent<Button>();
-        var buttonRect = buttonObj.AddComponent<RectTransform>();
-        buttonRect.sizeDelta = new Vector2(150, 50);
-        buttonRect.anchoredPosition = new Vector2(0, -50);
-
-        var buttonImg = buttonObj.AddComponent<Image>();
-        buttonImg.color = new Color(1f, 1f, 1f, 1f);
-        buttonImg.sprite = MiraAssets.RoundedBox.LoadAsset();
-        buttonImg.type = Image.Type.Sliced;
-
-        var buttonText = CreateText(buttonObj, submitText, 20, Color.white);
-        buttonText.alignment = TextAnchor.MiddleCenter;
-
-        var colors = button.colors;
-        colors.highlightedColor = Color.green;
-        colors.pressedColor = MiraAssets.AcceptedTeal;
-        button.colors = colors;
-
-        button.onClick.AddListener((UnityAction)(() =>
-        {
-            onSubmit(inputField.text);
-            DestroyImmediate(canvasObj);
-        }));
-
-        inputField.ActivateInputField();
-    }
-
-    private static Text CreateText(GameObject parent, string textContent = "", int fontSize = 20, Color? textColor = null, Font? font = null)
-    {
-        var textObj = new GameObject("Text");
-        textObj.transform.SetParent(parent.transform);
-
-        var text = textObj.AddComponent<Text>();
-        text.font = font ?? Resources.GetBuiltinResource<Font>("Arial.ttf");
-        text.text = textContent;
-        text.color = textColor ?? Color.white;
-        text.fontSize = fontSize;
-        text.alignment = TextAnchor.MiddleCenter;
-
-        var rect = textObj.GetComponent<RectTransform>();
-        rect.sizeDelta = new Vector2(200, 40);
-        rect.anchoredPosition = Vector2.zero;
-        return text;
-    }
-}

MiraAPI/Keybinds/KeybindManager.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using Rewired;
+
+namespace MiraAPI.Keybinds
+{
+    /// <summary>
+    /// Lets you register and manage mod keybinds with conflict checks and rebinding support.
+    /// </summary>
+    public static class KeybindManager
+    {
+        /// <summary>
+        /// Stores all info for a registered keybind.
+        /// </summary>
+        public class KeybindEntry
+        {
+            /// <summary>Unique identifier for this keybind.</summary>
+            public string Id;
+
+            /// <summary>Text shown in the Among Us rebinding menu to describe this keybind.</summary>
+            public string Description;
+
+            /// <summary>
+            /// The method that runs when this keybind is pressed.
+            /// </summary>
+            public Action Handler;
+
+            /// <summary>
+            /// The key currently assigned to this keybind.
+            /// </summary>
+            public KeyboardKeyCode Key;
+
+            /// <summary>
+            /// If true, this keybind will be checked for conflicts with other exclusive keybinds using the same key.
+            /// </summary>
+            public bool Exclusive;
+
+            /// <summary>
+            /// The first optional modifier key (e.g., Control, Shift, Alt) that must be held with the main key.
+            /// </summary>
+            public ModifierKey Modifier1 = ModifierKey.None;
+
+            /// <summary>
+            /// The second optional modifier key, if needed. Set to <c>ModifierKey.None</c> if unused.
+            /// </summary>
+            public ModifierKey Modifier2 = ModifierKey.None;
+
+            /// <summary>
+            /// The third optional modifier key, if needed. Set to <c>ModifierKey.None</c> if unused.
+            /// </summary>
+            public ModifierKey Modifier3 = ModifierKey.None;
+        }
+
+        private static readonly List<KeybindEntry> Registered = new();
+
+        /// <summary>
+        /// Registers a new mod keybind.
+        /// </summary>
+        /// <param name="id">Unique identifier for the keybind.</param>
+        /// <param name="description">Description to display in UI.</param>
+        /// <param name="key">Default key to use if no rebind exists.</param>
+        /// <param name="handler">Method to invoke when the keybind is pressed.</param>
+        /// <param name="exclusive">If true, conflicts with other exclusive keybinds on the same key.</param>
+        /// <param name="modifier1">Optional first modifier key (e.g., <c>Control</c>, <c>Shift</c>, <c>Alt</c>) that must be held with the main key.</param>
+        /// <param name="modifier2">Optional second modifier key. Use <c>ModifierKey.None</c> if unused.</param>
+        /// <param name="modifier3">Optional third modifier key. Use <c>ModifierKey.None</c> if unused.</param>
+        /// <returns> Returns the key that was registered for this keybind. </returns>
+        public static KeyboardKeyCode Register(string id, string description, KeyboardKeyCode key, Action handler, bool exclusive = true, ModifierKey modifier1 = ModifierKey.None, ModifierKey modifier2 = ModifierKey.None, ModifierKey modifier3 = ModifierKey.None)
+        {
+            Registered.Add(new KeybindEntry
+            {
+                Id = id,
+                Description = description,
+                Key = key,
+                Handler = handler,
+                Exclusive = exclusive,
+                Modifier1 = modifier1,
+                Modifier2 = modifier2,
+                Modifier3 = modifier3,
+            });
+
+            return key;
+        }
+
+        /// <summary>
+        /// Returns all conflicts where exclusive keybinds use the same key.
+        /// </summary>
+        /// <returns>A list of pairs of keybinds that conflict.</returns>
+        public static List<(KeybindEntry, KeybindEntry)> GetConflicts()
+        {
+            var conflicts = new List<(KeybindEntry, KeybindEntry)>();
+            for (int i = 0; i < Registered.Count; i++)
+            {
+                for (int j = i + 1; j < Registered.Count; j++)
+                {
+                    var a = Registered[i];
+                    var b = Registered[j];
+                    if (a.Key == b.Key && a.Exclusive && b.Exclusive)
+                    {
+                        conflicts.Add((a, b));
+                    }
+                }
+            }
+            return conflicts;
+        }
+
+        /// <summary>
+        /// Returns all currently registered keybind entries.
+        /// </summary>
+        /// <returns>A list of all registered keybind entries.</returns>
+        public static List<KeybindEntry> GetEntries()
+        {
+            return Registered;
+        }
+    }
+}

MiraAPI/MiraApiConfig.cs

@@ -0,0 +1,23 @@
+using BepInEx;
+using BepInEx.Configuration;
+using BepInEx.Unity.IL2CPP;
+using HarmonyLib;
+using MiraAPI.PluginLoading;
+using Reactor;
+using Reactor.Networking;
+using Reactor.Networking.Attributes;
+using Reactor.Utilities;
+using UnityEngine;
+
+namespace MiraAPI;
+
+/// <summary>
+/// Mira API Config File Handler
+/// </summary>
+public class MiraApiConfig(ConfigFile config)
+{
+    /// <summary>
+    /// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
+    /// </summary>
+    public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Displays", "Show Modifiers HUD on Left Side", false);
+}

MiraAPI/MiraApiPlugin.cs

@@ -30,6 +30,10 @@ public partial class MiraApiPlugin : BasePlugin
     /// </summary>
     public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
 
+    /// <summary>
+    /// Gets the Mira Api Config Handler.
+    /// </summary>
+    public MiraApiConfig? MiraConfig { get; private set; }
     private static MiraPluginManager? PluginManager { get; set; }
     internal Harmony Harmony { get; } = new(Id);
 
@@ -40,6 +44,7 @@ public partial class MiraApiPlugin : BasePlugin
 
         ReactorCredits.Register("Mira API", Version, true, ReactorCredits.AlwaysShow);
 
+        MiraConfig = new MiraApiConfig(Config);
         PluginManager = new MiraPluginManager();
         PluginManager.Initialize();
     }

MiraAPI/Modifiers/BaseModifier.cs

@@ -64,6 +64,11 @@ public abstract class BaseModifier : IOptionable
     /// </summary>
     public virtual bool ShowInFreeplay => false;
 
+    /// <summary>
+    /// Gets a value indicating the color that should be used for the modifier within freeplay.
+    /// </summary>
+    public virtual Color FreeplayFileColor => Color.gray;
+
     /// <summary>
     /// Gets a value indicating whether the modifier is unique. If true, the player can only have one instance of this modifier.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -3,14 +3,12 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Text;
 using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
+using MiraAPI.Patches.Roles;
 using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
-using TMPro;
 using UnityEngine;
 
 namespace MiraAPI.Modifiers;
@@ -72,7 +70,15 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         foreach (var modifier in _toRemove.ToArray())
         {
             _toRemove.Remove(modifier);
-            modifier.OnDeactivate();
+            try
+            {
+                modifier.OnDeactivate();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while deactivating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
+
             Modifiers.Remove(modifier);
         }
 
@@ -82,7 +88,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
             modifier.Initialized = true;
-            modifier.OnActivate();
+            try
+            {
+                modifier.OnActivate();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while activating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
 
             if (modifier is TimedModifier { AutoStart: true } timer)
             {
@@ -102,12 +115,30 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         foreach (var modifier in ActiveModifiers)
         {
-            modifier.FixedUpdate();
+            try
+            {
+                modifier.FixedUpdate();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while (fixed) updating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
         }
 
         if (_player.AmOwner && ModifierDisplay && HudManager.InstanceExists)
         {
-            ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
+            var taskPanelOpen = HudManager.Instance.TaskPanel.open;
+            var roleTabOpen = HudManagerPatches.RoleTab != null && HudManagerPatches.RoleTab.open;
+            var leftSideHud = PluginSingleton<MiraApiPlugin>.Instance.MiraConfig!.ModifiersHudLeftSide.Value;
+
+            if (leftSideHud && (taskPanelOpen || roleTabOpen))
+            {
+                ModifierDisplay!.gameObject.SetActive(false);
+            }
+            else
+            {
+                ModifierDisplay!.gameObject.SetActive(MeetingHud.Instance || HudManager.Instance.TaskPanel.isActiveAndEnabled);
+            }
         }
     }
 
@@ -115,7 +146,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         foreach (var modifier in ActiveModifiers)
         {
-            modifier.Update();
+            try
+            {
+                modifier.Update();
+            }
+            catch (Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Error while updating modifier {modifier.ModifierName}: {e.ToString()}");
+            }
         }
     }
 

MiraAPI/Modifiers/ModifierDisplay/ModifierDisplayComponent.cs

@@ -1,9 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.Patches.Roles;
 using MiraAPI.Utilities.Assets;
+using Reactor.Utilities;
 using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
 using TMPro;
@@ -17,7 +20,7 @@ namespace MiraAPI.Modifiers.ModifierDisplay;
 /// The code used to display Mira modifiers.
 /// </summary>
 [RegisterInIl2Cpp]
-public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
+public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 {
     /// <summary>
     /// Gets the instance of the Modifier Display.
@@ -34,8 +37,8 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
     private PassiveButton _nextButton = null!;
     private PassiveButton _backButton = null!;
 
-    private int _currentPage = 0;
-    private const int _itemsPerPage = 3;
+    private int _currentPage;
+    private const int ItemsPerPage = 3;
 
     private readonly Dictionary<BaseModifier, ModifierUiComponent> _modifiers = [];
 
@@ -94,6 +97,16 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
 
         IsOpen = false;
         _children.gameObject.SetActive(false);
+
+        if (PluginSingleton<MiraApiPlugin>.Instance.MiraConfig!.ModifiersHudLeftSide.Value)
+        {
+            var aspect = GetComponent<AspectPosition>();
+            _toggleButton.transform.localPosition = new Vector3(-1f, 2.7f, 0f);
+            _children.transform.localPosition = new Vector3(-0.2f, -0.05f, 0f);
+            aspect.Alignment = AspectPosition.EdgeAlignments.LeftTop;
+            aspect.DistanceFromEdge = new Vector3(1.8f, 2.55f, -20f);
+            aspect.AdjustPosition();
+        }
     }
 
     /// <summary>
@@ -109,7 +122,16 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
     /// </summary>
     public void ToggleTab()
     {
-        IsOpen = !IsOpen;
+        SetOpened(!IsOpen);
+    }
+
+    /// <summary>
+    /// Use this to set the visibility of the modifiers tab.
+    /// </summary>
+    /// <param name="val">Whether it should be visible or not.</param>
+    public void SetOpened(bool val)
+    {
+        IsOpen = val;
         _children.gameObject.SetActive(IsOpen);
         RefreshModifiers();
     }
@@ -118,7 +140,6 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
     {
         _modifiers.Remove(component.Modifier!);
         component.gameObject.DestroyImmediate();
-
         RefreshModifiers();
     }
 
@@ -142,10 +163,10 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
 
     private void UpdatePage()
     {
-        var totalPages = Mathf.CeilToInt((float)_modifiers.Count / _itemsPerPage);
+        var totalPages = Mathf.CeilToInt((float)_modifiers.Count / ItemsPerPage);
         _currentPage = Mathf.Clamp(_currentPage, 0, Mathf.Max(0, totalPages - 1));
 
-        if (_modifiers.Count <= _itemsPerPage)
+        if (_modifiers.Count <= ItemsPerPage)
         {
             _modifiers.Do(x => x.Value.gameObject.SetActive(true));
             _pagination.gameObject.SetActive(false);
@@ -162,8 +183,8 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
         _backButton.gameObject.SetActive(true);
 
         _modifiers.Do(x => x.Value.gameObject.SetActive(false));
-        var start = _currentPage * _itemsPerPage;
-        var end = Mathf.Min(start + _itemsPerPage, _modifiers.Count);
+        var start = _currentPage * ItemsPerPage;
+        var end = Mathf.Min(start + ItemsPerPage, _modifiers.Count);
         var modifiers = _modifiers.ToArray();
 
         for (var i = start; i < end; i++)
@@ -194,13 +215,7 @@ public class ModifierDisplayComponent(nint ptr) : MonoBehaviour(ptr)
 
         _toggleBtnText.text = $"Modifiers ({filteredModifiers.Count})";
 
-        if (filteredModifiers.Count == 0)
-        {
-            _toggleButton.gameObject.SetActive(false);
-            return;
-        }
-
-        _toggleButton.gameObject.SetActive(true);
+        _toggleButton.gameObject.SetActive(filteredModifiers.Count != 0);
 
         foreach (var mod in modifiersToAdd)
         {

MiraAPI/Modifiers/ModifierDisplay/ModifierUiComponent.cs

@@ -9,7 +9,7 @@ namespace MiraAPI.Modifiers.ModifierDisplay;
 /// The code placed on every Modifier HUD object. Used to handle updating.
 /// </summary>
 [RegisterInIl2Cpp]
-public class ModifierUiComponent(nint ptr) : MonoBehaviour(ptr)
+public class ModifierUiComponent(nint cppPtr) : MonoBehaviour(cppPtr)
 {
     /// <summary>
     /// Gets the modifier which this component is for.
@@ -17,12 +17,13 @@ public class ModifierUiComponent(nint ptr) : MonoBehaviour(ptr)
     [HideFromIl2Cpp]
     public BaseModifier? Modifier { get; internal set; }
 
+    // ReSharper disable InconsistentNaming
     private SpriteRenderer modBg = null!;
     private TextMeshPro desc = null!;
     private SpriteRenderer icon = null!;
     private TextMeshPro nameText = null!;
     private RectTransform descRect = null!;
-
+    // ReSharper restore InconsistentNaming
     private void Awake()
     {
         if (Modifier == null) return;

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -30,7 +30,7 @@ public static class ModifierExtensions
         _ = ModifierManager.GetModifierType(typeId) ?? throw new InvalidOperationException(
             $"Modifier with ID {typeId} is not registered.");
 
-        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args));
+        Rpc<AddModifierRpc>.Instance.Send(target, new ModifierData(typeId, Guid.NewGuid(), args), true);
     }
 
     /// <summary>
@@ -63,7 +63,7 @@ public static class ModifierExtensions
     /// </summary>
     /// <param name="target">The player to remove the modifier from.</param>
     /// <param name="uniqueId">The unique ID of the modifier.</param>
-    [MethodRpc((uint)MiraRpc.RemoveModifier)]
+    [MethodRpc((uint)MiraRpc.RemoveModifier, SendImmediately = true)]
     public static void RpcRemoveModifier(this PlayerControl target, Guid uniqueId)
     {
         target.RemoveModifier(uniqueId);

MiraAPI/Modifiers/ModifierFactory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using MiraAPI.Utilities;
@@ -11,7 +12,7 @@ namespace MiraAPI.Modifiers;
 /// </summary>
 public static class ModifierFactory
 {
-    private static readonly Dictionary<(Type, Type[]), Func<object[], BaseModifier>> _constructorCache = [];
+    private static readonly Dictionary<(Type, Type[]), Func<object[], BaseModifier>> ConstructorCache = [];
 
     private static Func<object[], BaseModifier> CreateConstructor(Type type, params object[] args)
     {
@@ -45,13 +46,13 @@ public static class ModifierFactory
     /// <returns>An instance of the modifier.</returns>
     public static BaseModifier CreateInstance(Type type, params object[] args)
     {
-        var argTypes = args.Select(arg => arg?.GetType() ?? typeof(object)).ToArray();
+        var argTypes = args.Select(arg => arg.GetType()).ToArray();
         var key = (type, argTypes);
 
-        if (!_constructorCache.TryGetValue(key, out var constructor))
+        if (!ConstructorCache.TryGetValue(key, out var constructor))
         {
             constructor = CreateConstructor(type, args);
-            _constructorCache[key] = constructor;
+            ConstructorCache[key] = constructor;
         }
 
         return constructor(args);
@@ -95,6 +96,7 @@ public static class ModifierFactory<T> where T : BaseModifier
     /// </summary>
     /// <param name="args">Parameters for the constructor.</param>
     /// <returns>An instance of the modifier.</returns>
+    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "This is a factory class.")]
     public static T CreateInstance(params object[] args)
     {
         return Constructor(args);

MiraAPI/Modifiers/ModifierManager.cs

@@ -17,6 +17,18 @@ namespace MiraAPI.Modifiers;
 /// </summary>
 public static class ModifierManager
 {
+    /// <summary>
+    /// Gets or sets a value indicating whether modifiers should be assigned to players.
+    /// </summary>
+    public static bool MiraAssignsModifiers { get; set; } = true;
+
+    /// <summary>
+    /// Gets the list of all registered modifiers.
+    /// </summary>
+    public static IReadOnlyList<BaseModifier> Modifiers { get; internal set; } = [];
+
+    internal static List<BaseModifier> InternalModifiers { get; } = [];
+
     private static readonly Dictionary<uint, Type> IdToTypeModifierMap = [];
     private static readonly Dictionary<Type, uint> TypeToIdModifierMap = [];
     private static readonly Dictionary<int, List<uint>> PrioritiesToIdsMap = [];
@@ -76,6 +88,7 @@ public static class ModifierManager
         }
 
         info.InternalModifiers.Add(modifier);
+        InternalModifiers.Add(modifier);
 
         if (modifier is not GameModifier gameModifier)
         {
@@ -99,7 +112,11 @@ public static class ModifierManager
         return true;
     }
 
-    internal static void AssignModifiers(List<PlayerControl> plrs)
+    /// <summary>
+    /// Assigns modifiers to players. ONLY CALL THIS METHOD IF YOU KNOW WHAT YOU ARE DOING.
+    /// </summary>
+    /// <param name="plrs">The players to assign modifiers to.</param>
+    public static void AssignModifiers(List<PlayerControl> plrs)
     {
         var rand = new Random();
 
@@ -109,6 +126,7 @@ public static class ModifierManager
             .Select(x => Activator.CreateInstance(x.Value) as GameModifier)
             .OfType<GameModifier>()
             .Where(x => x.GetAmountPerGame() > 0 && x.GetAssignmentChance() > 0)
+            .Shuffle()
             .OrderByDescending(x => x.Priority())
             .ToArray();
 

MiraAPI/Networking/CustomMurderRpc.cs

@@ -264,7 +264,7 @@ public static class CustomMurderRpc
             deadBody.enabled = true;
         }
 
-        var afterMurderEvent = new AfterMurderEvent(source, target);
+        var afterMurderEvent = new AfterMurderEvent(source, target, deadBody);
         MiraEventManager.InvokeEvent(afterMurderEvent);
 
         if (!isParticipant)

MiraAPI/Networking/MiraRpc.cs

@@ -46,7 +46,7 @@ public enum MiraRpc : uint
     RemoveVote,
 
     /// <summary>
-    /// Custom RPC to replace Among Us CastVote
+    /// Custom RPC to replace Among Us CastVote.
     /// </summary>
     CastVote,
 }

MiraAPI/Patches/.editorconfig

@@ -0,0 +1,5 @@
+[*.{cs,vb}]
+dotnet_diagnostic.CA1707.severity = none
+dotnet_diagnostic.CS1591.severity = none
+dotnet_diagnostic.SA1611.severity = none
+dotnet_diagnostic.SA1615.severity = none

MiraAPI/Patches/ChatControllerPatch.cs

@@ -0,0 +1,35 @@
+using HarmonyLib;
+using UnityEngine;
+
+namespace MiraAPI.Patches;
+
+#pragma warning disable SA1629
+/// <summary>
+/// Allows players to paste text into chat.
+/// Source: https://github.com/CallOfCreator/NewMod/blob/main/NewMod/Patches/ClipboardPatch.cs
+/// </summary>
+#pragma warning restore SA1629
+[HarmonyPatch(typeof(ChatController), nameof(ChatController.Update))]
+public static class ChatControllerPatch
+{
+    public static void Prefix(ChatController __instance)
+    {
+        if (!HudManager.Instance.Chat.IsOpenOrOpening) return;
+
+        var ctrlPressed = Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl);
+
+        if (!ctrlPressed || !Input.GetKeyDown(KeyCode.V)) return;
+
+        var clipboard = GUIUtility.systemCopyBuffer;
+
+        if (string.IsNullOrWhiteSpace(clipboard)) return;
+        clipboard = clipboard.Replace("<", string.Empty)
+            .Replace(">", string.Empty)
+            .Replace("\r", string.Empty);
+
+        if (!Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift))
+            clipboard = clipboard.Replace("\n", string.Empty);
+
+        __instance.freeChatField.textArea.SetText(__instance.freeChatField.textArea.text + clipboard);
+    }
+}

MiraAPI/Patches/Events/CanUsePatches.cs

@@ -12,14 +12,16 @@ public static class CanUsePatches
     public static IEnumerable<MethodBase> TargetMethods()
     {
         yield return AccessTools.Method(typeof(Console), nameof(Console.CanUse));
-        yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.CanUse));
-        yield return AccessTools.Method(typeof(SystemConsole), nameof(SystemConsole.CanUse));
-        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.CanUse));
-        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.CanUse));
-        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.CanUse));
+        yield return AccessTools.Method(typeof(DeconControl), nameof(DeconControl.CanUse));
         yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.CanUse));
+        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.CanUse));
+        yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.CanUse));
+        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.CanUse));
         yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.CanUse));
+        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.CanUse));
+        yield return AccessTools.Method(typeof(SystemConsole), nameof(SystemConsole.CanUse));
         yield return AccessTools.Method(typeof(ZiplineConsole), nameof(ZiplineConsole.CanUse));
+        // vent is not necessary as it has its own patch
     }
 
     [HarmonyPriority(Priority.Last)]

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -5,29 +5,44 @@ using MiraAPI.GameEnd;
 
 namespace MiraAPI.Patches.Events;
 
-[HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
 internal static class EndGamePatches
 {
-    public static bool Prefix(EndGameManager __instance)
+    [HarmonyPatch(typeof(GameManager), nameof(GameManager.RpcEndGame))]
+    public static class GameManagerPatches
     {
-        if (CustomGameOver.Instance is not { } gameOver)
+        public static bool Prefix(GameOverReason endReason)
         {
-            return true;
-        }
+            var @event = new BeforeGameEndEvent(endReason);
+            MiraEventManager.InvokeEvent(@event);
 
-        var result = gameOver.BeforeEndGameSetup(__instance);
-        return result;
+            return !@event.IsCancelled;
+        }
     }
 
-    public static void Postfix(EndGameManager __instance)
+    [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
+    public static class EndGameManagerPatches
     {
-        if (CustomGameOver.Instance is { } gameOver)
+        public static bool Prefix(EndGameManager __instance)
         {
-            gameOver.AfterEndGameSetup(__instance);
-            CustomGameOver.Instance = null;
+            if (CustomGameOver.Instance is not { } gameOver)
+            {
+                return true;
+            }
+
+            var result = gameOver.BeforeEndGameSetup(__instance);
+            return result;
         }
 
-        var @event = new GameEndEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
+        public static void Postfix(EndGameManager __instance)
+        {
+            if (CustomGameOver.Instance is { } gameOver)
+            {
+                gameOver.AfterEndGameSetup(__instance);
+                CustomGameOver.Instance = null;
+            }
+
+            var @event = new GameEndEvent(__instance);
+            MiraEventManager.InvokeEvent(@event);
+        }
     }
 }

MiraAPI/Patches/Events/FreeplayRoundStartPatch.cs

@@ -0,0 +1,17 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch(typeof(TutorialManager._RunTutorial_d__3), nameof(TutorialManager._RunTutorial_d__3.MoveNext))]
+public static class FreeplayRoundStartPatch
+{
+    public static void Postfix(TutorialManager._RunTutorial_d__3 __instance, ref bool __result)
+    {
+        if (!__result)
+        {
+            MiraEventManager.InvokeEvent(new RoundStartEvent(true));
+        }
+    }
+}

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -1,6 +1,7 @@
 using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
@@ -13,13 +14,17 @@ public static class KillAnimationPatches
     /// <summary>
     /// Used to trigger the <see cref="AfterMurderEvent"/>.
     /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The target.</param>
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(KillAnimation), nameof(KillAnimation.CoPerformKill))]
-    public static void KillAnimPostfix(PlayerControl source, PlayerControl target)
+    [HarmonyPatch(typeof(KillAnimation._CoPerformKill_d__2), nameof(KillAnimation._CoPerformKill_d__2.MoveNext))]
+    public static void KillAnimPostfix(KillAnimation._CoPerformKill_d__2 __instance)
     {
-        var afterMurderEvent = new AfterMurderEvent(source, target);
+        // Checking if state is -1 to wait for the end of coroutine.
+        if (__instance.__1__state != -1)
+        {
+            return;
+        }
+
+        var afterMurderEvent = new AfterMurderEvent(__instance.source, __instance.target, Helpers.GetBodyById(__instance.target.PlayerId));
         MiraEventManager.InvokeEvent(afterMurderEvent);
     }
 }

MiraAPI/Patches/Events/ReportBodyEventPatch.cs

@@ -1,21 +1,52 @@
-using HarmonyLib;
+using AmongUs.InnerNet.GameDataMessages;
+using HarmonyLib;
+using InnerNet;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Utilities;
+using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Events;
 
 [HarmonyPatch]
 public static class ReportBodyEventPatch
 {
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))]
-    public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
+    private static bool ReportBodyEventHook(PlayerControl source, NetworkedPlayerInfo? target)
     {
         var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null;
 
-        var @event = new ReportBodyEvent(__instance, target, body);
+        var @event = new ReportBodyEvent(source, target, body);
         MiraEventManager.InvokeEvent(@event);
         return !@event.IsCancelled;
     }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.ReportDeadBody))]
+    public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
+    {
+        return ReportBodyEventHook(__instance, target);
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.LateBroadcastReliableMessage))]
+    public static bool LateBroadcastReliableMessagePrefix(IGameDataMessage rpcMessage)
+    {
+        var reportBodyMessage = rpcMessage.TryCast<RpcReportDeadBodyMessage>();
+
+        if (reportBodyMessage == null)
+        {
+            return true;
+        }
+
+        var source = AmongUsClient.Instance.FindObjectByNetId<PlayerControl>(reportBodyMessage.rpcObjectNetId);
+        if (source == null)
+        {
+            Logger<MiraApiPlugin>.Error("Failed to find source player for RpcReportDeadBodyMessage with NetId: " + reportBodyMessage.rpcObjectNetId);
+            return true;
+        }
+
+        var target = GameData.Instance.GetPlayerById(reportBodyMessage.targetPlayerId);
+
+        return ReportBodyEventHook(source, target);
+    }
 }

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -9,7 +9,12 @@ internal static class SpawnInMinigamePatch
 {
     public static void Postfix()
     {
-        var @event = new RoundStartEvent(false);
+        var @event = new BeforeRoundStartEvent(false);
         MiraEventManager.InvokeEvent(@event);
+
+        if (@event.IsCancelled) return;
+
+        var @event2 = new RoundStartEvent(false);
+        MiraEventManager.InvokeEvent(@event2);
     }
 }

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -25,7 +25,12 @@ internal static class SubmergedSpawnGamePatch
 
     public static void Postfix()
     {
-        var @event = new RoundStartEvent(false);
+        var @event = new BeforeRoundStartEvent(false);
         MiraEventManager.InvokeEvent(@event);
+
+        if (@event.IsCancelled) return;
+
+        var @event2 = new RoundStartEvent(false);
+        MiraEventManager.InvokeEvent(@event2);
     }
 }

MiraAPI/Patches/Events/VentEventPatches.cs

@@ -23,10 +23,10 @@ public static class VentEventPatches
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcEnterVent))]
-    public static bool PlayerPhysicsRpcEnterVentPrefix(PlayerPhysics __instance, int id)
+    public static bool PlayerPhysicsRpcEnterVentPrefix(PlayerPhysics __instance, int ventId)
     {
         var pc = __instance.myPlayer;
-        var vent = ShipStatus.Instance.AllVents.FirstOrDefault(v => v.Id == id);
+        var vent = ShipStatus.Instance.AllVents.FirstOrDefault(v => v.Id == ventId);
 
         var @event = new EnterVentEvent(pc, vent);
         MiraEventManager.InvokeEvent(@event);
@@ -40,10 +40,10 @@ public static class VentEventPatches
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcExitVent))]
-    public static bool PlayerPhysicsRpcExitVentPrefix(PlayerPhysics __instance, int id)
+    public static bool PlayerPhysicsRpcExitVentPrefix(PlayerPhysics __instance, int ventId)
     {
         var pc = __instance.myPlayer;
-        var vent = ShipStatus.Instance.AllVents.First(v => v.Id == id);
+        var vent = ShipStatus.Instance.AllVents.First(v => v.Id == ventId);
 
         var @event = new ExitVentEvent(pc, vent);
         MiraEventManager.InvokeEvent(@event);

MiraAPI/Patches/Freeplay/TaskAddButtonPatches.cs

@@ -22,15 +22,4 @@ internal static class TaskAddButtonPatches
 
         return true;
     }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(TaskAddButton.Role), MethodType.Setter)]
-    public static void RoleGetterPatch(TaskAddButton __instance)
-    {
-        if (__instance.role is ICustomRole { Team: ModdedRoleTeams.Custom } customRole)
-        {
-            __instance.FileImage.color = customRole.IntroConfiguration?.IntroTeamColor ?? Color.gray;
-        }
-        __instance.RolloverHandler.OutColor = __instance.FileImage.color;
-    }
 }

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -10,6 +10,7 @@ using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using TMPro;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
@@ -19,7 +20,6 @@ namespace MiraAPI.Patches.Freeplay;
 internal static class TaskAdderPatches
 {
     private static Scroller _scroller = null!;
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
     public static void AddRolesFolder(TaskAdderGame __instance)
@@ -32,6 +32,11 @@ internal static class TaskAdderPatches
         _scroller.allowY = true;
         _scroller.Inner = inner.transform;
 
+        var scrollerHelper = __instance.TaskParent.gameObject.AddComponent<ManualScrollHelper>();
+        scrollerHelper.scroller = _scroller;
+        scrollerHelper.verticalAxis = RewiredConstsEnum.Action.TaskRVertical;
+        scrollerHelper.scrollSpeed = 10f;
+
         GameObject hitbox = new("Hitbox")
         {
             layer = 5,
@@ -295,7 +300,7 @@ internal static class TaskAdderPatches
 
         if (_scroller)
         {
-            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 5, 1.4f);
+            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 4.5f, 1.65f);
             _scroller.SetYBoundsMin(0.0f);
             _scroller.ScrollToTop();
         }
@@ -332,7 +337,8 @@ internal static class TaskAdderPatches
             taskAddButton.SafePositionWorld = instance.SafePositionWorld;
             taskAddButton.Text.text = modifier.ModifierName;
             taskAddButton.Text.EnableMasking();
-
+            taskAddButton.FileImage.color = modifier.FreeplayFileColor;
+            taskAddButton.RolloverHandler.OutColor = modifier.FreeplayFileColor;
             taskAddButton.Button.OnClick = new Button.ButtonClickedEvent();
             taskAddButton.Button.OnClick.AddListener((UnityEngine.Events.UnityAction)(() =>
             {
@@ -384,6 +390,20 @@ internal static class TaskAdderPatches
 
             instance.AddFileAsChildCustom(taskAddButton2, ref num, ref num2, ref num3);
             taskAddButton2.Role = roleBehaviour;
+            if (roleBehaviour is ICustomRole custom)
+            {
+                var customColor = custom.IntroConfiguration?.IntroTeamColor ?? Color.gray;
+                if (custom.Team is ModdedRoleTeams.Crewmate)
+                {
+                    customColor = Palette.CrewmateBlue;
+                }
+                else if (custom.Team is ModdedRoleTeams.Impostor)
+                {
+                    customColor = Palette.ImpostorRed;
+                }
+                taskAddButton2.FileImage.color = customColor;
+                taskAddButton2.RolloverHandler.OutColor = customColor;
+            }
             if (taskAddButton2.Button == null)
             {
                 continue;

MiraAPI/Patches/GameModes/.editorconfig

@@ -0,0 +1,2 @@
+[*.cs]
+dotnet_diagnostic.S125.severity = none

MiraAPI/Patches/GameStartManagerPatch.cs

@@ -0,0 +1,36 @@
+using HarmonyLib;
+using MiraAPI.Keybinds;
+using UnityEngine;
+
+namespace MiraAPI.Patches;
+
+/// <summary>
+/// Checks keybind conflicts in the lobby and disables secondary ones.
+/// </summary>
+[HarmonyPatch(typeof(GameStartManager))]
+public static class GameStartManagerPatch
+{
+    public static bool conflictShown = false;
+
+    [HarmonyPatch(nameof(GameStartManager.Start))]
+    [HarmonyPostfix]
+    public static void StartPostfix(GameStartManager __instance)
+    {
+        if (conflictShown) return;
+
+        var conflicts = KeybindManager.GetConflicts();
+        if (conflicts.Count == 0) return;
+
+        conflictShown = true;
+
+        var message = "The following keybinds are disabled due to conflicts:\n\n";
+
+        foreach (var (a, b) in conflicts)
+        {
+            message += $"• <color=#FF5555>{b.Description}</color> (conflicts with {a.Description})\n";
+            b.Handler = null;
+        }
+
+        HudManager.Instance.ShowPopUp(message.TrimEnd());
+    }
+}

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -1,37 +1,25 @@
 using HarmonyLib;
 using MiraAPI.Hud;
+using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Hud;
 
-/// <summary>
-/// Reset button patches
-/// </summary>
-[HarmonyPatch]
+[HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
+[HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
 public static class ButtonResetPatches
 {
-    /// <summary>
-    /// Resets the cooldown and effect of all custom buttons when the meeting starts.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
-    public static void MeetingHudStartPostfix()
+    public static void Postfix()
     {
         foreach (var customActionButton in CustomButtonManager.CustomButtons)
         {
-            customActionButton.ResetCooldownAndOrEffect();
-        }
-    }
-
-    /// <summary>
-    /// Resets the cooldown and effect of all custom buttons after the exile screen is closed.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(ExileController), nameof(ExileController.ReEnableGameplay))]
-    public static void ExileControllerReEnableGameplayPostfix()
-    {
-        foreach (var customActionButton in CustomButtonManager.CustomButtons)
-        {
-            customActionButton.ResetCooldownAndOrEffect();
+            try
+            {
+                customActionButton.ResetCooldownAndOrEffect();
+            }
+            catch (System.Exception ex)
+            {
+                Logger<MiraApiPlugin>.Error($"Error resetting cooldown and effect for button {customActionButton.GetType().Name}: {ex}");
+            }
         }
     }
 }

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,6 +1,11 @@
-using HarmonyLib;
+using System;
+using System.Collections;
+using HarmonyLib;
 using MiraAPI.Hud;
+using MiraAPI.Keybinds;
+using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
+using Rewired;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -13,9 +18,9 @@ namespace MiraAPI.Patches;
 public static class HudManagerPatches
 {
     // Custom buttons parent.
-    internal static GameObject? _bottomLeft;
-    internal static Transform? _bottomRight;
-    internal static Transform? _buttons;
+    public static GameObject? BottomLeft { get; private set; }
+    public static Transform? BottomRight { get; private set; }
+    public static Transform? Buttons { get; private set; }
 
     /*
     /// <summary>
@@ -36,30 +41,30 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        if (_buttons == null)
+        if (Buttons == null)
         {
-            _buttons = __instance.transform.Find("Buttons");
+            Buttons = __instance.transform.Find("Buttons");
         }
 
-        if (_bottomRight == null)
+        if (BottomRight == null)
         {
-            _bottomRight = _buttons.Find("BottomRight");
+            BottomRight = Buttons.Find("BottomRight");
         }
 
-        if (_bottomLeft == null)
+        if (BottomLeft == null)
         {
-            _bottomLeft = Object.Instantiate(_bottomRight.gameObject, _buttons);
+            BottomLeft = Object.Instantiate(BottomRight.gameObject, Buttons);
         }
 
-        foreach (var t in _bottomLeft.GetComponentsInChildren<ActionButton>(true))
+        foreach (var t in BottomLeft.GetComponentsInChildren<ActionButton>(true))
         {
             t.gameObject.Destroy();
         }
 
-        var gridArrange = _bottomLeft.GetComponent<GridArrange>();
-        var aspectPosition = _bottomLeft.GetComponent<AspectPosition>();
+        var gridArrange = BottomLeft.GetComponent<GridArrange>();
+        var aspectPosition = BottomLeft.GetComponent<AspectPosition>();
 
-        _bottomLeft.name = "BottomLeft";
+        BottomLeft.name = "BottomLeft";
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
@@ -67,8 +72,8 @@ public static class HudManagerPatches
         {
             var location = button.Location switch
             {
-                ButtonLocation.BottomLeft => _bottomLeft.transform,
-                ButtonLocation.BottomRight => _bottomRight,
+                ButtonLocation.BottomLeft => BottomLeft.transform,
+                ButtonLocation.BottomRight => BottomRight,
                 _ => null,
             };
 
@@ -77,7 +82,14 @@ public static class HudManagerPatches
                 continue;
             }
 
-            button.CreateButton(location);
+            try
+            {
+                button.CreateButton(location);
+            }
+            catch (System.Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Failed to create custom button {button.GetType().Name}: {e}");
+            }
         }
 
         gridArrange.Start();
@@ -105,7 +117,36 @@ public static class HudManagerPatches
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
-            button.SetActive(isActive, role);
+            try
+            {
+                button.SetActive(isActive, role);
+            }
+            catch (System.Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Failed to set custom button {button.GetType().Name} active: {e}");
+            }
+        }
+    }
+
+    [HarmonyPatch(nameof(HudManager.Update))]
+    [HarmonyPostfix]
+    public static void StartPostfix()
+    {
+        if (AmongUsClient.Instance.GameState != InnerNet.InnerNetClient.GameStates.Started) return;
+        if (PlayerControl.LocalPlayer.Data.IsDead) return;
+
+        foreach (var entry in KeybindManager.GetEntries())
+        {
+            var player = ReInput.players.GetPlayer(0);
+            var keyboard = player.controllers.Keyboard;
+
+            if (player.GetButtonDown(entry.Id) &&
+               (entry.Modifier1 == ModifierKey.None || keyboard.GetModifierKey(entry.Modifier1)) &&
+               (entry.Modifier2 == ModifierKey.None || keyboard.GetModifierKey(entry.Modifier2)) &&
+               (entry.Modifier3 == ModifierKey.None || keyboard.GetModifierKey(entry.Modifier3)))
+            {
+                entry.Handler?.Invoke();
+            }
         }
     }
 }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -61,6 +61,11 @@ public static class IntroCutscenePatches
     public static void GameBeginPatch(IntroCutscene __instance)
     {
         MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
+
+        var @event = new BeforeRoundStartEvent(true);
+        MiraEventManager.InvokeEvent(@event);
+
+        if (@event.IsCancelled) return;
         MiraEventManager.InvokeEvent(new RoundStartEvent(true));
     }
 }

MiraAPI/Patches/Keybinds/KeybindsPatch.cs

@@ -0,0 +1,20 @@
+using HarmonyLib;
+using MiraAPI.Keybinds;
+using MiraAPI.Utilities;
+using Rewired;
+
+namespace MiraAPI.Patches.Keybinds
+{
+    [HarmonyPatch(typeof(InputManager_Base), nameof(InputManager_Base.Awake))]
+    public static class KeybindMenuPatch
+    {
+        [HarmonyPrefix]
+        private static void StartPrefix(InputManager_Base __instance)
+        {
+            foreach (var entry in KeybindManager.GetEntries())
+            {
+                __instance.userData.RegisterModBind(entry.Id, entry.Description, entry.Key, modifier1: entry.Modifier1, modifier2: entry.Modifier2, modifier3: entry.Modifier3);
+            }
+        }
+    }
+}

MiraAPI/Patches/Menu/HatsTabPatches.cs

@@ -84,7 +84,7 @@ public static class HatsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName} ({currentPage + 1}/{sortedHats.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -114,7 +114,7 @@ public static class HatsTabPatches
                 yield return null;
             }
 
-            __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+            __instance.SetScrollerBounds();
             yield return new WaitForSeconds(0.01f);
         }
         __instance.currentHatIsEquipped = true;

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -73,7 +73,7 @@ public static class NameplatesTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName} ({currentPage + 1}/{SortedNameplates.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -91,7 +91,7 @@ public static class NameplatesTabPatches
             hatIndex += 1;
         }
 
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+        __instance.SetScrollerBounds();
         __instance.currentNameplateIsEquipped = true;
     }
 
@@ -108,7 +108,7 @@ public static class NameplatesTabPatches
         var x = (NamePlateViewData viewdata) =>
         {
             colorChip.transform.GetChild(1).GetComponent<SpriteRenderer>().sprite = viewdata?.Image;
-            //(colorChip as NameplateChip).image.sprite = viewdata?.Image;
+            // (colorChip as NameplateChip).image.sprite = viewdata?.Image;
         };
         __instance.StartCoroutine(AddressableAssetExtensions.CoLoadAssetAsync<NamePlateViewData>(__instance, namePlate.GetAssetReference(), x));
         colorChip.transform.localPosition = new Vector3(position.x, position.y, -1f);

MiraAPI/Patches/Menu/SkinsTabPatches.cs

@@ -76,7 +76,7 @@ public static class SkinsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName} ({currentPage + 1}/{sortedSkins.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -94,7 +94,7 @@ public static class SkinsTabPatches
             hatIndex += 1;
         }
 
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+        __instance.SetScrollerBounds();
         __instance.currentSkinIsEquipped = true;
     }
 

MiraAPI/Patches/Menu/VisorsTabPatches.cs

@@ -72,7 +72,7 @@ public static class VisorsTabPatches
         text.gameObject.transform.localScale = Vector3.one;
         text.GetComponent<TextTranslatorTMP>().Destroy();
         text.EnableStencilMasking();
-        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.text = $"{groupName} ({currentPage + 1}/{SortedVisors.Count})\nPress Ctrl or Tab to cycle pages";
         text.alignment = TextAlignmentOptions.Center;
         text.fontSize = 3f;
         text.fontSizeMax = 3f;
@@ -90,7 +90,7 @@ public static class VisorsTabPatches
             hatIndex += 1;
         }
 
-        __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
+        __instance.SetScrollerBounds();
         __instance.currentVisorIsEquipped = true;
     }
 

MiraAPI/Patches/MinigameBeginErrorPatch.cs

@@ -3,7 +3,7 @@
 namespace MiraAPI.Patches;
 
 /// <summary>
-/// Used to fix the Minigame crash errors (credits Submerged/PH Gaming for the fix)
+/// Used to fix the Minigame crash errors (credits Submerged/PH Gaming for the fix).
 /// </summary>
 [HarmonyPatch]
 public static class MinigameBeginErrorPatch

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -220,6 +220,7 @@ internal static class GameOptionsMenuPatch
                 menu.checkboxOrigin,
                 menu.numberOptionOrigin,
                 menu.stringOptionOrigin,
+                menu.playerOptionOrigin,
                 menu.settingsContainer));
 
         foreach (var newOpt in options)

MiraAPI/Patches/Options/GamePresetsTabPatches.cs

@@ -89,7 +89,7 @@ internal static class GamePresetsTabPatches
 
             var prefab = GameSettingMenu.Instance.GameSettingsButton;
 
-            foreach (var preset in MiraPluginManager.Instance.RegisteredPlugins.SelectMany(x => x.Presets))
+            foreach (var preset in MiraPluginManager.Instance.RegisteredPlugins.SelectMany(x => x.InternalPresets))
             {
                 var button = Object.Instantiate(prefab, _presetHolder.transform);
                 button.buttonText.text = preset.Name;
@@ -112,7 +112,7 @@ internal static class GamePresetsTabPatches
 
             foreach (var mod in MiraPluginManager.Instance.RegisteredPlugins)
             {
-                foreach (var button in mod.Presets.Select(x => x.PresetButton))
+                foreach (var button in mod.InternalPresets.Select(x => x.PresetButton))
                 {
                     if (button != null)
                     {
@@ -154,7 +154,7 @@ internal static class GamePresetsTabPatches
 
             foreach (var mod in MiraPluginManager.Instance.RegisteredPlugins)
             {
-                foreach (var button in mod.Presets.Select(x => x.PresetButton))
+                foreach (var button in mod.InternalPresets.Select(x => x.PresetButton))
                 {
                     if (button != null)
                     {

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -32,11 +32,30 @@ internal static class GameSettingMenuPatches
     private static PassiveButton? _modifiersButton;
     private static PassiveButton? _smallRolesButton;
 
-    private static Dictionary<int, Vector3> OptionScrolls = [];
+    private static Dictionary<int, Vector3> OptionsPositions { get; } = [];
+    private static Dictionary<int, Vector3> ModifiersPositions { get; } = [];
+
+    private static void SaveScrollPositions(GameSettingMenu gameSettingMenu)
+    {
+        if (_modifiersTab)
+        {
+            ModifiersPositions[SelectedModIdx] = _modifiersTab!.scrollBar.Inner.localPosition;
+        }
+
+        RoleSettingMenuPatches.RolePositions[SelectedModIdx] = gameSettingMenu.RoleSettingsTab.scrollBar.Inner.localPosition;
+        OptionsPositions[SelectedModIdx] = gameSettingMenu.GameSettingsTab.scrollBar.Inner.localPosition;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
+
+    public static void ChangeTabPrefix(GameSettingMenu __instance)
+    {
+        SaveScrollPositions(__instance);
+    }
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameSettingMenu.ChangeTab))]
-    // ReSharper disable once InconsistentNaming
     public static void ChangeTabPostfix(GameSettingMenu __instance, int tabNum, bool previewOnly)
     {
         if ((previewOnly && Controller.currentTouchType == Controller.TouchType.Joystick) || !previewOnly)
@@ -90,7 +109,6 @@ internal static class GameSettingMenuPatches
     /// <param name="__instance">The GameSettingMenu instance.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameSettingMenu.Start))]
-    // ReSharper disable once InconsistentNaming
     public static void StartPrefix(GameSettingMenu __instance)
     {
         _roleBtnOgPos = __instance.RoleSettingsButton.transform.localPosition;
@@ -123,11 +141,7 @@ internal static class GameSettingMenuPatches
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
             {
-                RoleSettingMenuPatches.Scrolls[SelectedModIdx] =
-                    __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
-                OptionScrolls[SelectedModIdx] =
-                    __instance.GameSettingsTab.scrollBar.Inner.localPosition;
-
+                SaveScrollPositions(__instance);
                 SelectedModIdx += 1;
                 if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPlugins.Length)
                 {
@@ -146,11 +160,7 @@ internal static class GameSettingMenuPatches
         backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
             (UnityAction)(() =>
             {
-                RoleSettingMenuPatches.Scrolls[SelectedModIdx] =
-                    __instance.RoleSettingsTab.scrollBar.Inner.localPosition;
-                OptionScrolls[SelectedModIdx] =
-                    __instance.GameSettingsTab.scrollBar.Inner.localPosition;
-
+                SaveScrollPositions(__instance);
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
@@ -278,7 +288,7 @@ internal static class GameSettingMenuPatches
     {
         if (_text is not null && SelectedModIdx == 0)
         {
-            _text.text = "Default";
+            _text.text = $"<size=40%>(Page 0/{MiraPluginManager.Instance.RegisteredPlugins.Length})</size>\nDefault";
             _text.fontSizeMax = 3.2f;
             SelectedMod = null;
         }
@@ -288,7 +298,7 @@ internal static class GameSettingMenuPatches
             SelectedMod = MiraPluginManager.Instance.RegisteredPlugins[SelectedModIdx - 1];
 
             var name = SelectedMod.MiraPlugin.OptionsTitleText;
-            _text.text = name[..Math.Min(name.Length, 25)];
+            _text.text = $"<size=50%>(Page {SelectedModIdx}/{MiraPluginManager.Instance.RegisteredPlugins.Length})</size>\n" + name[..Math.Min(name.Length, 25)];
         }
 
         bool replaceWithModifiers = true;
@@ -436,29 +446,7 @@ internal static class GameSettingMenuPatches
 
         if (_modifiersTab?.Children?.Count > 0)
         {
-            CleanupSettings(_modifiersTab);
-        }
-
-        void CleanupSettings(GameOptionsMenu gameOptMenu)
-        {
-            ClearOptions(gameOptMenu.Children);
-            gameOptMenu.Children = null;
-
-            gameOptMenu.settingsContainer
-                .GetComponentsInChildren<CategoryHeaderMasked>()
-                .ToList()
-                .ForEach(header => header.gameObject.DestroyImmediate());
-
-            gameOptMenu.Initialize();
-            if (OptionScrolls.TryGetValue(SelectedModIdx, out var pos))
-            {
-                gameOptMenu.scrollBar.Inner.localPosition = pos;
-                gameOptMenu.scrollBar.UpdateScrollBars();
-            }
-            else
-            {
-                gameOptMenu.scrollBar.ScrollToTop();
-            }
+            CleanupSettings(_modifiersTab, true);
         }
 
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
@@ -485,17 +473,37 @@ internal static class GameSettingMenuPatches
             rolesMenu.AdvancedRolesSettings.gameObject.SetActive(false);
             rolesMenu.RoleChancesSettings.gameObject.SetActive(true);
             rolesMenu.SetQuotaTab();
-            if (SelectedModIdx == 0)
+            if (RoleSettingMenuPatches.RolePositions.TryGetValue(SelectedModIdx, out var pos))
             {
-                if (RoleSettingMenuPatches.Scrolls.TryGetValue(0, out var pos))
-                {
-                    rolesMenu.scrollBar.Inner.localPosition = pos;
-                    rolesMenu.scrollBar.UpdateScrollBars();
-                }
-                else
-                {
-                    rolesMenu.scrollBar.ScrollToTop();
-                }
+                rolesMenu.scrollBar.Inner.localPosition = pos;
+                rolesMenu.scrollBar.UpdateScrollBars();
+            }
+            else
+            {
+                rolesMenu.scrollBar.ScrollToTop();
+            }
+        }
+
+        void CleanupSettings(GameOptionsMenu gameOptMenu, bool modifiers = false)
+        {
+            ClearOptions(gameOptMenu.Children);
+            gameOptMenu.Children = null;
+
+            gameOptMenu.settingsContainer
+                .GetComponentsInChildren<CategoryHeaderMasked>()
+                .ToList()
+                .ForEach(header => header.gameObject.DestroyImmediate());
+
+            gameOptMenu.Initialize();
+            var positions = modifiers ? ModifiersPositions : OptionsPositions;
+            if (positions.TryGetValue(SelectedModIdx, out var pos))
+            {
+                gameOptMenu.scrollBar.Inner.localPosition = pos;
+                gameOptMenu.scrollBar.UpdateScrollBars();
+            }
+            else
+            {
+                gameOptMenu.scrollBar.ScrollToTop();
             }
         }
     }

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -113,24 +113,27 @@ public static class LobbyViewPanePatches
         menu.scrollBar.ScrollToTop();
     }
 
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(LobbyViewSettingsPane.SetTab))]
-    public static bool SetTabPatch(LobbyViewSettingsPane __instance)
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(LobbyViewSettingsPane.ChangeTab))]
+    [HarmonyPatch(nameof(LobbyViewSettingsPane.RefreshTab))]
+    // CHANGED BECAUSE OF INLINING
+    public static void SetTabPatch(LobbyViewSettingsPane __instance)
     {
         if (__instance.currentTab != ModifiersTabName || SelectedMod == null)
         {
             ModifiersTabButton?.SelectButton(false);
-            return true;
+            return;
         }
 
         __instance.taskTabButton.SelectButton(false);
         __instance.rolesTabButton.SelectButton(false);
 
         ModifiersTabButton?.SelectButton(true);
+
         var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true));
+            .Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || (x.OptionableType != null && x.OptionableType.IsAssignableTo(typeof(BaseModifier)))));
+
         DrawOptions(__instance, filteredGroups);
-        return false;
     }
 
     [HarmonyPrefix]
@@ -142,8 +145,14 @@ public static class LobbyViewPanePatches
             return true;
         }
 
+        if (__instance.currentTab == ModifiersTabName)
+        {
+            return false;
+        }
+
         var filteredGroups = SelectedMod.InternalOptionGroups
-            .Where(x => x.OptionableType == null && x.GroupVisible.Invoke());
+            .Where(x => x is { ShowInModifiersMenu: false, OptionableType: null } && x.GroupVisible());
+
         DrawOptions(__instance, filteredGroups);
         return false;
     }
@@ -157,6 +166,11 @@ public static class LobbyViewPanePatches
             return true;
         }
 
+        if (__instance.currentTab == ModifiersTabName)
+        {
+            return false;
+        }
+
         DrawRolesTab(__instance);
         return false;
     }
@@ -165,12 +179,15 @@ public static class LobbyViewPanePatches
     {
         var num = 1.44f;
 
-        foreach (var group in groups)
+        var groupArray = groups.Where(x => x.GroupVisible() && x.Options.Any(y => y.Visible())).ToArray();
+
+        foreach (var group in groupArray)
         {
             var categoryHeaderMasked = Object.Instantiate(
                 menu.categoryHeaderOrigin,
                 menu.settingsContainer,
                 true);
+
             categoryHeaderMasked.SetHeader(StringNames.Name, 61);
             categoryHeaderMasked.Title.text = group.GroupName;
             categoryHeaderMasked.transform.localScale = Vector3.one;
@@ -182,7 +199,7 @@ public static class LobbyViewPanePatches
 
             foreach (var option in group.Options)
             {
-                if (!option.Visible.Invoke())
+                if (!option.Visible())
                 {
                     continue;
                 }
@@ -191,6 +208,7 @@ public static class LobbyViewPanePatches
                     menu.infoPanelOrigin,
                     menu.settingsContainer,
                     true);
+
                 viewSettingsInfoPanel.transform.localScale = Vector3.one;
                 float num2;
                 if (i % 2 == 0)
@@ -229,7 +247,7 @@ public static class LobbyViewPanePatches
             num -= 0.85f;
         }
 
-        menu.scrollBar.CalculateAndSetYBounds(menu.settingsInfo.Count + 10, 2f, 6f, 0.85f);
+        menu.scrollBar.SetYBoundsMax(-num - 2);
     }
 
     private static void DrawRolesTab(LobbyViewSettingsPane instance)

MiraAPI/Patches/Options/NotificationPopperPatch.cs

@@ -2,6 +2,7 @@
 using HarmonyLib;
 using Il2CppSystem;
 using MiraAPI.Roles;
+using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Patches.Options;
 
@@ -23,15 +24,13 @@ public static class NotificationPopperPatch
             return true;
         }
 
-        var text = teamType == RoleTeamTypes.Crewmate
-            ? Palette.CrewmateSettingChangeText.ToTextColor()
-            : Palette.ImpostorRed.ToTextColor();
+        var textColor = customRole.OptionsMenuColor.ToTextColor();
 
         var item = TranslationController.Instance.GetString(
             StringNames.LobbyChangeSettingNotificationRole,
             string.Concat(
                 "<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
-                text,
+                textColor,
                 TranslationController.Instance.GetString(key, Array.Empty<Object>()),
                 "</color></font>"
             ),

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -1,12 +1,161 @@
-using HarmonyLib;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
 using Il2CppSystem;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.OptionTypes;
+using MiraAPI.Roles;
 using MiraAPI.Utilities;
+using UnityEngine;
+using Object = Il2CppSystem.Object;
 
 namespace MiraAPI.Patches.Options;
 
 [HarmonyPatch]
 public static class OptionsPatches
 {
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseChance))]
+    public static bool RoleIncreaseChancePrefix(RoleOptionSetting __instance)
+    {
+        if (!__instance.Role.IsCustomRole())
+        {
+            return true;
+        }
+
+        if (__instance.roleChance == 0)
+        {
+            __instance.roleMaxCount = 1;
+        }
+
+        var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
+        __instance.roleChance += increment;
+
+        if (__instance.roleChance > 100)
+        {
+            __instance.roleChance = 0;
+        }
+
+        __instance.OnValueChanged.Invoke(__instance);
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseChance))]
+    public static bool RoleDecreaseChancePrefix(RoleOptionSetting __instance)
+    {
+        if (!__instance.Role.IsCustomRole())
+        {
+            return true;
+        }
+
+        if (__instance.roleChance == 0)
+        {
+            __instance.roleMaxCount = 1;
+        }
+
+        var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
+        __instance.roleChance -= increment;
+
+        if (__instance.roleChance < 0)
+        {
+            __instance.roleChance = 100;
+        }
+
+        __instance.OnValueChanged.Invoke(__instance);
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseCount))]
+    public static bool RoleIncreaseCountPrefix(RoleOptionSetting __instance)
+    {
+        if (!__instance.Role.IsCustomRole())
+        {
+            return true;
+        }
+
+        if (__instance.roleMaxCount == 0)
+        {
+            __instance.roleChance = 50;
+        }
+
+        __instance.roleMaxCount += 1;
+        if (__instance.roleMaxCount > __instance.role.MaxCount)
+        {
+            __instance.roleMaxCount = 0;
+        }
+
+        __instance.OnValueChanged.Invoke(__instance);
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseCount))]
+    public static bool RoleDecreaseCountPrefix(RoleOptionSetting __instance)
+    {
+        if (!__instance.Role.IsCustomRole())
+        {
+            return true;
+        }
+
+        if (__instance.roleMaxCount == 0)
+        {
+            __instance.roleChance = 50;
+        }
+
+        __instance.roleMaxCount -= 1;
+        if (__instance.roleMaxCount < 0)
+        {
+            __instance.roleMaxCount = __instance.role.MaxCount;
+        }
+
+        __instance.OnValueChanged.Invoke(__instance);
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.AdjustButtonsActiveState))]
+    [HarmonyPatch(typeof(StringOption), nameof(StringOption.AdjustButtonsActiveState))]
+    [HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.AdjustButtonsActiveState))]
+    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustChanceButtonsActiveState))]
+    [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustCountButtonsActiveState))]
+    public static bool AdjustButtonsPrefix(OptionBehaviour __instance)
+    {
+        if (__instance.IsCustom())
+        {
+            if (__instance.TryCast<NumberOption>() is { } numberOption)
+            {
+                numberOption.MinusBtn.SetInteractable(true);
+                numberOption.PlusBtn.SetInteractable(true);
+            }
+            if (__instance.TryCast<StringOption>() is { } stringOption)
+            {
+                stringOption.MinusBtn.SetInteractable(true);
+                stringOption.PlusBtn.SetInteractable(true);
+            }
+            if (__instance.TryCast<PlayerOption>() is { } playerOption)
+            {
+                playerOption.MinusBtn.SetInteractable(true);
+                playerOption.PlusBtn.SetInteractable(true);
+            }
+
+            return false;
+        }
+
+        if (__instance.TryCast<RoleOptionSetting>() is { } roleOptionSetting && roleOptionSetting.Role.IsCustomRole())
+        {
+            roleOptionSetting.CountMinusBtn.SetInteractable(true);
+            roleOptionSetting.CountPlusBtn.SetInteractable(true);
+            roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
+            roleOptionSetting.ChancePlusBtn.SetInteractable(true);
+
+            return false;
+        }
+
+        return true;
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Initialize))]
     public static bool ToggleInit(ToggleOption __instance)
@@ -16,15 +165,31 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
 
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.UpdateValue))]
+    [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Toggle))]
+    // UpdateValue was inlined.
     public static bool ToggleUpdate(ToggleOption __instance)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        __instance.CheckMark.enabled = !__instance.CheckMark.enabled;
+        __instance.OnValueChanged.Invoke(__instance);
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
+    [HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.UpdateValue))]
+    public static bool UpdateValuePrefix(OptionBehaviour __instance)
     {
         return !__instance.IsCustom();
     }
@@ -38,17 +203,84 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
-
+        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
-    public static bool NumberUpdate(NumberOption __instance)
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Increase))]
+    public static bool NumberIncrease(NumberOption __instance)
     {
-        return !__instance.IsCustom();
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        __instance.Value += __instance.Increment;
+        if (__instance.Value > __instance.ValidRange.max)
+        {
+            __instance.Value = __instance.ValidRange.min;
+        }
+        __instance.OnValueChanged.Invoke(__instance);
+        __instance.AdjustButtonsActiveState();
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Decrease))]
+    public static bool NumberDecrease(NumberOption __instance)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        __instance.Value -= __instance.Increment;
+        if (__instance.Value < __instance.ValidRange.min)
+        {
+            __instance.Value = __instance.ValidRange.max;
+        }
+        __instance.OnValueChanged.Invoke(__instance);
+        __instance.AdjustButtonsActiveState();
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(StringOption), nameof(StringOption.Increase))]
+    public static bool StringOptionIncrease(StringOption __instance)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        __instance.Value += 1;
+        if (__instance.Value >= __instance.Values.Length)
+        {
+            __instance.Value = 0;
+        }
+        __instance.OnValueChanged.Invoke(__instance);
+        __instance.AdjustButtonsActiveState();
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(StringOption), nameof(StringOption.Decrease))]
+    public static bool StringOptionDecrease(StringOption __instance)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        __instance.Value -= 1;
+        if (__instance.Value < 0)
+        {
+            __instance.Value = __instance.Values.Length - 1;
+        }
+        __instance.OnValueChanged.Invoke(__instance);
+        __instance.AdjustButtonsActiveState();
+        return false;
     }
 
     [HarmonyPrefix]
@@ -60,19 +292,9 @@ public static class OptionsPatches
             return true;
         }
 
-        __instance.TitleText.text =
-            TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
-        __instance.ValueText.text = TranslationController.Instance.GetString(
-            __instance.Values[__instance.Value],
-            Array.Empty<Object>());
+        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
+        __instance.ValueText.text = TranslationController.Instance.GetString(__instance.Values[__instance.Value], Array.Empty<Object>());
 
         return false;
     }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
-    public static bool StringUpdate(StringOption __instance)
-    {
-        return !__instance.IsCustom();
-    }
 }

MiraAPI/Patches/Options/PlayerOptionPatches.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Linq;
+using HarmonyLib;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.OptionTypes;
+using MiraAPI.Utilities;
+using Reactor.Utilities;
+using UnityEngine;
+using Object = Il2CppSystem.Object;
+
+namespace MiraAPI.Patches.Options;
+
+[HarmonyPatch(typeof(PlayerOption))]
+public static class PlayerOptionPatches
+{
+    // Updates the list of players according to the filter.
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(PlayerOption.FixedUpdate))]
+    public static bool PlayerOptionUpdatePatch(PlayerOption __instance)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        if (!ModdedOptionsManager.CreatedPlayerOptions.TryGetValue(__instance, out var moddedPlrOpt)) return false;
+
+        var filteredPlayers = moddedPlrOpt.GetFilteredPlayers();
+        if (filteredPlayers.Count != __instance.Values.Count)
+        {
+            filteredPlayers.Sort((a, b) => a.PlayerId.CompareTo(b.PlayerId));
+
+            __instance.Values = filteredPlayers.ToIl2CppList();
+            moddedPlrOpt.Values = __instance.Values;
+            __instance.playerIndex = filteredPlayers.FindIndex(p => p.PlayerId == __instance.Value);
+            __instance.SetValueText();
+        }
+
+        __instance.CheckValueChanged();
+
+        return false;
+    }
+
+    // Disable going under 0 if you aren't allowed to choose None.
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(PlayerOption.UpdatePlayerIndex))]
+    public static bool UpdatePlayerIndexPatch(PlayerOption __instance, int index)
+    {
+        if (!__instance.IsCustom() || ModdedOptionsManager.CreatedPlayerOptions[__instance].AllowNone)
+        {
+            return true;
+        }
+
+        var newIndex = Mathf.Clamp(index, 0, __instance.Values.Count - 1);
+        __instance.playerIndex = newIndex;
+        __instance.Value = __instance.Values[newIndex].PlayerId;
+        return false;
+    }
+
+    // Replace "Round Robin" with "None" in the Host Options Menu.
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(PlayerOption.SetValueText))]
+    public static void SetValueTextPatch(PlayerOption __instance)
+    {
+        if (__instance.playerIndex < 0)
+        {
+            __instance.ValueText.text = TranslationController.Instance.GetString(StringNames.FilterNone);
+        }
+    }
+
+    // Innersloth hardcode literally replaces the value with the HNS impostor option OnEnable, so I have to patch that out. Smh.
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(PlayerOption.OnEnable))]
+    public static bool OnEnablePatch(PlayerOption __instance)
+    {
+        return !__instance.IsCustom();
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(PlayerOption.GetInt))]
+    public static bool GetIntPatch(PlayerOption __instance, ref int __result)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        __result = __instance.Value;
+        return false;
+    }
+
+    // Used to replace "Round Robin" with "None" for option notification & view pane.
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(PlayerSelectionGameSetting), nameof(PlayerSelectionGameSetting.GetValueString))]
+    public static bool GetStringPatch(PlayerSelectionGameSetting __instance, float value, ref string __result)
+    {
+        var option = ModdedOptionsManager.ModdedOptions.FirstOrDefault(x => x.Value.Data == __instance).Value;
+        if (option == null) return true;
+
+        var networkedPlayerInfo = GameData.Instance.AllPlayers.ToArray().FirstOrDefault(p => p.PlayerId == (int)value);
+        if (networkedPlayerInfo != null)
+        {
+            __result = networkedPlayerInfo.PlayerName;
+            return false;
+        }
+
+        __result = TranslationController.Instance.GetString(StringNames.FilterNone);
+        return false;
+    }
+
+    // "UpdateValue" was inlined and I needed to replace it, so I just rewrote the method where it's called from.
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(PlayerOption.CheckValueChanged))]
+    public static bool UpdateValuePatch(PlayerOption __instance)
+    {
+        if (!__instance.IsCustom())
+        {
+            return true;
+        }
+
+        if (__instance.oldValue == __instance.Value) return false;
+
+        __instance.oldValue = __instance.Value;
+        __instance.SetValueText();
+
+        return false;
+    }
+}

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
+using MiraAPI.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
@@ -22,13 +23,24 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(RolesSettingsMenu))]
 public static class RoleSettingMenuPatches
 {
-    public static Dictionary<int, Vector3> Scrolls { get; } = [];
-    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; } = [];
-    private static List<GameObject> Headers { get; } = [];
-    private static List<RoleOptionSetting> RoleOptionSettings { get; } = [];
+    public static Dictionary<int, Vector3> RolePositions { get; set; } = [];
+
+    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; set; } = [];
+    private static List<GameObject> Headers { get; set; } = [];
+    private static List<RoleOptionSetting> RoleOptionSettings { get; set; } = [];
 
     private static float ScrollerNum { get; set; } = 0.522f;
 
+    private static RoleBehaviour? CurrentRole { get; set; }
+    private static List<IModdedOption>? CurrentRoleOptions { get; set; }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
+    public static void SetQuotaTabPostfix(RolesSettingsMenu __instance)
+    {
+        __instance.scrollBar.SetScrollBounds(__instance);
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
     public static bool SetQuotaTabPatch(RolesSettingsMenu __instance)
@@ -37,6 +49,8 @@ public static class RoleSettingMenuPatches
         RoleOptionSettings.ForEach(Object.Destroy);
         Headers.Clear();
         RoleOptionSettings.Clear();
+        CurrentRole = null;
+        CurrentRoleOptions = null;
 
         __instance.roleChances = new Il2CppSystem.Collections.Generic.List<RoleOptionSetting>();
         __instance.advancedSettingChildren = new Il2CppSystem.Collections.Generic.List<OptionBehaviour>();
@@ -203,9 +217,10 @@ public static class RoleSettingMenuPatches
             headerBtn.OnClick.AddListener(
                 (UnityAction)(() =>
                 {
-                    if (RoleGroupHidden.TryGetValue(group, out var value))
+                    RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
+                    if (RoleGroupHidden.TryGetValue(group, out var groupHidden))
                     {
-                        RoleGroupHidden[group] = !value;
+                        RoleGroupHidden[group] = !groupHidden;
                     }
                     foreach (var header in Headers)
                     {
@@ -226,14 +241,21 @@ public static class RoleSettingMenuPatches
                 ScrollerNum -= 0.4f;
             }
         }
-        __instance.scrollBar.SetScrollBounds();
+
+        __instance.scrollBar.SetScrollBounds(__instance);
         return false;
     }
 
-    private static void SetScrollBounds(this Scroller scroller)
+    private static void SetScrollBounds(this Scroller scroller, RolesSettingsMenu roleMenu)
     {
-        scroller.CalculateAndSetYBounds(1 + 1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
-        if (Scrolls.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
+        if (GameSettingMenuPatches.SelectedModIdx == 0)
+        {
+            scroller.CalculateAndSetYBounds(roleMenu.roleChances.Count + 3, 1f, 6f, 0.43f);
+            return;
+        }
+
+        scroller.SetYBoundsMax(-ScrollerNum - 2);
+        if (RolePositions.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
         {
             scroller.Inner.localPosition = scroll;
             scroller.UpdateScrollBars();
@@ -246,21 +268,45 @@ public static class RoleSettingMenuPatches
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.Update))]
-    public static bool UpdatePatch()
+    public static bool UpdatePatch(RolesSettingsMenu __instance)
     {
-        return GameSettingMenuPatches.SelectedModIdx == 0;
+        if (GameSettingMenuPatches.SelectedModIdx == 0) return true;
+        if (CurrentRole == null || CurrentRoleOptions == null) return false;
+
+        var hasImage = CurrentRole.RoleScreenshot != null;
+        var num = hasImage ? -0.872f : -1;
+
+        foreach (var opt in CurrentRoleOptions)
+        {
+            if (opt.OptionBehaviour == null) continue;
+
+            if (!opt.Visible.Invoke())
+            {
+                opt.OptionBehaviour.gameObject.SetActive(false);
+                continue;
+            }
+
+            opt.OptionBehaviour.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
+            opt.OptionBehaviour.gameObject.SetActive(true);
+            num += -0.45f;
+        }
+
+        __instance.scrollBar.SetYBoundsMax(-num - 3);
+        return false;
     }
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(RolesSettingsMenu.OpenChancesTab))]
     public static void OpenChancesTabPostfix(RolesSettingsMenu __instance)
     {
-        if (GameSettingMenuPatches.SelectedModIdx == 0)
+        if (!__instance.scrollBar)
         {
             return;
         }
 
-        __instance.scrollBar.SetScrollBounds();
+        CurrentRole = null;
+        CurrentRoleOptions = null;
+        __instance.scrollBar.SetScrollBounds(__instance);
     }
 
     private static void ValueChanged(OptionBehaviour obj)
@@ -312,26 +358,26 @@ public static class RoleSettingMenuPatches
             optBehaviour.gameObject.DestroyImmediate();
         }
 
+        CurrentRole = role;
         __instance.advancedSettingChildren.Clear();
 
-        var hasImage = role.RoleScreenshot != null;
-        var num = hasImage ? -0.872f : -1;
-
         // TODO: create sub groups under the role settings.
         var filteredOptions = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x=> x.OptionableType == role.GetType())
-            .SelectMany(x=>x.Options)
+            .Where(x => x.GroupVisible() && x.OptionableType == role.GetType())
+            .SelectMany(x => x.Options)
             .ToList() ?? [];
 
+        CurrentRoleOptions = filteredOptions;
+
         foreach (var option in filteredOptions)
         {
             var newOpt = option.CreateOption(
                 __instance.checkboxOrigin,
                 __instance.numberOptionOrigin,
                 __instance.stringOptionOrigin,
+                GameSettingMenu.Instance.GameSettingsTab.playerOptionOrigin,
                 __instance.AdvancedRolesSettings.transform);
 
-            newOpt.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
             newOpt.SetClickMask(__instance.ButtonClickMask);
 
             SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
@@ -349,12 +395,10 @@ public static class RoleSettingMenuPatches
             newOpt.LabelBackground.enabled = false;
             __instance.advancedSettingChildren.Add(newOpt);
 
-            num += -0.45f;
+            newOpt.gameObject.SetActive(false);
             newOpt.Initialize();
         }
 
-        Scrolls[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
-        __instance.scrollBar.CalculateAndSetYBounds(__instance.advancedSettingChildren.Count + 3, 1f, 6f, 0.45f);
         __instance.scrollBar.ScrollToTop();
     }
 
@@ -366,7 +410,7 @@ public static class RoleSettingMenuPatches
             return;
         }
 
-        Scrolls[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
+        RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
         __instance.roleTitleText.text = TranslationController.Instance.GetString(
@@ -478,6 +522,10 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);
+        roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
+        roleOptionSetting.ChancePlusBtn.SetInteractable(true);
+        roleOptionSetting.CountMinusBtn.SetInteractable(true);
+        roleOptionSetting.CountPlusBtn.SetInteractable(true);
         __instance.roleChances.Add(roleOptionSetting);
 
         roleOptionSetting.titleText.transform.localPosition = new Vector3(-0.5376f, -0.2923f, 0f);
@@ -486,7 +534,7 @@ public static class RoleSettingMenuPatches
 
         if (GameSettingMenuPatches.SelectedMod is null ||
             GameSettingMenuPatches.SelectedMod.InternalOptionGroups
-                .Exists(x => x.OptionableType == role.GetType()))
+                .Exists(x => x.GroupVisible() && x.OptionableType == role.GetType() && x.Options.Any(y => y.Visible())))
         {
             var newButton = Object.Instantiate(roleOptionSetting.buttons[0], roleOptionSetting.transform);
             newButton.name = "ConfigButton";

MiraAPI/Patches/PlayerControlPatches.cs

@@ -5,8 +5,9 @@ using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
-using MiraAPI.Roles;
+using MiraAPI.Utilities;
 using MiraAPI.Voting;
+using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 
 namespace MiraAPI.Patches;
@@ -41,7 +42,7 @@ internal static class PlayerControlPatches
     // ReSharper disable once InconsistentNaming
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
-        var deathEvent = new PlayerDeathEvent(__instance, reason);
+        var deathEvent = new PlayerDeathEvent(__instance, reason, Helpers.GetBodyById(__instance.PlayerId));
         MiraEventManager.InvokeEvent(deathEvent);
 
         var modifiersComponent = __instance.GetComponent<ModifierComponent>();
@@ -68,6 +69,7 @@ internal static class PlayerControlPatches
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
     // ReSharper disable once InconsistentNaming
+    // Note: This method is partially inlined in 2025.5.20 but we already use custom murder RPCs.
     public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
     {
         var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
@@ -81,11 +83,6 @@ internal static class PlayerControlPatches
     // ReSharper disable once InconsistentNaming
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
     {
-        if (__instance.Data?.Role is ICustomRole customRole)
-        {
-            customRole.PlayerControlFixedUpdate(__instance);
-        }
-
         if (!__instance.AmOwner)
         {
             return;
@@ -98,12 +95,19 @@ internal static class PlayerControlPatches
                 continue;
             }
 
-            if (!button.Enabled(__instance.Data?.Role))
+            try
             {
-                continue;
-            }
+                if (!button.Enabled(__instance.Data?.Role))
+                {
+                    continue;
+                }
 
-            button.FixedUpdateHandler(__instance);
+                button.FixedUpdateHandler(__instance);
+            }
+            catch (System.Exception e)
+            {
+                Logger<MiraApiPlugin>.Error($"Failed to update custom button {button.GetType().Name}: {e}");
+            }
         }
     }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Reflection;
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Meeting;
@@ -40,8 +38,13 @@ internal static class EjectionPatches
     {
         public static void Postfix()
         {
-            var @event = new RoundStartEvent(false);
+            var @event = new BeforeRoundStartEvent(false);
             MiraEventManager.InvokeEvent(@event);
+
+            if (@event.IsCancelled) return;
+
+            var @event2 = new RoundStartEvent(false);
+            MiraEventManager.InvokeEvent(@event2);
         }
     }
 }

MiraAPI/Patches/Roles/GameStartupPatch.cs

@@ -10,7 +10,7 @@ public static class GameStartupPatch
     private static bool _runOnce;
 
     /// <summary>
-    /// This is used for registering roles when the game opens, might be a janky solution, but it works
+    /// This is used for registering roles when the game opens, might be a janky solution, but it works.
     /// </summary>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(MainMenuManager.Start))]
@@ -23,7 +23,11 @@ public static class GameStartupPatch
 
         _runOnce = true;
 
-        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0) return;
+        if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0)
+        {
+            return;
+        }
+
         foreach (var queue in MiraPluginManager.Instance.QueuedRoleRegistrations)
         {
             CustomRoleManager.RegisterRoleTypes(queue.Value, queue.Key);

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -7,7 +7,8 @@ namespace MiraAPI.Patches.Roles;
 /// <summary>
 /// Patches the haunt menu to show the actual role name rather then team.
 /// </summary>
-[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetFilterText))]
+[HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetHauntTarget))]
+// SetFilterText was INLINED
 public static class HauntMenuMinigamePatch
 {
     public static void Postfix(HauntMenuMinigame __instance)
@@ -24,4 +25,4 @@ public static class HauntMenuMinigamePatch
         __instance.FilterText.text = role.NiceName;
         __instance.FilterText.color = color;
     }
-}
+}

MiraAPI/Patches/Roles/HudManagerPatches.cs

@@ -12,7 +12,7 @@ namespace MiraAPI.Patches.Roles;
 public static class HudManagerPatches
 {
     // Custom role tab.
-    private static TaskPanelBehaviour? _roleTab;
+    public static TaskPanelBehaviour? RoleTab;
 
     /// <summary>
     /// Fixes Kill Button not showing for Neutral killing role.
@@ -38,9 +38,9 @@ public static class HudManagerPatches
             __instance.SabotageButton.gameObject.SetActive(isActive && customRole.Configuration.CanUseSabotage);
         }
 
-        if (_roleTab)
+        if (RoleTab)
         {
-            _roleTab?.gameObject.SetActive(isActive);
+            RoleTab?.gameObject.SetActive(isActive);
         }
     }
 
@@ -62,18 +62,16 @@ public static class HudManagerPatches
 
         if (role is ICustomRole { Configuration.RoleHintType: RoleHintType.RoleTab } customRole)
         {
-            customRole.HudUpdate(__instance);
-
-            if (_roleTab == null)
+            if (RoleTab == null)
             {
-                _roleTab = CustomRoleManager.CreateRoleTab(customRole);
+                RoleTab = CustomRoleManager.CreateRoleTab(customRole);
             }
 
-            CustomRoleManager.UpdateRoleTab(_roleTab, customRole);
+            CustomRoleManager.UpdateRoleTab(RoleTab, customRole);
         }
-        else if (_roleTab)
+        else if (RoleTab)
         {
-            _roleTab?.gameObject.Destroy();
+            RoleTab?.gameObject.Destroy();
         }
     }
 }

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -14,6 +14,8 @@ public static class RoleManagerPatches
 {
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleManager.SetRole))]
+    // NOTE: As of 2025.5.20 update, this is INLINED in ONE place: GameManager::ReviveEveryoneFreeplay(void).
+    // Should not affect normal gameplay, but may cause issues in Freeplay.
     public static bool SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
     {
         if (!targetPlayer)
@@ -63,7 +65,7 @@ public static class RoleManagerPatches
     [HarmonyPatch(nameof(RoleManager.SelectRoles))]
     public static void ModifierSelectionPatches(RoleManager __instance)
     {
-        if (!AmongUsClient.Instance.AmHost)
+        if (!AmongUsClient.Instance.AmHost || !ModifierManager.MiraAssignsModifiers)
         {
             return;
         }

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -1,5 +1,6 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
+using Il2CppSystem.Collections.Generic;
 using MiraAPI.Roles;
 using Reactor.Utilities;
 
@@ -12,7 +13,24 @@ namespace MiraAPI.Patches.Roles;
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
-    /// Set the role chance for custom Launchpad roles based on config
+    /// This patch fixes GetNumPerGame being inlined (2025.5.20) in the original code.
+    /// </summary>
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV09.AnyRolesEnabled))]
+    public static bool AnyRolesEnabledPrefix(RoleOptionsCollectionV09 __instance, ref bool __result)
+    {
+        foreach (KeyValuePair<RoleTypes, RoleDataV09> keyValuePair in __instance.roles)
+        {
+            if (__instance.GetNumPerGame(keyValuePair.Key) > 0)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// Set the role chance for custom Launchpad roles based on config.
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
@@ -42,7 +60,7 @@ public static class RoleOptionsCollectionPatch
     }
 
     /// <summary>
-    /// Set the amount for custom Launchpad roles based on config
+    /// Set the amount for custom Launchpad roles based on config.
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]

MiraAPI/Patches/Roles/SabotageButtonPatch.cs

@@ -4,7 +4,7 @@ using MiraAPI.Roles;
 namespace MiraAPI.Patches.Roles;
 
 [HarmonyPatch(typeof(SabotageButton))]
-public class SabotageButtonPatch
+public static class SabotageButtonPatch
 {
     /// <summary>
     /// Patches the Sabotage button to check if the player's custom role can use sabotage.

MiraAPI/Patches/ServerDropdownPatch.cs

@@ -0,0 +1,59 @@
+using HarmonyLib;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.SceneManagement;
+
+namespace MiraAPI.Patches;
+
+[HarmonyPatch(typeof(ServerDropdown), nameof(ServerDropdown.FillServerOptions))]
+public static class ServerDropdownPatch
+{
+    public static bool Prefix(ServerDropdown __instance)
+    {
+        var num = 0;
+        __instance.background.size = new Vector2(8.4f, 4.8f);
+
+        foreach (var regionInfo in DestroyableSingleton<ServerManager>.Instance.AvailableRegions)
+        {
+            var findingGame = SceneManager.GetActiveScene().name is "FindAGame";
+
+            if (DestroyableSingleton<ServerManager>.Instance.CurrentRegion.Equals(regionInfo))
+            {
+                __instance.defaultButtonSelected = __instance.firstOption;
+                __instance.firstOption.ChangeButtonText(
+                    DestroyableSingleton<TranslationController>.Instance.GetStringWithDefault(
+                        regionInfo.TranslateName,
+                        regionInfo.Name));
+            }
+            else
+            {
+                var region = regionInfo;
+                var serverListButton = __instance.ButtonPool.Get<ServerListButton>();
+                var x = num % 2 == 0 ? -2 : 2;
+                if (findingGame)
+                {
+                    x += 2;
+                }
+                var y = -0.55f * (num / 2);
+                serverListButton.transform.localPosition = new Vector3(x, __instance.y_posButton + y, -1f);
+                serverListButton.transform.localScale = Vector3.one;
+                serverListButton.Text.text =
+                    DestroyableSingleton<TranslationController>.Instance.GetStringWithDefault(
+                        regionInfo.TranslateName,
+                        regionInfo.Name);
+                serverListButton.Text.ForceMeshUpdate();
+                serverListButton.Button.OnClick.RemoveAllListeners();
+                serverListButton.Button.OnClick.AddListener((UnityAction)(() => { __instance.ChooseOption(region); }));
+                __instance.controllerSelectable.Add(serverListButton.Button);
+                __instance.background.transform.localPosition = new Vector3(
+                    findingGame ? 2f : 0f,
+                    __instance.initialYPos + (-0.3f * (num / 2)),
+                    0f);
+                __instance.background.size = new Vector2(__instance.background.size.x, 1.2f + (0.6f * (num / 2)));
+                num++;
+            }
+        }
+
+        return false;
+    }
+}

MiraAPI/Patches/Voting/DummyBehaviourPatch.cs

@@ -1,16 +1,79 @@
-using HarmonyLib;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using BepInEx.Unity.IL2CPP.Utils.Collections;
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Meeting.Voting;
 using MiraAPI.Utilities;
+using MiraAPI.Voting;
+using Reactor.Utilities;
+using Reactor.Utilities.Extensions;
+using UnityEngine;
 
 namespace MiraAPI.Patches.Voting;
 
-[HarmonyPatch(typeof(DummyBehaviour), nameof(DummyBehaviour.Update))]
-internal static class DummyBehaviourPatch
+[HarmonyPatch(typeof(DummyBehaviour))]
+internal static class DummyBehaviourPatches
 {
-    public static void Postfix(DummyBehaviour __instance)
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(DummyBehaviour.Update))]
+    public static bool DummyUpdatePatch(DummyBehaviour __instance)
     {
-        if (MeetingHud.Instance && __instance.myPlayer.GetVoteData())
+        NetworkedPlayerInfo data = __instance.myPlayer.Data;
+        if (data == null || data.IsDead) return false;
+
+        if (MeetingHud.Instance)
         {
-            __instance.voted = __instance.myPlayer.GetVoteData().VotesRemaining == 0;
+            if (!__instance.voted)
+            {
+                __instance.StartCoroutine(CoDoVote(__instance).WrapToIl2Cpp());
+            }
+        }
+        else
+        {
+            __instance.voted = false;
+        }
+
+        return false;
+    }
+
+    private static IEnumerator CoDoVote(DummyBehaviour dummy)
+    {
+        Logger<MiraApiPlugin>.Warning(dummy.voted);
+        dummy.voted = true;
+        yield return new WaitForSeconds(dummy.voteTime.Next());
+
+        var dummyVoteEvent = new DummyVoteEvent(dummy);
+        MiraEventManager.InvokeEvent(dummyVoteEvent);
+
+        if (dummyVoteEvent.IsCancelled)
+        {
+            dummy.voted = false;
+            yield break;
+        }
+
+        List<byte> potentialSuspects = new();
+        potentialSuspects.AddRange(PlayerControl.AllPlayerControls
+            .ToArray()
+            .Where(p => p != dummy.myPlayer)
+            .Where(p => dummyVoteEvent.PlayerIsValid(p))
+            .Select(p => p.PlayerId));
+
+        if (dummyVoteEvent.CanSkip)
+        {
+            potentialSuspects.Add(253);
+        }
+
+        if (CanVote(dummy))
+        {
+            VotingUtils.RpcCastVote(PlayerControl.LocalPlayer, dummy.myPlayer.PlayerId, potentialSuspects.Random());
         }
     }
+
+    private static bool CanVote(this DummyBehaviour dummy)
+    {
+        var dummyVoteData = dummy.myPlayer.GetVoteData();
+        return dummyVoteData.VotesRemaining > 0;
+    }
 }

MiraAPI/Patches/Voting/MeetingHudPatches.cs

@@ -8,7 +8,6 @@ using MiraAPI.Events.Vanilla.Meeting.Voting;
 using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Voting;
-using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Voting;
 
@@ -206,6 +205,7 @@ internal static class MeetingHudPatches
     // TODO: figure out a way to do host-authorization since right now any player can send RpcCastVote
     [HarmonyPrefix]
     [HarmonyPatch(nameof(MeetingHud.CmdCastVote))]
+    // Although this method is inlined in MeetingHud.Confirm, the next patch fixes that.
     public static bool CmdCastVoteOverridePatch(MeetingHud __instance, byte playerId, byte suspectIdx)
     {
         VotingUtils.RpcCastVote(PlayerControl.LocalPlayer, playerId, suspectIdx);

MiraAPI/PluginLoading/IMiraPlugin.cs

@@ -2,8 +2,19 @@
 
 namespace MiraAPI.PluginLoading;
 
+/// <summary>
+/// The interface that all Mira plugins must implement.
+/// </summary>
 public interface IMiraPlugin
 {
+    /// <summary>
+    /// Gets the name to display on the options menu.
+    /// </summary>
     string OptionsTitleText { get; }
+
+    /// <summary>
+    /// Gets the BepInEx configuration file for the plugin.
+    /// </summary>
+    /// <returns>The BepInEx configuration file for the plugin.</returns>
     public ConfigFile GetConfigFile();
 }

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -11,12 +11,14 @@ using MiraAPI.GameEnd;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.Hud;
+using MiraAPI.Keybinds;
 using MiraAPI.Modifiers;
 using MiraAPI.Presets;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Networking;
 using Reactor.Utilities;
+using UnityEngine;
 
 namespace MiraAPI.PluginLoading;
 
@@ -55,21 +57,29 @@ public sealed class MiraPluginManager
                     continue;
                 }
 
-                foreach (var method in type.GetMethods(BindingFlags.Static | BindingFlags.Public))
+                foreach (var method in type.GetMethods())
                 {
                     var eventAttribute = method.GetCustomAttribute<RegisterEventAttribute>();
-                    if (eventAttribute != null)
+                    if (eventAttribute == null)
                     {
-                        var parameters = method.GetParameters();
-                        if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
-                        {
-                            Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
-                            continue;
-                        }
-
-                        var paramType = parameters[0].ParameterType;
-                        MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
+                        continue;
                     }
+
+                    if (!method.IsStatic)
+                    {
+                        Logger<MiraApiPlugin>.Error($"Event method {method.Name} in {type.Name} must be static.");
+                        continue;
+                    }
+
+                    var parameters = method.GetParameters();
+                    if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
+                    {
+                        Logger<MiraApiPlugin>.Error($"Invalid event registration method {method.Name} in {type.Name}");
+                        continue;
+                    }
+
+                    var paramType = parameters[0].ParameterType;
+                    MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
                 }
 
                 if (RegisterModifier(type, info))
@@ -82,13 +92,13 @@ public sealed class MiraPluginManager
                     continue;
                 }
 
-                if (RegisterRoleAttribute(type, info, out var role))
+                if (RegisterRole(type, info, out var role))
                 {
                     roles.Add(role);
                     continue;
                 }
 
-                if (RegisterButtonAttribute(type, info))
+                if (RegisterButton(type, info))
                 {
                     continue;
                 }
@@ -121,7 +131,16 @@ public sealed class MiraPluginManager
             CustomButtonManager.Buttons = new ReadOnlyCollection<CustomActionButton>(CustomButtonManager.CustomButtons);
 
             // Cache all the registered plugins into an array for easy access
-            RegisteredPlugins = [.._registeredPlugins.Values];
+            RegisteredPlugins = [.. _registeredPlugins.Values];
+
+            ModifierManager.Modifiers = new ReadOnlyCollection<BaseModifier>(ModifierManager.InternalModifiers);
+
+            foreach (var button in CustomButtonManager.Buttons)
+            {
+                KeybindManager.Register($"{button.Name}_Keybind", $"Keybind for {button.Name}", button.Defaultkeybind, button.ClickHandler, modifier1: button.Modifier1, modifier2: button.Modifier2, modifier3: button.Modifier3);
+
+                Logger<MiraApiPlugin>.Info($"Registered keybind for button '{button.GetType().Name}' with default key {button.Defaultkeybind}.");
+            }
         };
     }
 
@@ -164,6 +183,12 @@ public sealed class MiraPluginManager
 
             foreach (var property in type.GetProperties())
             {
+                if (property.GetMethod?.IsStatic == true)
+                {
+                    Logger<MiraApiPlugin>.Error($"Option property {property.Name} in {type.Name} must not be static.");
+                    continue;
+                }
+
                 if (property.PropertyType.IsAssignableTo(typeof(IModdedOption)))
                 {
                     ModdedOptionsManager.RegisterPropertyOption(type, property, pluginInfo);
@@ -179,16 +204,21 @@ public sealed class MiraPluginManager
                 ModdedOptionsManager.RegisterAttributeOption(type, attribute, property, pluginInfo);
             }
 
+            foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(IModdedOption))))
+            {
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for options.");
+            }
+
             return true;
         }
         catch (Exception e)
         {
-            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e}");
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e.ToString()}");
         }
         return false;
     }
 
-    private static bool RegisterRoleAttribute(Type type, MiraPluginInfo pluginInfo, [NotNullWhen(true)] out Type? role)
+    private static bool RegisterRole(Type type, MiraPluginInfo pluginInfo, [NotNullWhen(true)] out Type? role)
     {
         role = null;
         try
@@ -244,6 +274,11 @@ public sealed class MiraPluginManager
 
                 PaletteManager.CustomColors.Add(color);
             }
+
+            foreach (var field in type.GetFields().Where(f => f.FieldType.IsAssignableTo(typeof(CustomColor))))
+            {
+                Logger<MiraApiPlugin>.Error($"{field.Name} is a field, not a property. Use properties for colors.");
+            }
         }
         catch (Exception e)
         {
@@ -264,7 +299,7 @@ public sealed class MiraPluginManager
         }
     }
 
-    private static bool RegisterButtonAttribute(Type type, MiraPluginInfo pluginInfo)
+    private static bool RegisterButton(Type type, MiraPluginInfo pluginInfo)
     {
         try
         {

MiraAPI/Presets/PresetManager.cs

@@ -69,7 +69,8 @@ public static class PresetManager
 
         foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
         {
-            Logger<MiraApiPlugin>.Info($"Loading preset file {file}");
+            var fileName = Path.GetFileName(file);
+            Logger<MiraApiPlugin>.Info($"Loading preset file {fileName}");
             var presetName = Path.GetFileNameWithoutExtension(file);
             var presetConfig = new ConfigFile(file, false)
             {
@@ -90,6 +91,6 @@ public static class PresetManager
 
             plugin.InternalPresets.Add(new OptionPreset(presetName, plugin, presetConfig));
         }
-        plugin.Presets = [.. plugin.InternalPresets];
+        plugin.Presets = [..plugin.InternalPresets];
     }
 }

MiraAPI/Presets/SavePresetPopup.cs

@@ -1,6 +1,4 @@
 using System;
-using Il2CppInterop.Runtime.InteropTypes.Fields;
-using MiraAPI.Modifiers.ModifierDisplay;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities.Attributes;
@@ -9,16 +7,21 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 [RegisterInIl2Cpp]
-public class SavePresetPopup(nint ptr) : Minigame(ptr)
+#pragma warning disable S3903
+#pragma warning disable CA1050
+public class SavePresetPopup(nint cppPtr) : Minigame(cppPtr)
+#pragma warning restore CA1050
+#pragma warning restore S3903
 {
-    private PassiveButton saveButton;
-    private PassiveButton closeButton;
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
     private TextMeshPro textBoxText;
     private TextBoxTMP textBox;
 
     private Action<string> onSave;
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
 
     // Cleanup holder object
     public void OnDestroy()
@@ -28,13 +31,14 @@ public class SavePresetPopup(nint ptr) : Minigame(ptr)
 
     public override void Close()
     {
+        // no-op
     }
 
     private void Awake()
     {
         var textboxHolder = transform.GetChild(1).GetChild(1);
-        saveButton = transform.FindChild("SaveButton").GetComponent<PassiveButton>();
-        closeButton = transform.FindChild("CloseButton").GetComponent<PassiveButton>();
+        var saveButton = transform.FindChild("SaveButton").GetComponent<PassiveButton>();
+        var closeButton = transform.FindChild("CloseButton").GetComponent<PassiveButton>();
         textBox = textboxHolder.GetChild(0).GetComponent<TextBoxTMP>();
         textBoxText = textBox.transform.GetChild(0).GetComponent<TextMeshPro>();
 
@@ -64,7 +68,11 @@ public class SavePresetPopup(nint ptr) : Minigame(ptr)
 
         foreach (var tmp in gameObject.GetComponentsInChildren<TextMeshPro>())
         {
-            if (tmp.gameObject.transform.parent.name == "Textbox") continue;
+            if (tmp.gameObject.transform.parent.name == "Textbox")
+            {
+                continue;
+            }
+
             var text = tmp.text;
             tmp.text = $"<font=\"LiberationSans SDF\" material=\"LiberationSans SDF RadialMenu Material\">{text}</font>";
         }
@@ -78,9 +86,9 @@ public class SavePresetPopup(nint ptr) : Minigame(ptr)
             transform =
             {
                 parent = Camera.main!.transform,
+                localPosition = new Vector3(0, -1f, -500),
             },
         };
-        holder.transform.localPosition = new Vector3(0, -1f, -500);
 
         var gameObject = Instantiate(MiraAssets.PresetSavePopup.LoadAsset(), holder.transform);
         var popup = gameObject.GetComponent<SavePresetPopup>();
@@ -88,4 +96,3 @@ public class SavePresetPopup(nint ptr) : Minigame(ptr)
         popup.Begin(null);
     }
 }
-

MiraAPI/Roles/CustomRoleManager.cs

@@ -35,6 +35,16 @@ public static class CustomRoleManager
     public static readonly LoadableAsset<AudioClip> ImpostorIntroSound =
         CustomRoleUtils.GetIntroSound(RoleTypes.Impostor)!;
 
+    /// <summary>
+    /// Gets the list of custom roles as RoleBehaviour objects.
+    /// </summary>
+    public static IReadOnlyList<RoleBehaviour> CustomRoleBehaviours { get; private set; } = [];
+
+    /// <summary>
+    /// Gets the list of custom roles as ICustomRole objects.
+    /// </summary>
+    public static IReadOnlyList<ICustomRole> CustomMiraRoles { get; private set; } = [];
+
     internal static readonly Dictionary<ushort, RoleBehaviour> CustomRoles = [];
     internal static readonly Dictionary<Type, ushort> RoleIds = [];
 
@@ -53,6 +63,9 @@ public static class CustomRoleManager
         {
             RoleManager.GhostRoles.Add(role.Role);
         }
+
+        CustomRoleBehaviours = CustomRoles.Values.ToList();
+        CustomMiraRoles = CustomRoles.Values.OfType<ICustomRole>().ToList();
     }
 
     internal static void RegisterRoleTypes(List<Type> roles, MiraPluginInfo pluginInfo)

MiraAPI/Roles/CustomRoleSingleton.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace MiraAPI.Roles;
 
@@ -8,12 +9,11 @@ namespace MiraAPI.Roles;
 /// <typeparam name="T">The role you are trying to access.</typeparam>
 public static class CustomRoleSingleton<T> where T : ICustomRole
 {
-    private static ICustomRole? _instance;
+    private static T? _instance;
 
     /// <summary>
     /// Gets the instance of the role.
     /// </summary>
-#pragma warning disable CA1000
-    public static ICustomRole Instance => _instance ??= CustomRoleManager.CustomRoles.Values.OfType<T>().Single();
-#pragma warning restore CA1000
+    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "This is a utility class to get the instance of a custom role.")]
+    public static T Instance => _instance ??= CustomRoleManager.CustomRoles.Values.OfType<T>().Single();
 }

MiraAPI/Roles/CustomRoleUtils.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using AmongUs.GameOptions;
 using MiraAPI.Utilities.Assets;
+using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Roles;
@@ -42,7 +43,7 @@ public static class CustomRoleUtils
     public static StringBuilder CreateForRole(ICustomRole role)
     {
         var taskStringBuilder = new StringBuilder();
-        taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleColor.ToTextColor()}You are a <b>{role.RoleName}.</b></color>");
+        taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleColor.ToTextColor()}Your role is <b>{role.RoleName}.</b></color>");
         taskStringBuilder.Append("<size=70%>");
         taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleLongDescription}");
         return taskStringBuilder;
@@ -56,7 +57,21 @@ public static class CustomRoleUtils
     public static LoadableAsset<AudioClip>? GetIntroSound(RoleTypes roleType)
     {
         var role = RoleManager.Instance.AllRoles.FirstOrDefault(role => role.Role == roleType);
-        if (role is ICustomRole customRole) return customRole.Configuration.IntroSound;
+        if (role is ICustomRole customRole)
+        {
+            return customRole.Configuration.IntroSound;
+        }
+
         return new PreloadedAsset<AudioClip>(role!.IntroSound);
     }
+
+    /// <summary>
+    /// Determines if a role is a custom role or not.
+    /// </summary>
+    /// <param name="role">The RoleBehaviour to check.</param>
+    /// <returns>True if the role is a custom role, false otherwise.</returns>
+    public static bool IsCustomRole(this RoleBehaviour role)
+    {
+        return CustomRoleManager.CustomRoles.ContainsKey((ushort)role.Role);
+    }
 }