Merge branch 'dev' into 2025.3.25

AmongUs.props

@@ -2,10 +2,10 @@
     <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="2024.10.29" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2025.3.25" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
-        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" PrivateAssets="all" ExcludeAssets="runtime" />
+        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
     </ItemGroup>
 
     <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">

Directory.Build.props

@@ -34,7 +34,7 @@
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
         <AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" Visible="false" />
 
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,6 +1,6 @@
 using AmongUs.GameOptions;
 using MiraAPI.Roles;
-using MiraAPI.Utilities;
+using Reactor.Utilities;
 using TMPro;
 using UnityEngine;
 
@@ -20,6 +20,12 @@ public class ChameloenRole : CrewmateRole, ICustomRole
         IntroSound = CustomRoleUtils.GetIntroSound(RoleTypes.Shapeshifter),
     };
 
+    public override void Initialize(PlayerControl player)
+    {
+        Player = player;
+        Logger<ExamplePlugin>.Error("Initializing ChamelonRole for player: " + player.PlayerId);
+    }
+
     public void PlayerControlFixedUpdate(PlayerControl playerControl)
     {
         if (playerControl.MyPhysics.Velocity.magnitude > 0)

MiraAPI/Events/MiraEventManager.cs

@@ -21,7 +21,7 @@ public static class MiraEventManager
     public static bool InvokeEvent<T>(T eventInstance) where T : MiraEvent
     {
         EventWrappers.TryGetValue(typeof(T), out var handlers);
-        if (handlers == null)
+        if (handlers == null || handlers.Count == 0)
         {
             return false;
         }
@@ -43,7 +43,7 @@ public static class MiraEventManager
     public static bool InvokeEvent(MiraEvent eventInstance, Type type)
     {
         EventWrappers.TryGetValue(type, out var handlers);
-        if (handlers == null)
+        if (handlers == null || handlers.Count == 0)
         {
             return false;
         }
@@ -61,47 +61,51 @@ public static class MiraEventManager
     /// </summary>
     /// <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. Higher values are called first.</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)
     {
         if (!type.IsSubclassOf(typeof(MiraEvent)))
         {
-            Logger<MiraApiPlugin>.Error($"Type must be a subclass of MiraEvent: {nameof(type)}");
+            Logger<MiraApiPlugin>.Error($"Type must be a subclass of MiraEvent: {type.FullName}");
             return;
         }
 
-        if (!EventWrappers.TryGetValue(type, out var handlers))
-        {
-            handlers = [];
-            EventWrappers.Add(type, handlers);
-        }
+        EventWrappers.TryAdd(type, []);
+        var handlers = EventWrappers[type];
 
         var @delegate = Delegate.CreateDelegate(typeof(Action<>).MakeGenericType(type), methodInfo);
-        handlers.Add(new MiraEventWrapper(@delegate, priority));
+        var eventWrapper = new MiraEventWrapper(@delegate, priority);
+
+        var index = handlers.BinarySearch(eventWrapper, Comparer<MiraEventWrapper>.Create((a, b) => a.Priority.CompareTo(b.Priority)));
+
+        if (index < 0)
+        {
+            index = ~index;
+        }
+
+        handlers.Insert(index, eventWrapper);
     }
 
     /// <summary>
     /// Register an event.
     /// </summary>
     /// <param name="handler">The callback method/handler for the event.</param>
-    /// <param name="priority">The priority of the event handler. Higher values are called first.</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
     {
-        if (!EventWrappers.ContainsKey(typeof(T)))
-        {
-            EventWrappers.Add(typeof(T), []);
-        }
+        EventWrappers.TryAdd(typeof(T), []);
 
         var handlers = EventWrappers[typeof(T)];
-        handlers.Add(new MiraEventWrapper(handler, priority));
-    }
+        var eventWrapper = new MiraEventWrapper(handler, priority);
 
-    internal static void SortAllHandlers()
-    {
-        foreach (var handlers in EventWrappers.Values)
+        var index = handlers.BinarySearch(eventWrapper, Comparer<MiraEventWrapper>.Create((a, b) => a.Priority.CompareTo(b.Priority)));
+
+        if (index < 0)
         {
-            handlers.Sort((a, b) => a.Priority.CompareTo(b.Priority));
+            index = ~index;
         }
+
+        handlers.Insert(index, eventWrapper);
     }
 }

MiraAPI/Events/MiraEventWrapper.cs

@@ -13,7 +13,7 @@ public class MiraEventWrapper
     public Delegate EventHandler { get; }
 
     /// <summary>
-    /// Gets the priority of the handler. Higher values are called first.
+    /// Gets the priority of the handler. Lower values are called first.
     /// </summary>
     public int Priority { get; }
 

MiraAPI/Events/RegisterEventAttribute.cs

@@ -9,14 +9,14 @@ namespace MiraAPI.Events;
 public class RegisterEventAttribute : Attribute
 {
     /// <summary>
-    /// Gets the priority of the event.
+    /// Gets the priority of the event. Lower values are called first.
     /// </summary>
     public int Priority { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="RegisterEventAttribute"/> class.
     /// </summary>
-    /// <param name="priority">The priority of the event.</param>
+    /// <param name="priority">The priority of the event. Lower values are called first.</param>
     public RegisterEventAttribute(int priority = 0)
     {
         Priority = priority;

MiraAPI/Events/Vanilla/Gameplay/IntroEndEvent.cs

@@ -0,0 +1,12 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// The event that is invoked when the intro cutscene has finished playing.
+/// </summary>
+public class IntroEndEvent(IntroCutscene introCutscene) : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the IntroCutscene.
+    /// </summary>
+    public IntroCutscene IntroCutscene { get; } = introCutscene;
+}

MiraAPI/Events/Vanilla/Gameplay/RoundStartEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// Start Round event, invoked on IntroCutscene.OnDestroy and ExileController.WrapUp.
+/// </summary>
+public class RoundStartEvent : MiraEvent
+{
+    /// <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="RoundStartEvent"/> class.
+    /// </summary>
+    /// <param name="triggeredByIntro">Whether the event was triggered by the intro or not.</param>
+    public RoundStartEvent(bool triggeredByIntro)
+    {
+        TriggeredByIntro = triggeredByIntro;
+    }
+}

MiraAPI/Events/Vanilla/Meeting/EndMeetingEvent.cs

@@ -0,0 +1,12 @@
+namespace MiraAPI.Events.Vanilla.Meeting;
+
+/// <summary>
+/// The event that is invoked when the meeting has ended.
+/// </summary>
+public class EndMeetingEvent(MeetingHud meetingHud) : MiraEvent
+{
+    /// <summary>
+    /// Gets the MeetingHud instance.
+    /// </summary>
+    public MeetingHud MeetingHud { get; } = meetingHud;
+}

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

@@ -0,0 +1,13 @@
+namespace MiraAPI.Events.Vanilla.Meeting.Voting;
+
+/// <summary>
+/// The event that is invoked when the voting phase of a meeting is complete.
+/// </summary>
+/// <param name="meetingHud">The MeetingHud instance.</param>
+public class VotingCompleteEvent(MeetingHud meetingHud) : MiraEvent
+{
+    /// <summary>
+    /// Gets the MeetingHud instance.
+    /// </summary>
+    public MeetingHud MeetingHud { get; } = meetingHud;
+}

MiraAPI/Hud/CustomActionButton.cs

@@ -417,9 +417,12 @@ public abstract class CustomActionButton
     /// <param name="playerControl">The local PlayerControl.</param>
     public virtual void FixedUpdateHandler(PlayerControl playerControl)
     {
-        if (Timer >= 0 && !TimerPaused)
+        if (Timer >= 0)
         {
-            Timer -= Time.deltaTime;
+            if (!TimerPaused)
+            {
+                Timer -= Time.deltaTime;
+            }
         }
         else if (HasEffect && EffectActive)
         {
@@ -428,25 +431,28 @@ public abstract class CustomActionButton
             OnEffectEnd();
         }
 
-        if (CanUse())
+        if (Button)
         {
-            Button?.SetEnabled();
-        }
-        else
-        {
-            Button?.SetDisabled();
-        }
+            if (CanUse())
+            {
+                Button.SetEnabled();
+            }
+            else
+            {
+                Button.SetDisabled();
+            }
 
-        if (EffectActive)
-        {
-            Button?.SetFillUp(Timer, EffectDuration);
+            if (EffectActive)
+            {
+                Button.SetFillUp(Timer, EffectDuration);
 
-            Button!.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
-            Button!.cooldownTimerText.gameObject.SetActive(true);
-        }
-        else
-        {
-            Button?.SetCoolDown(Timer, Cooldown);
+                Button.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString(NumberFormatInfo.InvariantInfo);
+                Button.cooldownTimerText.gameObject.SetActive(true);
+            }
+            else
+            {
+                Button.SetCoolDown(Timer, Cooldown);
+            }
         }
 
         FixedUpdate(playerControl);

MiraAPI/Hud/CustomPlayerMenu.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using AmongUs.GameOptions;
 using Il2CppInterop.Runtime.Attributes;
@@ -8,6 +9,8 @@ using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
 using UnityEngine;
 using UnityEngine.Events;
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#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.
 
 namespace MiraAPI.Hud;
 
@@ -16,22 +19,18 @@ namespace MiraAPI.Hud;
 /// </summary>
 /// <param name="il2CppPtr">Used by Il2Cpp. Do not use constructor, this is a MonoBehaviour.</param>
 [RegisterInIl2Cpp]
+[SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "Unity Convention")]
+[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Unity Convention")]
+[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "Unity Convention")]
 public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
 {
-    public ShapeshifterPanel PanelPrefab;
-
-    public float XStart = -0.8f;
-
-    public float YStart = 2.15f;
-
-    public float XOffset = 1.95f;
-
-    public float YOffset = -0.65f;
-
-    public UiElement BackButton;
-
-    public UiElement DefaultButtonSelected;
-
+    public ShapeshifterPanel panelPrefab;
+    public float xStart = -0.8f;
+    public float yStart = 2.15f;
+    public float xOffset = 1.95f;
+    public float yOffset = -0.65f;
+    public UiElement backButton;
+    public UiElement defaultButtonSelected;
     public List<ShapeshifterPanel> potentialVictims;
 
     /// <summary>
@@ -42,17 +41,17 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
     {
         var shapeShifterRole = RoleManager.Instance.GetRole(RoleTypes.Shapeshifter);
 
-        var ogMenu = shapeShifterRole.TryCast<ShapeshifterRole>().ShapeshifterMenu;
+        var ogMenu = shapeShifterRole.TryCast<ShapeshifterRole>()!.ShapeshifterMenu;
         var newMenu = Instantiate(ogMenu);
         var customMenu = newMenu.gameObject.AddComponent<CustomPlayerMenu>();
 
-        customMenu.PanelPrefab = newMenu.PanelPrefab;
-        customMenu.XStart = newMenu.XStart;
-        customMenu.YStart = newMenu.YStart;
-        customMenu.XOffset = newMenu.XOffset;
-        customMenu.YOffset = newMenu.YOffset;
-        customMenu.BackButton = newMenu.BackButton;
-        var back = customMenu.BackButton.GetComponent<PassiveButton>();
+        customMenu.panelPrefab = newMenu.PanelPrefab;
+        customMenu.xStart = newMenu.XStart;
+        customMenu.yStart = newMenu.YStart;
+        customMenu.xOffset = newMenu.XOffset;
+        customMenu.yOffset = newMenu.YOffset;
+        customMenu.backButton = newMenu.BackButton;
+        var back = customMenu.backButton.GetComponent<PassiveButton>();
         back.OnClick.RemoveAllListeners();
         back.OnClick.AddListener((UnityAction)(() =>
         {
@@ -65,7 +64,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
 
         newMenu.DestroyImmediate();
 
-        customMenu.transform.SetParent(Camera.main.transform, false);
+        customMenu.transform.SetParent(Camera.main!.transform, false);
         customMenu.transform.localPosition = new Vector3(0f, 0f, -50f);
         return customMenu;
     }
@@ -75,6 +74,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
         ControllerManager.Instance.CloseOverlayMenu(name);
     }
 
+    /// <inheritdoc />
     public override void Begin(PlayerTask task)
     {
         throw new NotImplementedException("Use the other Begin method.");
@@ -90,7 +90,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
     {
         MinigameStubs.Begin(this, null);
 
-        var back = BackButton.GetComponent<PassiveButton>();
+        var back = backButton.GetComponent<PassiveButton>();
         back.OnClick.AddListener((UnityAction)(() =>
         {
             onClick(null);
@@ -107,13 +107,13 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
             var num = i % 3;
             var num2 = i / 3;
             var flag = PlayerControl.LocalPlayer.Data.Role.NameColor == player.Data.Role.NameColor;
-            var shapeshifterPanel = Instantiate(PanelPrefab, transform);
-            shapeshifterPanel.transform.localPosition = new Vector3(XStart + num * XOffset, YStart + num2 * YOffset, -1f);
+            var shapeshifterPanel = Instantiate(panelPrefab, transform);
+            shapeshifterPanel.transform.localPosition = new Vector3(xStart + num * xOffset, yStart + num2 * yOffset, -1f);
             shapeshifterPanel.SetPlayer(i, player.Data, (Il2CppSystem.Action)(() => { onClick(player); }));
             shapeshifterPanel.NameText.color = flag ? player.Data.Role.NameColor : Color.white;
             potentialVictims.Add(shapeshifterPanel);
             list2.Add(shapeshifterPanel.Button);
         }
-        ControllerManager.Instance.OpenOverlayMenu(name, BackButton, DefaultButtonSelected, list2);
+        ControllerManager.Instance.OpenOverlayMenu(name, backButton, defaultButtonSelected, list2);
     }
 }

MiraAPI/MiraApiPlugin.cs

@@ -1,19 +1,12 @@
-using System;
-using BepInEx;
+using BepInEx;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
-using Il2CppInterop.Runtime;
 using MiraAPI.PluginLoading;
-using MiraAPI.Roles;
-using MonoMod.Utils;
 using Reactor;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
 using Reactor.Utilities;
-using TMPro;
 using UnityEngine;
-using UnityEngine.ProBuilder;
-using Delegate = Il2CppSystem.Delegate;
 
 namespace MiraAPI;
 
@@ -23,11 +16,20 @@ namespace MiraAPI;
 [BepInAutoPlugin("mira.api", "MiraAPI")]
 [BepInProcess("Among Us.exe")]
 [BepInDependency(ReactorPlugin.Id)]
+[BepInDependency(ModCompatibility.SubmergedId, BepInDependency.DependencyFlags.SoftDependency)]
 [ReactorModFlags(ModFlags.RequireOnAllClients)]
 public partial class MiraApiPlugin : BasePlugin
 {
+    /// <summary>
+    /// Gets the branding Mira API color.
+    /// </summary>
     public static Color MiraColor { get; } = new Color32(238, 154, 112, 255);
-    public static Color DefaultHeaderColor = new Color32(77, 77, 77, 255);
+
+    /// <summary>
+    /// Gets the default color for headers in the options menu.
+    /// </summary>
+    public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
+
     private static MiraPluginManager? PluginManager { get; set; }
     internal Harmony Harmony { get; } = new(Id);
 

MiraAPI/ModCompatibility.cs

@@ -0,0 +1,28 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using BepInEx.Unity.IL2CPP;
+
+namespace MiraAPI;
+
+/// <summary>
+/// Mod compatibility tools.
+/// </summary>
+public static class ModCompatibility
+{
+    /// <summary>
+    /// The ID for the Submerged mod.
+    /// </summary>
+    public const string SubmergedId = "Submerged";
+
+    /// <summary>
+    /// Checks if the Submerged mod is loaded.
+    /// </summary>
+    /// <param name="submergedAssembly">Submerged mod assembly if loaded, null otherwise.</param>
+    /// <returns>True if the Submerged mod is loaded, false otherwise.</returns>
+    public static bool SubmergedLoaded([NotNullWhen(true)] out Assembly? submergedAssembly)
+    {
+        var result = IL2CPPChainloader.Instance.Plugins.TryGetValue(SubmergedId, out var plugin);
+        submergedAssembly = result ? plugin?.Instance.GetType().Assembly : null;
+        return result;
+    }
+}

MiraAPI/Modifiers/BaseModifier.cs

@@ -104,6 +104,13 @@ public abstract class BaseModifier : IOptionable
     {
     }
 
+    /// <summary>
+    /// Called when a meeting starts.
+    /// </summary>
+    public virtual void OnMeetingStart()
+    {
+    }
+
     /// <summary>
     /// Determines whether the player can vent.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -29,9 +29,9 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     [HideFromIl2Cpp]
     private List<BaseModifier> Modifiers { get; set; } = [];
 
-    private PlayerControl? _player;
+    private PlayerControl _player = null!;
 
-    private TextMeshPro? _modifierText;
+    private TextMeshPro _modifierText = null!;
 
     private readonly List<BaseModifier> _toRemove = [];
 
@@ -42,9 +42,18 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         _toRemove.AddRange(Modifiers);
     }
 
-    private void Start()
+    private void Awake()
     {
         _player = GetComponent<PlayerControl>();
+        if (_player == null)
+        {
+            Logger<MiraApiPlugin>.Error("ModifierComponent could not find PlayerControl on the same GameObject.");
+            Destroy(this);
+            return;
+        }
+
+        ModifierExtensions.ModifierComponents.Add(_player, this);
+
         Modifiers = [];
 
         if (!_player.AmOwner)
@@ -58,14 +67,18 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
     private void FixedUpdate()
     {
+        var removed = _toRemove.Count > 0;
         foreach (var modifier in _toRemove.ToArray())
         {
+            _toRemove.Remove(modifier);
             modifier.OnDeactivate();
             Modifiers.Remove(modifier);
         }
 
+        var added = _toAdd.Count > 0;
         foreach (var modifier in _toAdd.ToArray())
         {
+            _toAdd.Remove(modifier);
             Modifiers.Add(modifier);
             modifier.Initialized = true;
             modifier.OnActivate();
@@ -76,14 +89,12 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             }
         }
 
-        if (_toAdd.Count > 0 || _toRemove.Count > 0)
+        if (removed || added)
         {
-            if (_player?.AmOwner == true)
+            if (_player.AmOwner && HudManager.InstanceExists)
             {
-                HudManager.Instance?.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled);
+                HudManager.Instance.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled);
             }
-            _toAdd.Clear();
-            _toRemove.Clear();
 
             ActiveModifiers = Modifiers.ToImmutableList();
         }
@@ -101,7 +112,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             modifier.Update();
         }
 
-        if (!_modifierText || _player?.AmOwner == false)
+        if (!_modifierText || !_player.AmOwner)
         {
             return;
         }
@@ -125,7 +136,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             builder.AppendLine(modifier.GetHudString());
         }
 
-        _modifierText!.text = showText ? builder.ToString() : string.Empty;
+        _modifierText.text = showText ? builder.ToString() : string.Empty;
+    }
+
+    private void OnDestroy()
+    {
+        // Remove this component from the global list when destroyed
+        ModifierExtensions.ModifierComponents.Remove(_player);
     }
 
     /// <summary>
@@ -492,4 +509,61 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     {
         return ActiveModifiers.Exists(x => x.UniqueId == id);
     }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its type.
+    /// </summary>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>True if the Modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier<T>(bool checkInactive, Func<T, bool>? predicate=null) where T : BaseModifier
+    {
+        return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
+        bool MatchExpr(BaseModifier bm) => bm is T modifier && (predicate == null || predicate(modifier));
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its type.
+    /// </summary>
+    /// <param name="type">The modifier type.</param>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <returns>True if the Modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier(Type type, bool checkInactive, Func<BaseModifier, bool>? predicate=null)
+    {
+        return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
+        bool MatchExpr(BaseModifier bm) => bm.GetType() == type && (predicate == null || predicate(bm));
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its type ID.
+    /// </summary>
+    /// <param name="id">The modifier's type ID.</param>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <returns>True if the modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier(uint id, bool checkInactive, Func<BaseModifier, bool>? predicate=null)
+    {
+        var type = ModifierManager.GetModifierType(id) ?? throw new InvalidOperationException(
+            $"Cannot get modifier with id {id} because it is not registered.");
+
+        return HasModifier(type, checkInactive, predicate);
+    }
+
+    /// <summary>
+    /// Checks if a player has an active modifier by its unique ID.
+    /// </summary>
+    /// <param name="id">The modifier's guid.</param>
+    /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
+    /// <returns>True if the modifier is present, false otherwise.</returns>
+    [HideFromIl2Cpp]
+    public bool HasModifier(Guid id, bool checkInactive)
+    {
+        return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
+        bool MatchExpr(BaseModifier bm) => bm.UniqueId == id;
+    }
 }

MiraAPI/Modifiers/ModifierExtensions.cs

@@ -180,6 +180,17 @@ public static class ModifierExtensions
         return player.GetModifierComponent().HasModifier(typeId, predicate);
     }
 
+    /// <summary>
+    /// Checks if the player has a specific modifier by its GUID.
+    /// </summary>
+    /// <param name="player">The PlayerControl instance.</param>
+    /// <param name="uniqueId">The unique ID of the modifier.</param>
+    /// <returns>True if the player has the modifier, false otherwise.</returns>
+    public static bool HasModifier(this PlayerControl player, Guid uniqueId)
+    {
+        return player.GetModifierComponent().HasModifier(uniqueId);
+    }
+
     /// <summary>
     /// Clears all modifiers from a player.
     /// </summary>
@@ -204,17 +215,6 @@ public static class ModifierExtensions
         }
     }
 
-    /// <summary>
-    /// Checks if the player has a specific modifier by its GUID.
-    /// </summary>
-    /// <param name="player">The PlayerControl instance.</param>
-    /// <param name="uniqueId">The unique ID of the modifier.</param>
-    /// <returns>True if the player has the modifier, false otherwise.</returns>
-    public static bool HasModifier(this PlayerControl player, Guid uniqueId)
-    {
-        return player.GetModifierComponent().HasModifier(uniqueId);
-    }
-
     /// <summary>
     /// Tries to get a modifier by its type.
     /// </summary>

MiraAPI/Modifiers/ModifierManager.cs

@@ -103,68 +103,57 @@ public static class ModifierManager
     {
         var rand = new Random();
 
-        foreach (var priority in PrioritiesToIdsMap.Keys.OrderByDescending(x => x))
+        // Filter and sort modifiers by descending priority.
+        var modifiers = IdToTypeModifierMap
+            .Where(x=>x.Value.IsAssignableTo(typeof(GameModifier)))
+            .Select(x => Activator.CreateInstance(x.Value) as GameModifier)
+            .OfType<GameModifier>()
+            .Where(x => x.GetAmountPerGame() > 0 && x.GetAssignmentChance() > 0)
+            .OrderByDescending(x => x.Priority())
+            .ToArray();
+
+        foreach (var modifier in modifiers)
         {
-            var filteredModifiers = new List<uint>();
+            var assignments = modifier.GetAmountPerGame();
 
-            foreach (var id in PrioritiesToIdsMap[priority])
+            var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
+            if (validPlayers.Count == 0)
             {
-                var mod = Activator.CreateInstance(IdToTypeModifierMap[id]) as GameModifier;
-                var chance = Math.Clamp(mod!.GetAssignmentChance(), 0, 100);
-                var count = mod.GetAmountPerGame();
-
-                if (chance == 0 || count == 0)
-                {
-                    continue;
-                }
-
-                var maxCount = plrs.Count(x => IsGameModifierValid(x, mod, id));
-
-                if (maxCount == 0)
-                {
-                    Logger<MiraApiPlugin>.Warning($"No players are valid for {mod.ModifierName}");
-                    continue;
-                }
-
-                var num = Math.Clamp(count, 0, maxCount);
-
-                for (var i = 0; i < num; i++)
-                {
-                    var randomNum = rand.Next(100);
-
-                    if (randomNum < chance)
-                    {
-                        filteredModifiers.Add(id);
-                    }
-                }
-            }
-
-            if (filteredModifiers.Count == 0)
-            {
-                Logger<MiraApiPlugin>.Warning($"No filtered modifiers for priority {priority}");
+                Logger<MiraApiPlugin>.Warning($"No valid players for modifier {modifier.ModifierName}");
                 continue;
             }
 
-            var shuffledList = filteredModifiers.Randomize();
+            assignments = Math.Min(assignments, validPlayers.Count);
+            var availablePlayers = new List<PlayerControl>(validPlayers);
 
-            if (shuffledList.Count > plrs.Count)
+            for (var i = 0; i < assignments; i++)
             {
-                shuffledList = shuffledList.GetRange(0, plrs.Count);
-            }
-
-            foreach (var id in shuffledList)
-            {
-                var mod = Activator.CreateInstance(IdToTypeModifierMap[id]) as GameModifier;
-                var plr = plrs.Where(x => IsGameModifierValid(x, mod!, id)).Random();
-
-                if (!plr || plr == null)
+                var chance = Math.Clamp(modifier.GetAssignmentChance(), 0, 100);
+                if (rand.Next(100) >= chance)
                 {
-                    Logger<MiraApiPlugin>.Warning($"Somehow valid players for modifier {mod!.ModifierName} disappeared");
+                    continue;
                 }
-                else
+
+                var candidates = availablePlayers
+                    .Where(x => IsGameModifierValid(x, modifier, modifier.TypeId))
+                    .ToList();
+
+                if (candidates.Count == 0)
                 {
-                    plr.RpcAddModifier(id);
+                    Logger<MiraApiPlugin>.Warning(
+                        $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
+                    break;
                 }
+
+                var plr = candidates.Random();
+                if (plr == null)
+                {
+                    Logger<MiraApiPlugin>.Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    continue;
+                }
+
+                plr.RpcAddModifier(modifier.TypeId);
+                availablePlayers.Remove(plr);
             }
         }
     }

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Linq;
+using AmongUs.Data;
 using AmongUs.GameOptions;
 using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
@@ -96,7 +97,7 @@ public static class CustomMurderRpc
             var flag = PlayerControl.LocalPlayer.Data.Role.Role == RoleTypes.GuardianAngel;
             if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
             {
-                StatsManager.Instance.IncrementStat(StringNames.StatsGuardianAngelCrewmatesProtected);
+                DataManager.Player.Stats.IncrementStat(StatID.Role_GuardianAngel_CrewmatesProtected);
                 AchievementManager.Instance.OnProtectACrewmate();
             }
 
@@ -127,14 +128,14 @@ public static class CustomMurderRpc
         DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
         if (source.AmOwner)
         {
-            StatsManager.Instance.IncrementStat(
+            DataManager.Player.Stats.IncrementStat(
                 GameManager.Instance.IsHideAndSeek()
-                    ? StringNames.StatsImpostorKills_HideAndSeek
-                    : StringNames.StatsImpostorKills);
+                    ? StatID.HideAndSeek_ImpostorKills
+                    : StatID.ImpostorKills);
 
             if (source.CurrentOutfitType == PlayerOutfitType.Shapeshifted)
             {
-                StatsManager.Instance.IncrementStat(StringNames.StatsShapeshifterShiftedKills);
+                DataManager.Player.Stats.IncrementStat(StatID.Role_Shapeshifter_ShiftedKills);
             }
 
             if (Constants.ShouldPlaySfx() && playKillSound)
@@ -152,7 +153,7 @@ public static class CustomMurderRpc
         target.gameObject.layer = LayerMask.NameToLayer("Ghost");
         if (target.AmOwner)
         {
-            StatsManager.Instance.IncrementStat(StringNames.StatsTimesMurdered);
+            DataManager.Player.Stats.IncrementStat(StatID.TimesMurdered);
             if (Minigame.Instance)
             {
                 try

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -0,0 +1,15 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch(typeof(SpawnInMinigame), nameof(SpawnInMinigame.Close))]
+internal static class SpawnInMinigamePatch
+{
+    public static void Postfix()
+    {
+        var @event = new RoundStartEvent(false);
+        MiraEventManager.InvokeEvent(@event);
+    }
+}

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch]
+internal static class SubmergedSpawnGamePatch
+{
+    public static bool Prepare()
+    {
+        return ModCompatibility.SubmergedLoaded(out _);
+    }
+
+    public static IEnumerable<MethodBase> TargetMethods()
+    {
+        if (ModCompatibility.SubmergedLoaded(out var subAss) &&
+            subAss.GetType("Submerged.SpawnIn.SubmarineSelectSpawn") is { } selectSpawn)
+        {
+            yield return AccessTools.Method(selectSpawn, "OnDestroy");
+        }
+    }
+
+    public static void Postfix()
+    {
+        var @event = new RoundStartEvent(false);
+        MiraEventManager.InvokeEvent(@event);
+    }
+}

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -18,7 +18,7 @@ namespace MiraAPI.Patches.Freeplay;
 [HarmonyPatch(typeof(TaskAdderGame))]
 internal static class TaskAdderPatches
 {
-    private static Scroller? _scroller;
+    private static Scroller _scroller = null!;
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
@@ -293,9 +293,9 @@ internal static class TaskAdderPatches
             chip.GetComponent<SpriteRenderer>().maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
         }
 
-        if (_scroller && _scroller != null)
+        if (_scroller)
         {
-            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 3, 1f);
+            _scroller.CalculateAndSetYBounds(__instance.ActiveItems.Count, 6, 5, 1.4f);
             _scroller.SetYBoundsMin(0.0f);
             _scroller.ScrollToTop();
         }

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -56,11 +56,11 @@ public static class IntroCutscenePatches
         }
     }
 
-    /*
     [HarmonyPostfix]
     [HarmonyPatch(nameof(IntroCutscene.OnDestroy))]
-    public static void GameBeginPatch()
+    public static void GameBeginPatch(IntroCutscene __instance)
     {
-        CustomGameModeManager.ActiveMode?.Initialize();
-    }*/
+        MiraEventManager.InvokeEvent(new IntroEndEvent(__instance));
+        MiraEventManager.InvokeEvent(new RoundStartEvent(true));
+    }
 }

MiraAPI/Patches/MinigameBeginErrorPatch.cs

@@ -0,0 +1,12 @@
+using HarmonyLib;
+
+namespace MiraAPI.Patches;
+
+[HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))]
+internal static class MinigameBeginErrorPatch
+{
+    public static void Prefix(Minigame __instance)
+    {
+        __instance.logger ??= new Logger(Logger.Category.Gameplay, "Minigame");
+    }
+}

MiraAPI/Patches/Modifiers/EndGameDidWinPatch.cs

@@ -2,13 +2,15 @@
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities;
+using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Modifiers;
 
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CoEndGame))]
+[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
 public static class EndGameDidWinPatch
 {
-    public static void Prefix()
+    public static void Postfix()
     {
         var gameOverReason = EndGameResult.CachedGameOverReason;
         EndGameResult.CachedWinners.Clear();
@@ -17,18 +19,26 @@ public static class EndGameDidWinPatch
         for (var i = 0; i < GameData.Instance.PlayerCount; i++)
         {
             var networkedPlayerInfo = players[i];
-            if (networkedPlayerInfo == null)
+            if (!networkedPlayerInfo)
             {
                 continue;
             }
 
             var didWin = networkedPlayerInfo.Role.DidWin(gameOverReason);
 
-            var modifierWin = networkedPlayerInfo.Object?.GetModifierComponent().GetModifiers<GameModifier>()
-                .FirstOrDefault(x => x.DidWin(gameOverReason) != null)?.DidWin(gameOverReason);
-            if (modifierWin != null)
+            bool? modifierDidWin = null;
+            foreach (var modifier in networkedPlayerInfo.Object.GetModifiers<GameModifier>().OrderByDescending(x => x.Priority()))
             {
-                didWin = modifierWin.Value;
+                var result = modifier.DidWin(gameOverReason);
+                if (!result.HasValue) continue;
+
+                modifierDidWin = result.Value;
+                break;
+            }
+
+            if (modifierDidWin.HasValue)
+            {
+                didWin = modifierDidWin.Value;
             }
 
             if (didWin)

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -4,7 +4,6 @@ using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities.Assets;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -260,7 +260,7 @@ public static class LobbyViewPanePatches
 
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any())
+            if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings))
             {
                 continue;
             }
@@ -335,7 +335,7 @@ public static class LobbyViewPanePatches
                     viewSettingsInfoPanelRoleVariant.chanceTitle.color =
                         viewSettingsInfoPanelRoleVariant.chanceBackground.color =
                             viewSettingsInfoPanelRoleVariant.background.color =
-                                customRole.RoleColor.GetAlternateColor();
+                                customRole.RoleColor.FindAlternateColor();
                 instance.settingsInfo.Add(viewSettingsInfoPanelRoleVariant.gameObject);
                 num -= 0.664f;
             }

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -83,10 +83,9 @@ public static class RoleSettingMenuPatches
         var quotaThing = __instance.categoryHeaderEditRoleOrigin.transform.FindChild("QuotaHeader");
         var template = __instance.transform.parent.parent.GetComponent<GameSettingMenu>().GameSettingsTab.categoryHeaderOrigin;
 
-
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any())
+            if (!grouping.Any() || grouping.All(x=>x.Configuration.HideSettings))
             {
                 continue;
             }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -15,14 +15,11 @@ namespace MiraAPI.Patches;
 /// General patches for the PlayerControl class.
 /// </summary>
 [HarmonyPatch(typeof(PlayerControl))]
-public static class PlayerControlPatches
+internal static class PlayerControlPatches
 {
-    /// <summary>
-    /// Adds the modifier component to the player on start.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Start))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlStartPostfix(PlayerControl __instance)
     {
         if (__instance.gameObject.TryGetComponent<ModifierComponent>(out var modifierComp))
@@ -39,12 +36,9 @@ public static class PlayerControlPatches
         __instance.gameObject.AddComponent<PlayerVoteData>();
     }
 
-    /// <summary>
-    /// Calls the OnDeath method for all active modifiers.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.Die))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
         var deathEvent = new PlayerDeathEvent(__instance, reason);
@@ -58,13 +52,9 @@ public static class PlayerControlPatches
         }
     }
 
-    /// <summary>
-    /// Used to trigger the <see cref="CompleteTaskEvent"/>.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    /// <param name="idx">The task id.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.CompleteTask))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerCompleteTaskPostfix(PlayerControl __instance, uint idx)
     {
         var playerTask = __instance.myTasks.ToArray().First(playerTask => playerTask.Id == idx);
@@ -75,14 +65,9 @@ public static class PlayerControlPatches
         }
     }
 
-    /// <summary>
-    /// Used to trigger the <see cref="BeforeMurderEvent"/>.
-    /// </summary>
-    /// <param name="__instance">The source player.</param>
-    /// <param name="target">The target.</param>
-    /// <param name="didSucceed">Whether the kill succeeded.</param>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
     {
         var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
@@ -91,12 +76,9 @@ public static class PlayerControlPatches
         didSucceed = beforeMurderEvent.IsCancelled;
     }
 
-    /// <summary>
-    /// FixedUpdate handler for custom roles and custom buttons.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
     [HarmonyPostfix]
     [HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
+    // ReSharper disable once InconsistentNaming
     public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance)
     {
         if (__instance.Data?.Role is ICustomRole customRole)
@@ -124,15 +106,4 @@ public static class PlayerControlPatches
             button.FixedUpdateHandler(__instance);
         }
     }
-
-    /// <summary>
-    /// Clear from modifier component cache.
-    /// </summary>
-    /// <param name="__instance">PlayerControl instance.</param>
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlayerControl.OnDestroy))]
-    public static void PlayerControlOnDestroyPrefix(PlayerControl __instance)
-    {
-        ModifierExtensions.ModifierComponents.Remove(__instance);
-    }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,5 +1,8 @@
-using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
 using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Roles;
 
@@ -9,7 +12,7 @@ namespace MiraAPI.Patches.Roles;
 /// Patches for custom ejection messages.
 /// </summary>
 [HarmonyPatch(typeof(ExileController))]
-public static class EjectionPatches
+internal static class EjectionPatches
 {
     [HarmonyPostfix]
     [HarmonyPatch(nameof(ExileController.Begin))]
@@ -31,4 +34,14 @@ public static class EjectionPatches
 
         __instance.completeString = role.GetCustomEjectionMessage(__instance.initData.networkedPlayer);
     }
+
+    [HarmonyPatch(typeof(ExileController), nameof(ExileController.WrapUp))]
+    public static class WrapUpPatch
+    {
+        public static void Postfix()
+        {
+            var @event = new RoundStartEvent(false);
+            MiraEventManager.InvokeEvent(@event);
+        }
+    }
 }

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -5,18 +5,58 @@ using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
+using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 [HarmonyPatch(typeof(RoleManager))]
 public static class RoleManagerPatches
 {
-    [HarmonyPostfix]
+    [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleManager.SetRole))]
-    public static void SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
+    public static bool SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
     {
+        if (!targetPlayer)
+        {
+            return false;
+        }
+        var data = targetPlayer.Data;
+        if (data == null)
+        {
+            Debug.LogError("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection.");
+            return false;
+        }
+        if (data.Role)
+        {
+            data.Role.Deinitialize(targetPlayer);
+            Object.Destroy(data.Role.gameObject);
+        }
+        var roleBehaviour = Object.Instantiate<RoleBehaviour>(__instance.AllRoles.First(r => r.Role == roleType), data.gameObject.transform);
+        roleBehaviour.Initialize(targetPlayer);
+        targetPlayer.Data.Role = roleBehaviour;
+        targetPlayer.Data.RoleType = roleType;
+
+        // basically everything is the same except this one if statement
+        // innersloth decided to check the roleType manually instead of the role behaviour.
+        if (!roleBehaviour.IsDead)
+        {
+            targetPlayer.Data.RoleWhenAlive = new Il2CppSystem.Nullable<RoleTypes>(roleType);
+        }
+        roleBehaviour.AdjustTasks(targetPlayer);
+        switch (roleBehaviour.IsDead)
+        {
+            case true when !targetPlayer.Data.IsDead:
+                targetPlayer.Die(DeathReason.Kill, false);
+                return false;
+            case false when targetPlayer.Data.IsDead:
+                targetPlayer.Revive();
+                break;
+        }
+
         var @event = new SetRoleEvent(targetPlayer, roleType);
         MiraEventManager.InvokeEvent(@event);
+
+        return false;
     }
 
     [HarmonyPostfix]

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -8,7 +8,7 @@ namespace MiraAPI.Patches.Roles;
 /// <summary>
 /// Patches to return the correct role counts.
 /// </summary>
-[HarmonyPatch(typeof(RoleOptionsCollectionV08))]
+[HarmonyPatch(typeof(RoleOptionsCollectionV09))]
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
@@ -16,7 +16,7 @@ public static class RoleOptionsCollectionPatch
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV08.GetChancePerGame))]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV09.GetChancePerGame))]
     public static bool GetChancePrefix(RoleTypes role, ref int __result)
     {
         if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)
@@ -46,7 +46,7 @@ public static class RoleOptionsCollectionPatch
     /// </summary>
     /// <returns>Return false to skip original method, true to not.</returns>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV08.GetNumPerGame))]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV09.GetNumPerGame))]
     public static bool GetNumPrefix(RoleTypes role, ref int __result)
     {
         if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)

MiraAPI/Patches/Stubs/MinigameStubs.cs

@@ -33,15 +33,4 @@ public static class MinigameStubs
     {
         // nothing needed
     }
-
-    /// <summary>
-    /// Fixes the error when creating custom minigames. Credit to Submerged for discovering this fix.
-    /// </summary>
-    /// <param name="__instance">The Minigame instance.</param>
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))]
-    public static void MinigameErrorFixPatch(Minigame __instance)
-    {
-        __instance.logger ??= new Logger("Minigame", Logger.Level.Info, Logger.Category.Gameplay);
-    }
 }

MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs

@@ -4,6 +4,9 @@ using Il2CppSystem.Text;
 
 namespace MiraAPI.Patches.Stubs;
 
+/// <summary>
+/// Stub methods for the RoleBehaviour class. Needed because of Il2Cpp limitations on injected classes.
+/// </summary>
 [HarmonyPatch]
 public static class RoleBehaviourStubs
 {
@@ -57,7 +60,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool CanUse(RoleBehaviour instance, IUsable console)
     {
-        return default;
+        return false;
     }
 
     /// <summary>
@@ -84,7 +87,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool DidWin(RoleBehaviour instance, GameOverReason gameOverReason)
     {
-        return default;
+        return false;
     }
 
     /// <summary>
@@ -97,7 +100,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static PlayerControl FindClosestTarget(RoleBehaviour instance)
     {
-        return null;
+        return null!;
     }
 
     /// <summary>
@@ -110,7 +113,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static float GetAbilityDistance(RoleBehaviour instance)
     {
-        return default;
+        return 0;
     }
 
     /// <summary>
@@ -124,7 +127,7 @@ public static class RoleBehaviourStubs
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static bool IsValidTarget(RoleBehaviour instance, NetworkedPlayerInfo target)
     {
-        return default;
+        return false;
     }
 
     /// <summary>

MiraAPI/Patches/VentCanUsePatch.cs

@@ -8,17 +8,13 @@ using UnityEngine;
 namespace MiraAPI.Patches;
 
 /// <summary>
-/// Vent patches to make sure the player is able to use the vent.
+/// Used to change vent behaviour for the event system, custom roles, and modifiers.
 /// </summary>
-[HarmonyPatch(typeof(Vent))]
-public static class VentPatches
+[HarmonyPatch(typeof(Vent), nameof(Vent.CanUse))]
+internal static class VentCanUsePatch
 {
-    /// <summary>
-    /// CanUse patch.
-    /// </summary>
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(Vent.CanUse))]
-    public static void VentCanUsePostfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
+    // ReSharper disable InconsistentNaming
+    public static void Postfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
     {
         var @event = new PlayerCanUseEvent(__instance.Cast<IUsable>());
         MiraEventManager.InvokeEvent(@event);

MiraAPI/Patches/Voting/MeetingHudPatches.cs

@@ -1,15 +1,18 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Events.Vanilla.Meeting.Voting;
+using MiraAPI.Modifiers;
 using MiraAPI.Utilities;
 using MiraAPI.Voting;
 
 namespace MiraAPI.Patches.Voting;
 
 [HarmonyPatch(typeof(MeetingHud))]
+[SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Harmony Convention")]
 internal static class MeetingHudPatches
 {
     [HarmonyPostfix]
@@ -26,11 +29,62 @@ internal static class MeetingHudPatches
             {
                 voteData.SetRemainingVotes(0);
             }
+
+            foreach (var modifier in plr.GetModifierComponent().ActiveModifiers)
+            {
+                modifier.OnMeetingStart();
+            }
         }
+
         var @event = new StartMeetingEvent(__instance);
         MiraEventManager.InvokeEvent(@event);
     }
 
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.OnDestroy))]
+    public static void OnDestroyPatch(MeetingHud __instance)
+    {
+        MiraEventManager.InvokeEvent(new EndMeetingEvent(__instance));
+    }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(MeetingHud.VotingComplete))]
+    public static void VotingCompletePatch(MeetingHud __instance)
+    {
+        MiraEventManager.InvokeEvent(new VotingCompleteEvent(__instance));
+    }
+
+    // this is necessary because the actual ForceSkipAll method is inlined.
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MeetingHud.Update))]
+    public static void ForceSkipPatch(MeetingHud __instance)
+    {
+        if (__instance.state is not (MeetingHud.VoteStates.NotVoted or MeetingHud.VoteStates.Voted))
+        {
+            return;
+        }
+
+        var logicOptionsNormal = GameManager.Instance.LogicOptions.Cast<LogicOptionsNormal>();
+        var votingTime = logicOptionsNormal.GetVotingTime();
+        if (votingTime <= 0)
+        {
+            return;
+        }
+
+        var num2 = __instance.discussionTimer - logicOptionsNormal.GetDiscussionTime();
+
+        if (!AmongUsClient.Instance.AmHost || num2 < votingTime)
+        {
+            return;
+        }
+
+        foreach (var plr in PlayerControl.AllPlayerControls)
+        {
+            var voteData = plr.GetVoteData();
+            voteData.SetRemainingVotes(0);
+        }
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(MeetingHud.Select))]
     public static bool SelectPatch(MeetingHud __instance, int suspectStateIdx)

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -43,6 +43,9 @@ public sealed class MiraPluginManager
             var info = new MiraPluginInfo(miraPlugin, pluginInfo);
             var roles = new List<Type>();
 
+            var oldConfigSetting = info.PluginConfig.SaveOnConfigSet;
+            info.PluginConfig.SaveOnConfigSet = false;
+
             foreach (var type in assembly.GetTypes())
             {
                 if (type.GetCustomAttribute<MiraIgnoreAttribute>() != null)
@@ -96,6 +99,9 @@ public sealed class MiraPluginManager
                 RegisterColorClasses(type);
             }
 
+            info.PluginConfig.Save();
+            info.PluginConfig.SaveOnConfigSet = oldConfigSetting;
+
             info.OptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
             QueuedRoleRegistrations.Add(info, roles);
 
@@ -103,7 +109,6 @@ public sealed class MiraPluginManager
             Logger<MiraApiPlugin>.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API.");
         };
         IL2CPPChainloader.Instance.Finished += PaletteManager.RegisterAllColors;
-        IL2CPPChainloader.Instance.Finished += MiraEventManager.SortAllHandlers;
         IL2CPPChainloader.Instance.Finished += () =>
         {
             CustomButtonManager.Buttons = new ReadOnlyCollection<CustomActionButton>(CustomButtonManager.CustomButtons);

MiraAPI/Roles/CustomRoleConfiguration.cs

@@ -1,8 +1,6 @@
 using AmongUs.GameOptions;
-using Il2CppSystem.Web.Util;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
-using Helpers = MiraAPI.Utilities.Helpers;
 
 namespace MiraAPI.Roles;
 

MiraAPI/Roles/CustomRoleManager.cs

@@ -14,7 +14,6 @@ using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;
-using UnityEngine.TextCore;
 using Object = UnityEngine.Object;
 
 namespace MiraAPI.Roles;
@@ -60,6 +59,9 @@ public static class CustomRoleManager
     {
         roles.ForEach(x => RoleIds.Add(x, GetNextRoleId()));
 
+        var oldConfigSetting = pluginInfo.PluginConfig.SaveOnConfigSet;
+        pluginInfo.PluginConfig.SaveOnConfigSet = false;
+
         foreach (var roleType in roles)
         {
             ClassInjector.RegisterTypeInIl2Cpp(roleType);
@@ -72,6 +74,9 @@ public static class CustomRoleManager
 
             pluginInfo.CustomRoles.Add((ushort)role.Role, role);
         }
+
+        pluginInfo.PluginConfig.Save();
+        pluginInfo.PluginConfig.SaveOnConfigSet = oldConfigSetting;
     }
 
     private static RoleBehaviour? RegisterRole(Type roleType, MiraPluginInfo parentMod)

MiraAPI/Roles/ICustomRole.cs

@@ -3,7 +3,6 @@ using BepInEx.Configuration;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
-using MiraAPI.Utilities;
 using Reactor.Utilities;
 using UnityEngine;
 

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Reflection;
 using Reactor.Utilities.Extensions;
 using UnityEngine;

MiraAPI/Utilities/ColorExtensions.cs

@@ -8,10 +8,10 @@ namespace MiraAPI.Utilities;
 public static class ColorExtensions
 {
     /// <summary>
-    /// Gets the relative luminance of a color (WCAG 2.1 specification).
+    /// Gets the relative luminance of a color (WCAG 2.1 specification). 0 is black, 1 is white.
     /// </summary>
     /// <param name="color">Color to calculate luminance for.</param>
-    /// <returns>Relative luminance value.</returns>
+    /// <returns>Luminance value between 0 and 1.</returns>
     public static float GetRelativeLuminance(this Color color)
     {
         var r = color.r <= 0.03928f ? color.r / 12.92f : Mathf.Pow((color.r + 0.055f) / 1.055f, 2.4f);

MiraAPI/Utilities/Helpers.cs

@@ -19,7 +19,7 @@ public static class Helpers
     /// <returns>A list of alive players.</returns>
     public static List<PlayerControl> GetAlivePlayers()
     {
-        return PlayerControl.AllPlayerControls.ToArray().Where(x => !x.Data.IsDead).ToList();
+        return [.. GameData.Instance.AllPlayers.ToArray().Where(x => !x.IsDead && !x.Disconnected && x.Object).Select(x=>x.Object)];
     }
 
     /// <summary>

MiraAPI/Voting/PlayerVoteData.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Il2CppInterop.Runtime.Attributes;
 using Reactor.Utilities.Attributes;
 using UnityEngine;
 
@@ -19,6 +20,7 @@ public class PlayerVoteData(nint cppPtr) : MonoBehaviour(cppPtr)
     /// <summary>
     /// Gets the list of votes the owner has.
     /// </summary>
+    [HideFromIl2Cpp]
     public List<CustomVote> Votes { get; private set; } = [];
 
     /// <summary>