Merge branch 'dev' into rpc-modifier-arguments

# Conflicts:
#	MiraAPI/Patches/PlayerControlPatches.cs
#	MiraAPI/Patches/VentPatches.cs

.github/workflows/main.yaml

@@ -6,11 +6,11 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.nuget/packages
@@ -20,7 +20,7 @@ jobs:
             ${{ runner.os }}-nuget-
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
 
@@ -29,17 +29,17 @@ jobs:
         with:
           verbosity: Diagnostic
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: MiraAPI.dll
           path: MiraAPI/bin/Release/net6.0/MiraAPI.dll
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: AllOfUs.MiraAPI.nupkg
           path: MiraAPI/bin/Release/AllOfUs.MiraAPI.*.nupkg
           
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         if: github.ref_type == 'tag'
         with:
           draft: true

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -10,7 +10,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Freezer;
 
-[RegisterButton]
 public class FreezeButton : CustomActionButton<PlayerControl>
 {
     public override string Name => "Freeze";

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -6,7 +6,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
 
-[RegisterButton]
 public class MeetingButton : CustomActionButton
 {
     public override string Name => "Call Meeting";

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -9,7 +9,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
 
-[RegisterButton]
 public class TeleportButton : CustomActionButton
 {
     public override string Name => "Teleport";
@@ -17,6 +16,7 @@ public class TeleportButton : CustomActionButton
     public override float Cooldown => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportCooldown.Value;
 
     public override float EffectDuration => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportDuration;
+    public override int MaxUses => 2;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
 

MiraAPI.Example/ExampleEventHandlers.cs

@@ -1,6 +1,8 @@
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
-using MiraAPI.Events.Vanilla;
+using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Events.Vanilla.Map;
+using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Example.Buttons.Freezer;
 using Reactor.Utilities;
 
@@ -14,6 +16,21 @@ public static class ExampleEventHandlers
         MiraEventManager.RegisterEventHandler<MiraButtonClickEvent<FreezeButton>>(FreezeButtonClickHandler, 1);
         MiraEventManager.RegisterEventHandler<MiraButtonCancelledEvent<FreezeButton>>(FreezeButtonCancelledHandler);
         MiraEventManager.RegisterEventHandler<UpdateSystemEvent>(UpdateSystemEventHandler);
+
+        MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
+        {
+            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
+        });
+
+        MiraEventManager.RegisterEventHandler<AfterMurderEvent>(@event =>
+        {
+            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} has killed {@event.Target.Data.PlayerName}");
+        });
+
+        MiraEventManager.RegisterEventHandler<CompleteTaskEvent>(@event =>
+        {
+            Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
+        });
     }
 
     public static void UpdateSystemEventHandler(UpdateSystemEvent @event)

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,9 +1,7 @@
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
+using MiraAPI.Modifiers.Types;
 
 namespace MiraAPI.Example.Modifiers;
 
-[RegisterModifier]
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";

MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs

@@ -1,12 +1,10 @@
 using Il2CppSystem;
 using MiraAPI.Example.Roles;
-using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
 using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers.Freezer;
 
-[RegisterModifier]
 public class FreezeModifier : TimedModifier
 {
     public override string ModifierName => "Freezed";

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,9 +1,7 @@
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
+using MiraAPI.Modifiers.Types;
 
 namespace MiraAPI.Example.Modifiers;
 
-[RegisterModifier]
 public class HighPriorityModifier : GameModifier
 {
     public override string ModifierName => "High Priority";

MiraAPI.Example/Options/ExampleOptions.cs

@@ -16,7 +16,7 @@ public class ExampleOptions : AbstractOptionGroup
     [ModdedToggleOption("Toggle Opt 2")]
     public bool ToggleOpt2 { get; set; } = true;
 
-    [ModdedNumberOption("Number Opt", min: 0, max: 10, suffixType: MiraNumberSuffixes.Percent)]
+    [ModdedNumberOption("Number Opt", min: 0, max: 10, increment: .25f, formatString: "0.00", suffixType: MiraNumberSuffixes.Percent)]
     public float NumberOpt { get; set; } = 4f;
 
     [ModdedEnumOption("Best API", typeof(BestApi), ["Mira API", "Mitochondria", "Reactor"])]

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -4,7 +4,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class ChameloenRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Chamelon";

MiraAPI.Example/Roles/FreezerRole.cs

@@ -3,7 +3,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class FreezerRole : ImpostorRole, ICustomRole
 {
     public string RoleName => "Freezer";

MiraAPI.Example/Roles/NeutralKillerRole.cs

@@ -3,22 +3,28 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class NeutralKillerRole : ImpostorRole, ICustomRole
 {
-    public string RoleName => "Neutral Killer";
-    public string RoleDescription => "Neutral who can kill.";
+    public string RoleName => "Outcast Killer";
+    public string RoleDescription => "Outcast who can kill.";
     public string RoleLongDescription => RoleDescription;
     public Color RoleColor => Color.magenta;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Neutral;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Custom;
 
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
+    public CustomRoleConfiguration Configuration => new(this)
     {
         UseVanillaKillButton = true,
         CanGetKilled = true,
         CanUseVent = true,
     };
 
+    public RoleOptionsGroup RoleOptionsGroup { get; } = new("Outcast", Color.gray);
+
+    public TeamIntroConfiguration? IntroConfiguration { get; } = new(
+        Color.gray,
+        "NEUTRAL",
+        "You are an Outcast. You do not have a team.");
+
     public override void SpawnTaskHeader(PlayerControl playerControl)
     {
         // remove existing task header.

MiraAPI.Example/Roles/TeleporterRole.cs

@@ -3,7 +3,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class TeleporterRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Teleporter";
@@ -19,4 +18,9 @@ public class TeleporterRole : CrewmateRole, ICustomRole
         DefaultChance = 73,
         DefaultRoleCount = 4,
     };
+
+    public bool CanLocalPlayerSeeRole(PlayerControl player)
+    {
+        return true;
+    }
 }

MiraAPI/Events/MiraEventManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Reactor.Utilities;
 
 namespace MiraAPI.Events;
 
@@ -22,7 +21,6 @@ public static class MiraEventManager
         EventWrappers.TryGetValue(typeof(T), out var handlers);
         if (handlers == null)
         {
-            Logger<MiraApiPlugin>.Warning("No handlers for event " + typeof(T).Name);
             return false;
         }
 
@@ -45,7 +43,6 @@ public static class MiraEventManager
         EventWrappers.TryGetValue(type, out var handlers);
         if (handlers == null)
         {
-            Logger<MiraApiPlugin>.Warning("No handlers for event " + type.Name);
             return false;
         }
 

MiraAPI/Events/Vanilla/AdminButtonClickEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla;
-
-/// <summary>
-/// Button click event for <see cref="AdminButton"/> from Vanilla Among Us.
-/// </summary>
-public class AdminButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the instance of <see cref="AdminButton"/> that was clicked.
-    /// </summary>
-    public AdminButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AdminButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The AdminButton.</param>
-    public AdminButtonClickEvent(AdminButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -1,4 +1,4 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Gameplay;
 
 /// <summary>
 /// Event that is invoked after a player is murdered. Only called after a successful murder. This event is not cancelable.

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

@@ -1,4 +1,4 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Gameplay;
 
 /// <summary>
 /// Event that is invoked before a player is murdered. This event is cancelable.

MiraAPI/Events/Vanilla/Gameplay/GameEndEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// The event that is invoked when the end game screen is shown. Non cancelable.
+/// </summary>
+public class GameEndEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the EndGameManager.
+    /// </summary>
+    public EndGameManager EndGameManager { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameEndEvent"/> class.
+    /// </summary>
+    /// <param name="manager">The instance of the EndGameManager.</param>
+    public GameEndEvent(EndGameManager manager)
+    {
+        EndGameManager = manager;
+    }
+}

MiraAPI/Events/Vanilla/Gameplay/IntroBeginEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// The event that is invoked when the intro cutscene is shown. Non cancelable.
+/// </summary>
+public class IntroBeginEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the IntroCutscene.
+    /// </summary>
+    public IntroCutscene IntroCutscene { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IntroBeginEvent"/> class.
+    /// </summary>
+    /// <param name="introCutscene">The intro cutscene.</param>
+    public IntroBeginEvent(IntroCutscene introCutscene)
+    {
+        IntroCutscene = introCutscene;
+    }
+}

MiraAPI/Events/Vanilla/Gameplay/SetRoleEvent.cs

@@ -0,0 +1,30 @@
+using AmongUs.GameOptions;
+
+namespace MiraAPI.Events.Vanilla.Gameplay;
+
+/// <summary>
+/// Event that is invoked after a player's role is set. This event is not cancelable.
+/// </summary>
+public class SetRoleEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the player whos role was changed.
+    /// </summary>
+    public PlayerControl Player { get; }
+
+    /// <summary>
+    /// Gets the role that the player was set to.
+    /// </summary>
+    public RoleTypes Role { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SetRoleEvent"/> class.
+    /// </summary>
+    /// <param name="player">The player.</param>
+    /// <param name="role">The new role.</param>
+    public SetRoleEvent(PlayerControl player, RoleTypes role)
+    {
+        Player = player;
+        Role = role;
+    }
+}

MiraAPI/Events/Vanilla/Map/CloseDoorsEvent.cs

@@ -1,4 +1,4 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Map;
 
 /// <summary>
 /// Event fired when a player closes the doors in a room.

MiraAPI/Events/Vanilla/Map/PlayerOpenSabotageEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Map;
+
+/// <summary>
+/// Sabotage from Vanilla Among Us.
+/// </summary>
+public class PlayerOpenSabotageEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets the MapBehaviour.
+    /// </summary>
+    public MapBehaviour MapBehaviour { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlayerOpenSabotageEvent"/> class.
+    /// </summary>
+    /// <param name="mapBehaviour">The MapBehaviour.</param>
+    public PlayerOpenSabotageEvent(MapBehaviour mapBehaviour)
+    {
+        MapBehaviour = mapBehaviour;
+    }
+}

MiraAPI/Events/Vanilla/Map/UpdateSystemEvent.cs

@@ -1,4 +1,4 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Map;
 
 /// <summary>
 /// Cancelable event that is invoked before a system is updated. Usually used for sabotage events.

MiraAPI/Events/Vanilla/Meeting/EjectionEvent.cs

@@ -0,0 +1,21 @@
+namespace MiraAPI.Events.Vanilla.Meeting;
+
+/// <summary>
+/// The event that is invoked when a player is ejected. Non-cancelable.
+/// </summary>
+public class EjectionEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the ExileController.
+    /// </summary>
+    public ExileController ExileController { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EjectionEvent"/> class.
+    /// </summary>
+    /// <param name="controller">The exile controller.</param>
+    public EjectionEvent(ExileController controller)
+    {
+        ExileController = controller;
+    }
+}

MiraAPI/Events/Vanilla/Meeting/StartMeetingEvent.cs

@@ -1,7 +1,7 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Meeting;
 
 /// <summary>
-/// The event that is invoked when a meeting is called
+/// The event that is invoked when a meeting is called.
 /// </summary>
 public class StartMeetingEvent : MiraCancelableEvent
 {

MiraAPI/Events/Vanilla/Player/CompleteTaskEvent.cs

@@ -0,0 +1,28 @@
+namespace MiraAPI.Events.Vanilla.Player;
+
+/// <summary>
+/// The event that is invoked when a player completes a task. Non cancelable.
+/// </summary>
+public class CompleteTaskEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the instance of the <see cref="PlayerControl"/>.
+    /// </summary>
+    public PlayerControl Player { get; }
+
+    /// <summary>
+    /// Gets the instance of the <see cref="PlayerTask"/> that the player completed.
+    /// </summary>
+    public PlayerTask Task { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CompleteTaskEvent"/> class.
+    /// </summary>
+    /// <param name="player">The player who completed the task.</param>
+    /// <param name="task">The task that the player completed.</param>
+    public CompleteTaskEvent(PlayerControl player, PlayerTask task)
+    {
+        Player = player;
+        Task = task;
+    }
+}

MiraAPI/Events/Vanilla/Player/PlayerDeathEvent.cs

@@ -0,0 +1,28 @@
+namespace MiraAPI.Events.Vanilla.Player;
+
+/// <summary>
+/// Event that is invoked when a player dies. Non cancelable.
+/// </summary>
+public class PlayerDeathEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the player who died.
+    /// </summary>
+    public PlayerControl Player { get; }
+
+    /// <summary>
+    /// Gets the reason the player died.
+    /// </summary>
+    public DeathReason DeathReason { 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)
+    {
+        Player = player;
+        DeathReason = reason;
+    }
+}

MiraAPI/Events/Vanilla/Player/PlayerJoinEvent.cs

@@ -0,0 +1,23 @@
+using InnerNet;
+
+namespace MiraAPI.Events.Vanilla.Player;
+
+/// <summary>
+/// Event that is invoked when a player joins the lobby. Non cancelable.
+/// </summary>
+public class PlayerJoinEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the player who joined.
+    /// </summary>
+    public ClientData ClientData { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlayerJoinEvent"/> class.
+    /// </summary>
+    /// <param name="data">The data of the player who joined.</param>
+    public PlayerJoinEvent(ClientData data)
+    {
+        ClientData = data;
+    }
+}

MiraAPI/Events/Vanilla/Player/PlayerLeaveEvent.cs

@@ -0,0 +1,30 @@
+using InnerNet;
+
+namespace MiraAPI.Events.Vanilla.Player;
+
+/// <summary>
+/// Event that is invoked when a player leaves the game. Non cancelable.
+/// </summary>
+public class PlayerLeaveEvent : MiraEvent
+{
+    /// <summary>
+    /// Gets the player who left.
+    /// </summary>
+    public ClientData ClientData { get; }
+
+    /// <summary>
+    /// Gets the reason why the player left.
+    /// </summary>
+    public DisconnectReasons Reason { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlayerLeaveEvent"/> class.
+    /// </summary>
+    /// <param name="data">The data of the player who left.</param>
+    /// <param name="reason">The reason why the player left.</param>
+    public PlayerLeaveEvent(ClientData data, DisconnectReasons reason)
+    {
+        ClientData = data;
+        Reason = reason;
+    }
+}

MiraAPI/Events/Vanilla/SabotageButtonClickEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla;
-
-/// <summary>
-/// Button click event for <see cref="SabotageButton"/> from Vanilla Among Us.
-/// </summary>
-public class SabotageButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the instance of <see cref="SabotageButton"/> that was clicked.
-    /// </summary>
-    public SabotageButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SabotageButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The SabotageButton.</param>
-    public SabotageButtonClickEvent(SabotageButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/Events/Vanilla/Usables/EnterVentEvent.cs

@@ -1,4 +1,4 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Usables;
 
 /// <summary>
 /// Event that is invoked when a player enters a vent. This event is cancelable.

MiraAPI/Events/Vanilla/Usables/ExitVentEvent.cs

@@ -1,4 +1,4 @@
-namespace MiraAPI.Events.Vanilla;
+namespace MiraAPI.Events.Vanilla.Usables;
 
 /// <summary>
 /// Event that is invoked when a player exits a vent. This event is cancelable.

MiraAPI/Events/Vanilla/Usables/PlayerCanUseEvent.cs

@@ -0,0 +1,15 @@
+namespace MiraAPI.Events.Vanilla.Usables;
+
+/// <summary>
+/// Event for if a <see cref="PlayerControl"/> can use an <see cref="IUsable"/> from Vanilla Among Us. Will always be ran locally.
+/// </summary>
+public class PlayerCanUseEvent : PlayerUseEvent
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlayerCanUseEvent"/> class.
+    /// </summary>
+    /// <param name="usable">The IUsable.</param>
+    public PlayerCanUseEvent(IUsable usable) : base(usable)
+    {
+    }
+}

MiraAPI/Events/Vanilla/Usables/PlayerUseEvent.cs

@@ -0,0 +1,34 @@
+namespace MiraAPI.Events.Vanilla;
+
+/// <summary>
+/// Event for <see cref="PlayerControl"/> using a <see cref="IUsable"/> from Vanilla Among Us. Will always be ran locally.
+/// </summary>
+public class PlayerUseEvent : MiraCancelableEvent
+{
+    /// <summary>
+    /// Gets the instance of <see cref="IUsable"/> that was used.
+    /// </summary>
+    public IUsable Usable { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the IUsable is a <see cref="Console"/>, <see cref="MapConsole"/>, or <see cref="SystemConsole"/>.
+    /// </summary>
+    public bool IsPrimaryConsole { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the IUsable is a <see cref="Vent"/>.
+    /// </summary>
+    public bool IsVent { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlayerUseEvent"/> class.
+    /// </summary>
+    /// <param name="usable">The IUsable.</param>
+    public PlayerUseEvent(IUsable usable)
+    {
+        Usable = usable;
+
+        IsPrimaryConsole = usable.TryCast<Console>() || usable.TryCast<SystemConsole>() || usable.TryCast<MapConsole>();
+        IsVent = usable.TryCast<Vent>();
+    }
+}

MiraAPI/Events/Vanilla/UseButtonClickEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla;
-
-/// <summary>
-/// Button click event for <see cref="UseButton"/> from Vanilla Among Us.
-/// </summary>
-public class UseButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the instance of <see cref="UseButton"/> that was clicked.
-    /// </summary>
-    public UseButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UseButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The UseButton.</param>
-    public UseButtonClickEvent(UseButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/Events/Vanilla/VentButtonClickEvent.cs

@@ -1,21 +0,0 @@
-namespace MiraAPI.Events.Vanilla;
-
-/// <summary>
-/// Button click event for <see cref="VentButton"/> from Vanilla Among Us.
-/// </summary>
-public class VentButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets the instance of <see cref="VentButton"/> that was clicked.
-    /// </summary>
-    public VentButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VentButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The VentButton.</param>
-    public VentButtonClickEvent(VentButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/GameModes/DefaultMode.cs

@@ -1,6 +1,5 @@
 namespace MiraAPI.GameModes;
 
-[RegisterGameMode]
 public class DefaultMode : CustomGameMode
 {
     public override string Name => "Default";

MiraAPI/GameModes/RegisterGameModeAttribute.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace MiraAPI.GameModes;
-
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterGameModeAttribute : Attribute
-{
-    private static readonly HashSet<Assembly> RegisteredAssemblies = [];
-
-    internal static void Register(Assembly assembly)
-    {
-        if (!RegisteredAssemblies.Add(assembly))
-        {
-            return;
-        }
-
-        foreach (var type in assembly.GetTypes())
-        {
-            var attribute = type.GetCustomAttribute<RegisterGameModeAttribute>();
-            if (attribute != null)
-            {
-                CustomGameModeManager.RegisterGameMode(type);
-            }
-        }
-    }
-}

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -15,13 +15,14 @@ public class ModdedNumberOptionAttribute(
     float max,
     float increment = 1,
     MiraNumberSuffixes suffixType = MiraNumberSuffixes.None,
+    string? formatString = null,
     bool zeroInfinity = false,
     Type? roleType = null)
     : ModdedOptionAttribute(title, roleType)
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, zeroInfinity, RoleType);
+        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, formatString, zeroInfinity, RoleType);
     }
 
     /// <inheritdoc />

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -31,7 +31,6 @@ public static class ModdedOptionsManager
     {
         if (Activator.CreateInstance(type) is not AbstractOptionGroup group)
         {
-            Logger<MiraApiPlugin>.Error($"Skipping option group {type.Name}. Does not inherit AbstractOptionGroup.");
             return false;
         }
 

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -46,6 +46,7 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="max">The maximum value.</param>
     /// <param name="increment">The increment.</param>
     /// <param name="suffixType">The suffix type.</param>
+    /// <param name="formatString">Optional format string for the option screen.</param>
     /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
     /// <param name="roleType">An optional role type.</param>
     public ModdedNumberOption(
@@ -55,6 +56,7 @@ public class ModdedNumberOption : ModdedOption<float>
         float max,
         float increment,
         MiraNumberSuffixes suffixType,
+        string? formatString = null,
         bool zeroInfinity = false,
         Type? roleType = null) : base(title, defaultValue, roleType)
     {
@@ -74,7 +76,13 @@ public class ModdedNumberOption : ModdedOption<float>
         data.Value = Value;
         data.Increment = Increment;
         data.ValidRange = new FloatRange(Min, Max);
-        data.FormatString = Increment % 1 == 0 && Value % 1 == 0 && Min % 1 == 0 && Max % 1 == 0 ? "0" : "0.0"; // not sure if the == checks will work since this is floats but we'll find out
+        data.FormatString = formatString ??
+                            (!Mathf.Approximately(defaultValue, 0) ||
+                             !Mathf.Approximately(Increment % 1, 0) ||
+                             !Mathf.Approximately(Value % 1, 0) ||
+                             !Mathf.Approximately(Min % 1, 0) ||
+                             !Mathf.Approximately(Max % 1, 0) ? "0.0" : "0");
+
         data.ZeroIsInfinity = ZeroInfinity;
         data.SuffixType = (NumberSuffixes)SuffixType;
         data.OptionName = FloatOptionNames.Invalid;

MiraAPI/Hud/CustomActionButton.cs

@@ -1,7 +1,8 @@
-using System;
-using MiraAPI.Events;
+using MiraAPI.Events;
 using MiraAPI.Events.Mira;
+using MiraAPI.Patches;
 using MiraAPI.Utilities.Assets;
+using System;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -47,7 +48,7 @@ public abstract class CustomActionButton
     /// <summary>
     /// Gets the location of the button on the screen.
     /// </summary>
-    public virtual ButtonLocation Location => ButtonLocation.BottomLeft;
+    public virtual ButtonLocation Location { get; private set; } = ButtonLocation.BottomLeft;
 
     /// <summary>
     /// Gets a value indicating whether the button has an effect ability.
@@ -64,6 +65,11 @@ public abstract class CustomActionButton
     /// </summary>
     public bool EffectActive { get; protected set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether the timer is currently active.
+    /// </summary>
+    public bool TimerPaused { get; protected set; }
+
     /// <summary>
     /// Gets or sets the amount of uses left.
     /// </summary>
@@ -79,7 +85,11 @@ public abstract class CustomActionButton
     /// </summary>
     protected ActionButton? Button { get; private set; }
 
-    internal void CreateButton(Transform parent)
+    /// <summary>
+    /// The method used to create the button.
+    /// </summary>
+    /// <param name="parent">The parent of the button.</param>
+    public virtual void CreateButton(Transform parent)
     {
         if (Button)
         {
@@ -89,6 +99,7 @@ public abstract class CustomActionButton
         UsesLeft = MaxUses;
         Timer = AmongUsClient.Instance?.NetworkMode == NetworkModes.FreePlay ? 0 : InitialCooldown;
         EffectActive = false;
+        TimerPaused = false;
 
         Button = Object.Instantiate(HudManager.Instance.AbilityButton, parent);
         Button.name = Name + "Button";
@@ -142,10 +153,49 @@ public abstract class CustomActionButton
         }));
     }
 
+    /// <summary>
+    /// Allows you to change the button's location.
+    /// </summary>
+    /// <param name="location">The new location.</param>
+    /// <param name="moveButton">Whether the button's position should change ingame.</param>
+    public virtual void SetButtonLocation(ButtonLocation location, bool moveButton = true)
+    {
+        if (!HudManager.InstanceExists || Button == null)
+        {
+            return;
+        }
+
+        this.Location = location;
+
+        if (!moveButton) return;
+
+        if (HudManagerPatches._bottomLeft == null || HudManagerPatches._bottomRight == null)
+        {
+            return;
+        }
+
+        switch (location)
+        {
+            case ButtonLocation.BottomLeft:
+                var gridArrange = HudManagerPatches._bottomLeft.GetComponent<GridArrange>();
+                var aspectPosition = HudManagerPatches._bottomLeft.GetComponent<AspectPosition>();
+
+                Button.transform.SetParent(HudManagerPatches._bottomLeft.transform);
+
+                gridArrange.Start();
+                gridArrange.ArrangeChilds();
+                aspectPosition.AdjustPosition();
+                break;
+            case ButtonLocation.BottomRight:
+                Button.transform.SetParent(HudManagerPatches._bottomRight);
+                break;
+        }
+    }
+
     /// <summary>
     /// A utility function to reset the cooldown and/or effect of the button.
     /// </summary>
-    public void ResetCooldownAndOrEffect()
+    public virtual void ResetCooldownAndOrEffect()
     {
         Timer = Cooldown;
         if (EffectActive)
@@ -160,7 +210,7 @@ public abstract class CustomActionButton
     /// A utility function to override the sprite of the button.
     /// </summary>
     /// <param name="sprite">The new sprite to override with.</param>
-    public void OverrideSprite(Sprite sprite)
+    public virtual void OverrideSprite(Sprite sprite)
     {
         if (Button != null)
         {
@@ -172,7 +222,7 @@ public abstract class CustomActionButton
     /// A utility function to override the name of the button.
     /// </summary>
     /// <param name="name">The new name to override with.</param>
-    public void OverrideName(string name)
+    public virtual void OverrideName(string name)
     {
         Button?.OverrideText(name);
     }
@@ -181,7 +231,7 @@ public abstract class CustomActionButton
     /// Set the button's timer.
     /// </summary>
     /// <param name="time">The time you want to set to.</param>
-    public void SetTimer(float time)
+    public virtual void SetTimer(float time)
     {
         Timer = Mathf.Clamp(time, -1, float.MaxValue);
     }
@@ -190,7 +240,7 @@ public abstract class CustomActionButton
     /// Increase the button's timer.
     /// </summary>
     /// <param name="amount">The amount you want to increase by.</param>
-    public void IncreaseTimer(float amount)
+    public virtual void IncreaseTimer(float amount)
     {
         SetTimer(Timer + amount);
     }
@@ -199,26 +249,40 @@ public abstract class CustomActionButton
     /// Decrease the button's timer.
     /// </summary>
     /// <param name="amount">The amount you want to decrease by.</param>
-    public void DecreaseTimer(float amount)
+    public virtual void DecreaseTimer(float amount)
     {
         SetTimer(Timer - amount);
     }
 
+    /// <summary>
+    /// Sets whether the timer is paused or not.
+    /// </summary>
+    /// <param name="val">Whether you want to pause/resume the timer.</param>
+    public virtual void SetTimerPaused(bool val)
+    {
+        TimerPaused = val;
+    }
+
     /// <summary>
     /// Set the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to set to.</param>
-    public void SetUses(int amount)
+    public virtual void SetUses(int amount)
     {
         UsesLeft = Mathf.Clamp(amount, 0, int.MaxValue);
         Button?.SetUsesRemaining(UsesLeft);
+
+        if (Button != null)
+        {
+            Button.usesRemainingSprite.color = UsesLeft == 0 ? Color.red : Color.white;
+        }
     }
 
     /// <summary>
     /// Increase the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to increase by. Default: 1.</param>
-    public void IncreaseUses(int amount = 1)
+    public virtual void IncreaseUses(int amount = 1)
     {
         SetUses(UsesLeft + amount);
     }
@@ -227,7 +291,7 @@ public abstract class CustomActionButton
     /// Decrease the amount of uses this button has left.
     /// </summary>
     /// <param name="amount">The amount you want to decrease by. Default: 1.</param>
-    public void DecreaseUses(int amount = 1)
+    public virtual void DecreaseUses(int amount = 1)
     {
         SetUses(UsesLeft - amount);
     }
@@ -262,14 +326,24 @@ public abstract class CustomActionButton
     }
 
     /// <summary>
-    /// When the button is enabled, this method is called to determine if the button can be used.
+    /// When the button is usable, this method is called to determine if the button can be clicked.
     /// By default, it takes into account the timer, effect, and uses.
     /// You can override it to change the behavior.
     /// </summary>
-    /// <returns>A value that represents whether the button can be used or not.</returns>
+    /// <returns>A value that represents whether the button can be clicked or not.</returns>
+    public virtual bool CanClick()
+    {
+        return Timer <= 0 && !EffectActive && CanUse();
+    }
+
+    /// <summary>
+    /// Whether the button should light up or not. This is also the base for CanClick.
+    /// You can override it to change the behaviour. Do not include timer in here, that is for CanClick.
+    /// </summary>
+    /// <returns>A value that represents whether the button should light up or not.</returns>
     public virtual bool CanUse()
     {
-        return Timer <= 0 && !EffectActive && (!LimitedUses || UsesLeft > 0);
+        return !LimitedUses || UsesLeft > 0;
     }
 
     /// <summary>
@@ -291,7 +365,7 @@ public abstract class CustomActionButton
     /// </summary>
     public virtual void ClickHandler()
     {
-        if (!CanUse())
+        if (!CanClick())
         {
             return;
         }
@@ -303,7 +377,7 @@ public abstract class CustomActionButton
         }
 
         OnClick();
-        Button?.SetDisabled();
+
         if (HasEffect)
         {
             EffectActive = true;
@@ -323,7 +397,7 @@ public abstract class CustomActionButton
     /// <param name="playerControl">The local PlayerControl.</param>
     public virtual void FixedUpdateHandler(PlayerControl playerControl)
     {
-        if (Timer >= 0)
+        if (Timer >= 0 && !TimerPaused)
         {
             Timer -= Time.deltaTime;
         }
@@ -343,7 +417,17 @@ public abstract class CustomActionButton
             Button?.SetDisabled();
         }
 
-        Button?.SetCoolDown(Timer, EffectActive ? EffectDuration : Cooldown);
+        if (EffectActive)
+        {
+            Button?.SetFillUp(Timer, EffectDuration);
+
+            Button!.cooldownTimerText.text = Mathf.CeilToInt(Timer).ToString();
+            Button!.cooldownTimerText.gameObject.SetActive(true);
+        }
+        else
+        {
+            Button?.SetCoolDown(Timer, Cooldown);
+        }
 
         FixedUpdate(playerControl);
     }
@@ -401,4 +485,19 @@ public abstract class CustomActionButton<T> : CustomActionButton where T : MonoB
 
         return base.CanUse() && Target != null;
     }
+
+    /// <inheritdoc />
+    public override bool CanClick()
+    {
+        return base.CanClick() && Target != null;
+    }
+
+    /// <summary>
+    /// Use this to reset the button's target after used.
+    /// </summary>
+    public virtual void ResetTarget()
+    {
+        Target = null;
+        SetOutline(false);
+    }
 }

MiraAPI/Hud/CustomButtonManager.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using MiraAPI.Events.Mira;
+using MiraAPI.Events.Mira;
 using MiraAPI.PluginLoading;
-using Reactor.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
 
 namespace MiraAPI.Hud;
 
@@ -12,22 +12,20 @@ namespace MiraAPI.Hud;
 /// </summary>
 public static class CustomButtonManager
 {
+    /// <summary>
+    /// Gets a list of all registered custom buttons.
+    /// </summary>
+    public static ReadOnlyCollection<CustomActionButton> Buttons { get; internal set; } = new([]);
+
     internal static readonly List<CustomActionButton> CustomButtons = [];
     internal static readonly Dictionary<Type, Type> ButtonEventTypes = [];
     internal static readonly Dictionary<Type, Type> ButtonCancelledEventTypes = [];
 
-    internal static void RegisterButton(Type buttonType, MiraPluginInfo pluginInfo)
+    internal static bool RegisterButton(Type buttonType, MiraPluginInfo pluginInfo)
     {
-        if (!typeof(CustomActionButton).IsAssignableFrom(buttonType))
+        if (!buttonType.IsAssignableTo(typeof(CustomActionButton)) || Activator.CreateInstance(buttonType) is not CustomActionButton button)
         {
-            Logger<MiraApiPlugin>.Error($"Skipping button {buttonType.Name}. Does not inherit CustomActionButton!");
-            return;
-        }
-
-        if (Activator.CreateInstance(buttonType) is not CustomActionButton button)
-        {
-            Logger<MiraApiPlugin>.Error($"Failed to create button from {buttonType.Name}");
-            return;
+            return false;
         }
 
         CustomButtons.Add(button);
@@ -38,5 +36,7 @@ public static class CustomButtonManager
 
         ButtonEventTypes.Add(buttonType, typeof(MiraButtonClickEvent<>).MakeGenericType(buttonType));
         ButtonCancelledEventTypes.Add(buttonType, typeof(MiraButtonCancelledEvent<>).MakeGenericType(buttonType));
+
+        return true;
     }
 }

MiraAPI/Hud/CustomPlayerMenu.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.GameOptions;
+using AmongUs.GameOptions;
 using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.Patches.Stubs;
 using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Events;
 
@@ -86,10 +86,16 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr)
     /// <param name="playerMatch">Function to determine if player should show in the custom menu.</param>
     /// <param name="onClick">Onclick action for player.</param>
     [HideFromIl2Cpp]
-    public void Begin(Func<PlayerControl, bool> playerMatch, Action<PlayerControl> onClick)
+    public void Begin(Func<PlayerControl, bool> playerMatch, Action<PlayerControl?> onClick)
     {
         MinigameStubs.Begin(this, null);
 
+        var back = BackButton.GetComponent<PassiveButton>();
+        back.OnClick.AddListener((UnityAction)(() =>
+        {
+            onClick(null);
+        }));
+
         DestroyableSingleton<DebugAnalytics>.Instance.Analytics.MinigameOpened(PlayerControl.LocalPlayer.Data, TaskType);
         var list = PlayerControl.AllPlayerControls.ToArray().Where(playerMatch).ToList();
         potentialVictims = [];

MiraAPI/Hud/RegisterButtonAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.Hud;
-
-/// <summary>
-/// Attribute to register a button in the HUD. Necessary for the button to be recognized by Mira.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterButtonAttribute : Attribute;

MiraAPI/Modifiers/BaseModifier.cs

@@ -30,6 +30,16 @@ public abstract class BaseModifier
     /// </summary>
     public virtual bool HideOnUi => false;
 
+    /// <summary>
+    /// Gets a value indicating whether the modifier is shown in the freeplay menu.
+    /// </summary>
+    public virtual bool ShowInFreeplay => false;
+
+    /// <summary>
+    /// Gets a value indicating whether the modifier is unique. If true, the player can only have one instance of this modifier.
+    /// </summary>
+    public virtual bool Unique => true;
+
     /// <summary>
     /// Gets the HUD information for this modifier. Defaults to the modifier name. Does nothing if <see cref="HideOnUi"/> is true.
     /// </summary>

MiraAPI/Modifiers/ModifierComponent.cs

@@ -1,14 +1,14 @@
-using System;
+using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities;
+using Reactor.Utilities;
+using Reactor.Utilities.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.Modifiers.Types;
-using MiraAPI.Utilities;
-using Reactor.Utilities;
-using Reactor.Utilities.Attributes;
 using TMPro;
 using UnityEngine;
 
@@ -107,7 +107,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
         var baseModifiers = filteredModifiers as BaseModifier[] ?? filteredModifiers.ToArray();
 
-        if (baseModifiers.Length != 0)
+        if (baseModifiers.Length != 0 && !MeetingHud.Instance)
         {
             var stringBuild = new StringBuilder();
             foreach (var mod in baseModifiers)
@@ -122,6 +122,38 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         }
     }
 
+    /// <summary>
+    /// Gets a collection of modifiers by their type, or null if the player doesn't have one.
+    /// </summary>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>The Modifier if it is found, null otherwise.</returns>
+    public IEnumerable<T> GetModifiersByType<T>() where T : BaseModifier
+    {
+        return ActiveModifiers.OfType<T>();
+    }
+
+    /// <summary>
+    /// Gets a modifier by its type, or null if the player doesn't have it.
+    /// </summary>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>The Modifier if it is found, null otherwise.</returns>
+    public T? GetModifier<T>() where T : BaseModifier
+    {
+        return GetModifiersByType<T>().FirstOrDefault();
+    }
+
+    /// <summary>
+    /// Tries to get a modifier by its type.
+    /// </summary>
+    /// <param name="modifier">The modifier or null.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>True if the modifier was found, false otherwise.</returns>
+    public bool TryGetModifier<T>(out T? modifier) where T : BaseModifier
+    {
+        modifier = GetModifier<T>();
+        return modifier != null;
+    }
+
     /// <summary>
     /// Removes a modifier from the player.
     /// </summary>
@@ -228,7 +260,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
             return null;
         }
 
-        if (Modifiers.Find(x => x.ModifierId == modifierId) != null)
+        if (Modifiers.Find(x => x.ModifierId == modifierId && x.Unique) != null)
         {
             Logger<MiraApiPlugin>.Error($"Player already has modifier with id {modifierId}!");
             return null;
@@ -260,19 +292,23 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
     /// Checks if a player has an active or queued modifier by its ID.
     /// </summary>
     /// <param name="id">The Modifier ID.</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
     /// <returns>True if the Modifier is present, false otherwise.</returns>
-    public bool HasModifier(uint id)
+    public bool HasModifier(uint id, Func<BaseModifier, bool>? predicate=null)
     {
-        return ActiveModifiers.Exists(x => x.ModifierId == id) || _toAdd.Exists(x => x.ModifierId == id);
+        return ActiveModifiers.Exists(x => x.ModifierId == id && (predicate == null || predicate(x))) ||
+               _toAdd.Exists(x => x.ModifierId == id && (predicate == null || predicate(x)));
     }
 
     /// <summary>
     /// Checks if a player has an active or queued modifier by its type.
     /// </summary>
+    /// <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>
-    public bool HasModifier<T>()
+    public bool HasModifier<T>(Func<T, bool>? predicate=null) where T : BaseModifier
     {
-        return ActiveModifiers.Exists(x => x is T) || _toAdd.Exists(x => x is T);
+        return ModifierManager.GetModifierId(typeof(T)) is { } id &&
+               HasModifier(id, (Func<BaseModifier, bool>?)predicate);
     }
 }

MiraAPI/Modifiers/ModifierManager.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using MiraAPI.Modifiers.Types;
 using MiraAPI.Networking;
+using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Networking.Rpc;
@@ -49,19 +51,22 @@ public static class ModifierManager
         return TypeToIdModifierMap.GetValueOrDefault(type);
     }
 
-    internal static void RegisterModifier(Type modifierType)
+    internal static bool RegisterModifier(Type modifierType, MiraPluginInfo info)
     {
         if (!typeof(BaseModifier).IsAssignableFrom(modifierType))
         {
-            return;
+            return false;
         }
 
         IdToTypeModifierMap.Add(GetNextId(), modifierType);
         TypeToIdModifierMap.Add(modifierType, _nextId);
+        var bm = (BaseModifier)FormatterServices.GetUninitializedObject(modifierType); // this probably isn't a great idea
+        bm.ModifierId = _nextId;
+        info.Modifiers.Add(bm);
 
         if (!typeof(GameModifier).IsAssignableFrom(modifierType))
         {
-            return;
+            return true;
         }
 
         var mod = Activator.CreateInstance(modifierType) as GameModifier;
@@ -73,6 +78,7 @@ public static class ModifierManager
         }
 
         list.Add(_nextId);
+        return true;
     }
 
     internal static void AssignModifiers(List<PlayerControl> plrs)

MiraAPI/Modifiers/RegisterModifierAttribute.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace MiraAPI.Modifiers;
-
-/// <summary>
-/// Marks a class as a modifier that can be registered with the <see cref="ModifierManager"/>.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterModifierAttribute : Attribute;

MiraAPI/Modifiers/Types/GameModifier.cs

@@ -5,6 +5,9 @@
 /// </summary>
 public abstract class GameModifier : BaseModifier
 {
+    /// <inheritdoc />
+    public override bool ShowInFreeplay => true;
+
     /// <summary>
     /// Gets the chance of the modifier being assigned to a player.
     /// </summary>

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,14 +1,13 @@
-using System.Collections;
-using System.Linq;
-using AmongUs.GameOptions;
+using AmongUs.GameOptions;
 using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
 using MiraAPI.Events;
-using MiraAPI.Events.Vanilla;
+using MiraAPI.Events.Vanilla.Gameplay;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
-using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
+using System.Collections;
+using System.Linq;
 using UnityEngine;
 
 namespace MiraAPI.Networking;
@@ -84,7 +83,6 @@ public static class CustomMurderRpc
         bool playKillSound = true)
     {
         source.isKilling = false;
-        Logger<MiraApiPlugin>.Error($"{source.PlayerId} trying to murder {target.PlayerId}");
         var data = target.Data;
         if (resultFlags.HasFlag(MurderResultFlags.FailedError))
         {
@@ -117,7 +115,6 @@ public static class CustomMurderRpc
                 target.RemoveProtection();
             }
 
-            Logger<MiraApiPlugin>.Error($"{source.PlayerId} failed to murder {target.PlayerId} due to guardian angel protection");
             return;
         }
 
@@ -185,7 +182,6 @@ public static class CustomMurderRpc
             source.shapeshiftTargetPlayerId,
             target.PlayerId);
         source.MyPhysics.StartCoroutine(source.KillAnimations.Random()?.CoPerformCustomKill(source, target, createDeadBody, teleportMurderer));
-        Logger<MiraApiPlugin>.Error($"{source.PlayerId} succeeded in murdering {target.PlayerId}");
     }
 
     /// <summary>
@@ -251,11 +247,11 @@ public static class CustomMurderRpc
         }
 
         target.Die(DeathReason.Kill, true);
-        yield return source.MyPhysics.Animations.CoPlayCustomAnimation(anim.BlurAnim);
-        sourcePhys.Animations.PlayIdleAnimation();
 
         if (teleportMurderer)
         {
+            yield return source.MyPhysics.Animations.CoPlayCustomAnimation(anim.BlurAnim);
+            sourcePhys.Animations.PlayIdleAnimation();
             source.NetTransform.SnapTo(target.transform.position);
             KillAnimation.SetMovement(source, true);
         }
@@ -267,6 +263,9 @@ public static class CustomMurderRpc
             deadBody.enabled = true;
         }
 
+        var afterMurderEvent = new AfterMurderEvent(source, target);
+        MiraEventManager.InvokeEvent(afterMurderEvent);
+
         if (!isParticipant)
         {
             yield break;
@@ -279,8 +278,5 @@ public static class CustomMurderRpc
 
         PlayerControl.LocalPlayer.isKilling = false;
         source.isKilling = false;
-
-        var afterMurderEvent = new AfterMurderEvent(source, target);
-        MiraEventManager.InvokeEvent(afterMurderEvent);
     }
 }

MiraAPI/Patches/AmongUsClientSyncPatch.cs

@@ -1,5 +1,7 @@
 using HarmonyLib;
 using InnerNet;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
@@ -9,11 +11,16 @@ namespace MiraAPI.Patches;
 /// <summary>
 /// Sync all options, role settings, and modifiers to the player when they join the game.
 /// </summary>
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CreatePlayer))]
+[HarmonyPatch(typeof(AmongUsClient))]
 public static class AmongUsClientSyncPatch
 {
-    public static void Postfix(ClientData clientData)
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CreatePlayer))]
+    public static void CreatePlayerPatch(ClientData clientData)
     {
+        var joinEvent = new PlayerJoinEvent(clientData);
+        MiraEventManager.InvokeEvent(joinEvent);
+
         if (!AmongUsClient.Instance.AmHost)
         {
             return;
@@ -28,4 +35,12 @@ public static class AmongUsClientSyncPatch
         CustomRoleManager.SyncAllRoleSettings(clientData.Id);
         ModifierManager.SyncAllModifiers(clientData.Id);
     }
+
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnPlayerLeft))]
+    public static void PlayerLeftPatch(ClientData data, DisconnectReasons reason)
+    {
+        var leftEvent = new PlayerLeaveEvent(data, reason);
+        MiraEventManager.InvokeEvent(leftEvent);
+    }
 }

MiraAPI/Patches/Colors/ScrollingColorsPatch.cs

@@ -4,17 +4,19 @@ using UnityEngine;
 
 namespace MiraAPI.Patches.Colors;
 
-[HarmonyPatch(typeof(PlayerTab))]
+/// <summary>
+/// This patch adds scrolling to the colors tab in the player customization menu.
+/// </summary>
+[HarmonyPatch(typeof(PlayerTab), nameof(PlayerTab.OnEnable))]
 public static class ScrollingColorsPatch
 {
     // Collider
     private static BoxCollider2D? _collider;
 
     /// <summary>
-    /// Add scrolling to the colors tab
+    /// Add scrolling to the colors tab.
     /// </summary>
-    [HarmonyPostfix, HarmonyPatch("OnEnable")]
-    public static void AddScrollingToColorsTabPatch(PlayerTab __instance)
+    public static void Postfix(PlayerTab __instance)
     {
         if (!PlayerCustomizationMenu.Instance)
         {

MiraAPI/Patches/Events/CanUsePatches.cs

@@ -0,0 +1,42 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Usables;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch]
+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(DoorConsole), nameof(DoorConsole.CanUse));
+        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.CanUse));
+        yield return AccessTools.Method(typeof(ZiplineConsole), nameof(ZiplineConsole.CanUse));
+    }
+
+    [HarmonyPriority(Priority.Last)]
+    [HarmonyPrefix]
+    public static bool CanUsePatch(Il2CppSystem.Object __instance, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] out bool canUse, [HarmonyArgument(2)] out bool couldUse)
+    {
+        canUse = couldUse = false;
+
+        IUsable usable = __instance.Cast<IUsable>();
+        if (usable != null)
+        {
+            var @event = new PlayerCanUseEvent(__instance.Cast<IUsable>());
+            MiraEventManager.InvokeEvent(@event);
+
+            return !@event.IsCancelled;
+        }
+
+        return true;
+    }
+}

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -0,0 +1,20 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches.Events;
+
+/// <summary>
+/// Patch for trigging the GameEndEvent.
+/// </summary>
+[HarmonyPatch]
+public static class EndGamePatches
+{
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(EndGameManager), nameof(EndGameManager.SetEverythingUp))]
+    public static void SetEverythingUpPatch(EndGameManager __instance)
+    {
+        var @event = new GameEndEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
+    }
+}

MiraAPI/Patches/Events/HudButtonEventPatches.cs

@@ -1,48 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patch for button related MiraEvents.
-/// </summary>
-[HarmonyPatch]
-public static class HudButtonEventPatches
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(AdminButton), nameof(AdminButton.DoClick))]
-    public static bool AdminButtonDoClickPrefix(AdminButton __instance)
-    {
-        var @event = new AdminButtonClickEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(SabotageButton), nameof(SabotageButton.DoClick))]
-    public static bool SabotageButtonDoClickPrefix(SabotageButton __instance)
-    {
-        var @event = new SabotageButtonClickEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(UseButton), nameof(UseButton.DoClick))]
-    public static bool UseButtonDoClickPrefix(UseButton __instance)
-    {
-        var @event = new UseButtonClickEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(VentButton), nameof(VentButton.DoClick))]
-    public static bool VentButtonDoClickPrefix(VentButton __instance)
-    {
-        var @event = new VentButtonClickEvent(__instance);
-        MiraEventManager.InvokeEvent(@event);
-        return !@event.IsCancelled;
-    }
-}

MiraAPI/Patches/Events/KillAnimationPatches.cs

@@ -0,0 +1,25 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+
+namespace MiraAPI.Patches;
+
+/// <summary>
+/// General patches for the KillAnimation class.
+/// </summary>
+[HarmonyPatch]
+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)
+    {
+        var afterMurderEvent = new AfterMurderEvent(source, target);
+        MiraEventManager.InvokeEvent(afterMurderEvent);
+    }
+}

MiraAPI/Patches/Events/MapBehaviourPatches.cs

@@ -0,0 +1,21 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Map;
+
+namespace MiraAPI.Patches.Events;
+
+/// <summary>
+/// Patch for map related MiraEvents.
+/// </summary>
+[HarmonyPatch]
+public static class MapBehaviourPatches
+{
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(MapBehaviour), nameof(MapBehaviour.ShowSabotageMap))]
+    public static bool MapShowSabotagePatch(MapBehaviour __instance)
+    {
+        var @event = new PlayerOpenSabotageEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
+        return !@event.IsCancelled;
+    }
+}

MiraAPI/Patches/Events/SabotageEventPatches.cs

@@ -1,6 +1,6 @@
 using HarmonyLib;
 using MiraAPI.Events;
-using MiraAPI.Events.Vanilla;
+using MiraAPI.Events.Vanilla.Map;
 
 namespace MiraAPI.Patches.Events;
 

MiraAPI/Patches/Events/StartMeetingEventPatch.cs

@@ -1,6 +1,6 @@
 using HarmonyLib;
 using MiraAPI.Events;
-using MiraAPI.Events.Vanilla;
+using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Utilities;
 
 namespace MiraAPI.Patches.Events;

MiraAPI/Patches/Events/UsePatches.cs

@@ -0,0 +1,35 @@
+using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace MiraAPI.Patches.Events;
+
+[HarmonyPatch]
+public static class UsePatches
+{
+    public static IEnumerable<MethodBase> TargetMethods()
+    {
+        yield return AccessTools.Method(typeof(Console), nameof(Console.Use));
+        yield return AccessTools.Method(typeof(MapConsole), nameof(MapConsole.Use));
+        yield return AccessTools.Method(typeof(SystemConsole), nameof(SystemConsole.Use));
+        yield return AccessTools.Method(typeof(Vent), nameof(Vent.Use));
+        yield return AccessTools.Method(typeof(Ladder), nameof(Ladder.Use));
+        yield return AccessTools.Method(typeof(PlatformConsole), nameof(PlatformConsole.Use));
+        yield return AccessTools.Method(typeof(OpenDoorConsole), nameof(OpenDoorConsole.Use));
+        yield return AccessTools.Method(typeof(DoorConsole), nameof(DoorConsole.Use));
+        yield return AccessTools.Method(typeof(OptionsConsole), nameof(OptionsConsole.Use));
+        yield return AccessTools.Method(typeof(ZiplineConsole), nameof(ZiplineConsole.Use));
+    }
+
+    [HarmonyPriority(Priority.Last)]
+    [HarmonyPrefix]
+    public static bool UsePatch(Il2CppSystem.Object __instance)
+    {
+        var @event = new PlayerUseEvent(__instance.Cast<IUsable>());
+        MiraEventManager.InvokeEvent(@event);
+
+        return !@event.IsCancelled;
+    }
+}

MiraAPI/Patches/Events/VentEventPatches.cs

@@ -1,7 +1,7 @@
-using System.Linq;
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Events;
-using MiraAPI.Events.Vanilla;
+using MiraAPI.Events.Vanilla.Usables;
+using System.Linq;
 
 namespace MiraAPI.Patches.Events;
 

MiraAPI/Patches/Freeplay/TaskAddButtonPatches.cs

@@ -0,0 +1,36 @@
+using HarmonyLib;
+using MiraAPI.Roles;
+using MiraAPI.Utilities;
+using UnityEngine;
+
+namespace MiraAPI.Patches.Freeplay;
+
+[HarmonyPatch(typeof(TaskAddButton))]
+internal static class TaskAddButtonPatches
+{
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(TaskAddButton.Start))]
+    public static bool StartPrefix(TaskAddButton __instance)
+    {
+        // if this becomes problematic in the future, find a new method.
+        if (uint.TryParse(__instance.name, out var result))
+        {
+            __instance.Overlay.sprite = __instance.CheckImage;
+            __instance.Overlay.enabled = PlayerControl.LocalPlayer.HasModifier(result);
+            return false;
+        }
+
+        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

@@ -1,28 +1,27 @@
-using AmongUs.GameOptions;
+using System;
+using System.Globalization;
+using System.Linq;
+using AmongUs.GameOptions;
 using HarmonyLib;
-using System;
-using System.Collections.Generic;
+using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
+using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
-using System.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
-namespace MiraAPI.Patches.Roles;
+namespace MiraAPI.Patches.Freeplay;
 
-/// <summary>
-/// Patch TaskAdder for organizing Roles and adding scroller.
-/// </summary>
-[HarmonyPatch]
-public static class TaskAdderPatch
+[HarmonyPatch(typeof(TaskAdderGame))]
+internal static class TaskAdderPatches
 {
-    private static readonly Dictionary<string, string> ModsFolders = [];
     private static Scroller? _scroller;
 
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(TaskAdderGame), nameof(TaskAdderGame.Begin))]
+    [HarmonyPatch(nameof(TaskAdderGame.Begin))]
     public static void AddRolesFolder(TaskAdderGame __instance)
     {
         GameObject inner = new("Inner");
@@ -63,41 +62,38 @@ public static class TaskAdderPatch
         rolesFolder.FolderName = "Roles";
         rolesFolder.name = "RolesFolder";
 
+        var modifiersFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+        modifiersFolder.gameObject.SetActive(false);
+        modifiersFolder.FolderName = "Modifiers";
+        modifiersFolder.name = "ModifiersFolder";
+
         foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins())
         {
-            if (plugin.CustomRoles.Count == 0)
+            if (plugin.CustomRoles.Any(x => x.Value is ICustomRole { Configuration.ShowInFreeplay: true }))
             {
-                continue;
+                var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+                newFolder.name = plugin.PluginId+":Roles";
+                newFolder.FolderName = plugin.PluginInfo.Metadata.Name;
+                newFolder.gameObject.SetActive(false);
+                rolesFolder.SubFolders.Add(newFolder);
             }
 
-            var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
-            newFolder.FolderName = newFolder.name = plugin.PluginInfo.Metadata.Name;
-            newFolder.gameObject.SetActive(false);
-            rolesFolder.SubFolders.Add(newFolder);
-
-            if (!ModsFolders.ContainsKey(plugin.PluginInfo.Metadata.Name))
+            if (plugin.Modifiers.Exists(x => x.ShowInFreeplay))
             {
-                ModsFolders.Add(plugin.PluginInfo.Metadata.Name, plugin.PluginId);
+                var newFolder = Object.Instantiate(__instance.RootFolderPrefab, _scroller.Inner);
+                newFolder.name = plugin.PluginId+":Modifiers";
+                newFolder.FolderName = plugin.PluginInfo.Metadata.Name;
+                newFolder.gameObject.SetActive(false);
+                modifiersFolder.SubFolders.Add(newFolder);
             }
         }
 
         __instance.Root.SubFolders.Add(rolesFolder);
+        __instance.Root.SubFolders.Add(modifiersFolder);
 
         __instance.GoToRoot();
     }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(TaskAddButton), "Role", MethodType.Setter)]
-    public static void RoleGetterPatch(TaskAddButton __instance)
-    {
-        if (__instance.role is ICustomRole { Team: ModdedRoleTeams.Neutral })
-        {
-            __instance.FileImage.color = Color.gray;
-        }
-
-        __instance.RolloverHandler.OutColor = __instance.FileImage.color;
-    }
-
     private static void AddFileAsChildCustom(
         this TaskAdderGame instance,
         TaskAddButton item,
@@ -122,8 +118,8 @@ public static class TaskAdderPatch
 
     // yes it might be crazy patching the entire method, but i tried so many other methods and only this works :cry:
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(TaskAdderGame), nameof(TaskAdderGame.ShowFolder))]
-    public static bool ShowPatch(TaskAdderGame __instance, [HarmonyArgument(0)] TaskFolder taskFolder)
+    [HarmonyPatch(nameof(TaskAdderGame.ShowFolder))]
+    public static bool ShowPatch(TaskAdderGame __instance, TaskFolder taskFolder)
     {
         var stringBuilder = new Il2CppSystem.Text.StringBuilder(64);
         __instance.Hierarchy.Add(taskFolder);
@@ -186,23 +182,23 @@ public static class TaskAdderPatch
             switch (taskAddButton.MyTask.TaskType)
             {
                 case TaskTypes.DivertPower:
-                {
-                    var targetSystem = taskAddButton.MyTask.Cast<DivertPowerTask>().TargetSystem;
-                    taskAddButton.Text.text = TranslationController.Instance.GetString(
-                        StringNames.DivertPowerTo,
-                        TranslationController.Instance.GetString(targetSystem));
-                    break;
-                }
+                    {
+                        var targetSystem = taskAddButton.MyTask.Cast<DivertPowerTask>().TargetSystem;
+                        taskAddButton.Text.text = TranslationController.Instance.GetString(
+                            StringNames.DivertPowerTo,
+                            TranslationController.Instance.GetString(targetSystem));
+                        break;
+                    }
                 case TaskTypes.FixWeatherNode:
-                {
-                    var nodeId = taskAddButton.MyTask.Cast<WeatherNodeTask>().NodeId;
-                    taskAddButton.Text.text =
-                        TranslationController.Instance.GetString(
-                            StringNames.FixWeatherNode) + " " +
-                        TranslationController.Instance.GetString(
-                            WeatherSwitchGame.ControlNames[nodeId]);
-                    break;
-                }
+                    {
+                        var nodeId = taskAddButton.MyTask.Cast<WeatherNodeTask>().NodeId;
+                        taskAddButton.Text.text =
+                            TranslationController.Instance.GetString(
+                                StringNames.FixWeatherNode) + " " +
+                            TranslationController.Instance.GetString(
+                                WeatherSwitchGame.ControlNames[nodeId]);
+                        break;
+                    }
                 default:
                     taskAddButton.Text.text =
                         TranslationController.Instance.GetString(taskAddButton.MyTask.TaskType);
@@ -269,46 +265,31 @@ public static class TaskAdderPatch
             }
         }
 
-        if (ModsFolders.TryGetValue(taskFolder.FolderName, out var guid))
+        if (taskFolder)
         {
-            var plugin = MiraPluginManager.GetPluginByGuid(guid);
-            for (var m = 0; m < plugin.CustomRoles.Count; m++)
+            var split = taskFolder.name.Split(':');
+            if (split.Length == 2)
             {
-                var roleBehaviour = plugin.CustomRoles.ElementAt(m).Value;
-                if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
-                    roleBehaviour.IsDead)
-                {
-                    continue;
-                }
+                var pluginId = split[0];
+                var folderName = split[1];
 
-                var taskAddButton2 = Object.Instantiate(__instance.RoleButton);
-                taskAddButton2.SafePositionWorld = __instance.SafePositionWorld;
-                taskAddButton2.Text.text = "Be_" + roleBehaviour.NiceName + ".exe";
-                __instance.AddFileAsChildCustom(taskAddButton2, ref num, ref num2, ref num3);
-                taskAddButton2.Role = roleBehaviour;
-                if (taskAddButton2.Button == null)
+                if (MiraPluginManager.GetPluginByGuid(pluginId) is { } plugin)
                 {
-                    continue;
-                }
-
-                ControllerManager.Instance.AddSelectableUiElement(taskAddButton2.Button);
-                switch (m)
-                {
-                    case 0 when __instance.restorePreviousSelectionFound != null:
-                        ControllerManager.Instance.SetDefaultSelection(__instance.restorePreviousSelectionFound);
-                        __instance.restorePreviousSelectionByFolderName = string.Empty;
-                        __instance.restorePreviousSelectionFound = null;
-                        break;
-                    case 0:
-                        ControllerManager.Instance.SetDefaultSelection(taskAddButton2.Button);
-                        break;
+                    if (folderName == "Roles(Clone)")
+                    {
+                        PluginRoles(__instance, plugin, ref num, ref num2, ref num3);
+                    }
+                    else if (folderName == "Modifiers(Clone)")
+                    {
+                        PluginModifiers(__instance, plugin, ref num, ref num2, ref num3);
+                    }
                 }
             }
         }
 
         foreach (var chip in __instance.ActiveItems)
         {
-            chip.GetComponentInChildren<TextMeshPro>().EnableMasking();
+            chip.GetComponentInChildren<TextMeshPro>().EnableStencilMasking();
             chip.GetComponent<SpriteRenderer>().maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
         }
 
@@ -328,4 +309,97 @@ public static class TaskAdderPatch
         ControllerManager.Instance.SetBackButton(__instance.FolderBackButton);
         return false;
     }
+
+    private static void PluginModifiers(
+        TaskAdderGame instance,
+        MiraPluginInfo plugin,
+        ref float num,
+        ref float num2,
+        ref float num3)
+    {
+        for (var m = 0; m < plugin.Modifiers.Count; m++)
+        {
+            var modifier = plugin.Modifiers[m];
+            if (!modifier.ShowInFreeplay)
+            {
+                continue;
+            }
+
+            var taskAddButton = Object.Instantiate(instance.RoleButton);
+            taskAddButton.name = modifier.ModifierId.ToString(CultureInfo.InvariantCulture);
+            taskAddButton.role = null;
+            taskAddButton.MyTask = null;
+            taskAddButton.SafePositionWorld = instance.SafePositionWorld;
+            taskAddButton.Text.text = modifier.ModifierName;
+            taskAddButton.Text.EnableMasking();
+
+            taskAddButton.Button.OnClick = new Button.ButtonClickedEvent();
+            taskAddButton.Button.OnClick.AddListener((UnityEngine.Events.UnityAction)(() =>
+            {
+                if (PlayerControl.LocalPlayer.HasModifier(modifier.ModifierId))
+                {
+                    PlayerControl.LocalPlayer.RemoveModifier(modifier.ModifierId);
+                    taskAddButton.Overlay.enabled = false;
+                }
+                else
+                {
+                    PlayerControl.LocalPlayer.AddModifier(ModifierManager.GetModifierType(modifier.ModifierId)!);
+                    taskAddButton.Overlay.enabled = true;
+                }
+            }));
+
+            instance.AddFileAsChildCustom(taskAddButton, ref num, ref num2, ref num3);
+
+            ControllerManager.Instance.AddSelectableUiElement(taskAddButton.Button);
+            switch (m)
+            {
+                case 0 when instance.restorePreviousSelectionFound != null:
+                    ControllerManager.Instance.SetDefaultSelection(instance.restorePreviousSelectionFound);
+                    instance.restorePreviousSelectionByFolderName = string.Empty;
+                    instance.restorePreviousSelectionFound = null;
+                    break;
+                case 0:
+                    ControllerManager.Instance.SetDefaultSelection(taskAddButton.Button);
+                    break;
+            }
+        }
+    }
+
+    private static void PluginRoles(TaskAdderGame instance, MiraPluginInfo plugin, ref float num, ref float num2, ref float num3)
+    {
+        for (var m = 0; m < plugin.CustomRoles.Count; m++)
+        {
+            var roleBehaviour = plugin.CustomRoles.ElementAt(m).Value;
+            if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
+                roleBehaviour is ICustomRole { Configuration.ShowInFreeplay: false })
+            {
+                continue;
+            }
+
+            var taskAddButton2 = Object.Instantiate(instance.RoleButton);
+            taskAddButton2.SafePositionWorld = instance.SafePositionWorld;
+            taskAddButton2.Text.text = "Be_" + roleBehaviour.NiceName + ".exe";
+            taskAddButton2.Text.EnableMasking();
+
+            instance.AddFileAsChildCustom(taskAddButton2, ref num, ref num2, ref num3);
+            taskAddButton2.Role = roleBehaviour;
+            if (taskAddButton2.Button == null)
+            {
+                continue;
+            }
+
+            ControllerManager.Instance.AddSelectableUiElement(taskAddButton2.Button);
+            switch (m)
+            {
+                case 0 when instance.restorePreviousSelectionFound != null:
+                    ControllerManager.Instance.SetDefaultSelection(instance.restorePreviousSelectionFound);
+                    instance.restorePreviousSelectionByFolderName = string.Empty;
+                    instance.restorePreviousSelectionFound = null;
+                    break;
+                case 0:
+                    ControllerManager.Instance.SetDefaultSelection(taskAddButton2.Button);
+                    break;
+            }
+        }
+    }
 }

MiraAPI/Patches/HudManagerPatches.cs

@@ -13,7 +13,9 @@ namespace MiraAPI.Patches;
 public static class HudManagerPatches
 {
     // Custom buttons parent.
-    private static GameObject? _bottomLeft;
+    internal static GameObject? _bottomLeft;
+    internal static Transform? _bottomRight;
+    internal static Transform? _buttons;
 
     /*
     /// <summary>
@@ -34,12 +36,19 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        var buttons = __instance.transform.Find("Buttons");
-        var bottomRight = buttons.Find("BottomRight");
+        if (_buttons == null)
+        {
+            _buttons = __instance.transform.Find("Buttons");
+        }
+
+        if (_bottomRight == null)
+        {
+            _bottomRight = _buttons.Find("BottomRight");
+        }
 
         if (_bottomLeft == null)
         {
-            _bottomLeft = Object.Instantiate(bottomRight.gameObject, buttons);
+            _bottomLeft = Object.Instantiate(_bottomRight.gameObject, _buttons);
         }
 
         foreach (var t in _bottomLeft.GetComponentsInChildren<ActionButton>(true))
@@ -59,7 +68,7 @@ public static class HudManagerPatches
             var location = button.Location switch
             {
                 ButtonLocation.BottomLeft => _bottomLeft.transform,
-                ButtonLocation.BottomRight => bottomRight,
+                ButtonLocation.BottomRight => _bottomRight,
                 _ => null,
             };
 

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -1,4 +1,6 @@
 using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using UnityEngine;
@@ -20,6 +22,32 @@ public static class IntroCutscenePatches
         }
     }*/
 
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(IntroCutscene.CoBegin))]
+    public static void IntroBeginPatch(IntroCutscene __instance)
+    {
+        var @event = new IntroBeginEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(IntroCutscene.BeginImpostor))]
+    public static void BeginImpostorPatch(IntroCutscene __instance)
+    {
+        if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole customRole)
+        {
+            return;
+        }
+
+        if (customRole.IntroConfiguration is { } introConfig)
+        {
+            __instance.BackgroundBar.material.SetColor(ShaderID.Color, introConfig.IntroTeamColor);
+            __instance.TeamTitle.color = introConfig.IntroTeamColor;
+            __instance.TeamTitle.text = introConfig.IntroTeamTitle;
+            __instance.ImpostorText.text = introConfig.IntroTeamDescription;
+        }
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(IntroCutscene.BeginCrewmate))]
     public static bool BeginCrewmatePatch(IntroCutscene __instance)
@@ -29,7 +57,15 @@ public static class IntroCutscenePatches
             return true;
         }
 
-        if (customRole.Team is not ModdedRoleTeams.Neutral)
+        if (customRole.IntroConfiguration is { } introConfig)
+        {
+            __instance.BackgroundBar.material.SetColor(ShaderID.Color, introConfig.IntroTeamColor);
+            __instance.TeamTitle.color = introConfig.IntroTeamColor;
+            __instance.TeamTitle.text = introConfig.IntroTeamTitle;
+            __instance.ImpostorText.text = introConfig.IntroTeamDescription;
+        }
+
+        if (customRole.Team is not ModdedRoleTeams.Custom)
         {
             return true;
         }
@@ -39,11 +75,7 @@ public static class IntroCutscenePatches
         position.y -= 0.25f;
         barTransform.position = position;
 
-        __instance.BackgroundBar.material.SetColor(ShaderID.Color, Color.gray);
-        __instance.TeamTitle.text = "NEUTRAL";
         __instance.impostorScale = 1f;
-        __instance.ImpostorText.text = "You are Neutral. You do not have a team.";
-        __instance.TeamTitle.color = Color.gray;
 
         __instance.ourCrewmate = __instance.CreatePlayer(
             0,

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -157,8 +157,6 @@ public static class GameSettingMenuPatches
             roles.AdvancedRolesSettings.gameObject.SetActive(false);
             roles.RoleChancesSettings.gameObject.SetActive(true);
             roles.SetQuotaTab();
-
-            roles.scrollBar.CalculateAndSetYBounds(roles.roleChances.Count + 5, 1f, 6f, 0.43f);
             roles.scrollBar.ScrollToTop();
         }
 

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -6,6 +6,7 @@ using MiraAPI.Utilities.Assets;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Reactor.Localization.Utilities;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -211,34 +212,43 @@ public static class LobbyViewPanePatches
 
         var list = new List<Type>();
 
-        foreach (var team in Enum.GetValues<ModdedRoleTeams>())
-        {
-            var filteredRoles = SelectedMod.CustomRoles.Values
-                .OfType<ICustomRole>()
-                .Where(x => !x.Configuration.HideSettings && x.Team == team).ToList();
+        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
+            .ToLookup(x => x.RoleOptionsGroup);
 
-            if (filteredRoles.Count == 0)
+        if (roleGroups is null)
+        {
+            return;
+        }
+
+        // sort the groups by priority
+        var sortedRoleGroups = roleGroups
+            .OrderBy(x => x.Key.Priority)
+            .ThenBy(x => x.Key.Name);
+
+        foreach (var grouping in sortedRoleGroups)
+        {
+            if (!grouping.Any())
             {
                 continue;
             }
 
-            var categoryHeaderRoleVariant =
-                Object.Instantiate(instance.categoryHeaderRoleOrigin, instance.settingsContainer, true);
+            var group = grouping.Key;
 
-            switch (team)
+            var name = group.Name switch
             {
-                case ModdedRoleTeams.Crewmate:
-                    categoryHeaderRoleVariant.SetHeader(StringNames.CrewmateRolesHeader, 61);
-                    break;
-                case ModdedRoleTeams.Impostor:
-                    categoryHeaderRoleVariant.SetHeader(StringNames.ImpostorRolesHeader, 61);
-                    break;
-                default:
-                    categoryHeaderRoleVariant.SetHeader(StringNames.CrewmateRolesHeader, 61);
-                    categoryHeaderRoleVariant.Title.text = team + " Roles";
-                    categoryHeaderRoleVariant.Background.color = Color.gray;
-                    categoryHeaderRoleVariant.Title.color = Color.white;
-                    break;
+                "Crewmate" => StringNames.CrewmateRolesHeader,
+                "Impostor" => StringNames.ImpostorRolesHeader,
+                _ => CustomStringName.CreateAndRegister(group.Name),
+            };
+
+            var categoryHeaderRoleVariant = Object.Instantiate(instance.categoryHeaderRoleOrigin, instance.settingsContainer, true);
+            categoryHeaderRoleVariant.SetHeader(name, 61);
+
+            if (name is not (StringNames.CrewmateRolesHeader or StringNames.ImpostorRolesHeader))
+            {
+                var veryDarkColor = group.Color.DarkenColor(.35f);
+                categoryHeaderRoleVariant.Title.color = veryDarkColor;
+                categoryHeaderRoleVariant.Background.color = group.Color;
             }
 
             categoryHeaderRoleVariant.transform.localScale = Vector3.one;
@@ -246,7 +256,7 @@ public static class LobbyViewPanePatches
             instance.settingsInfo.Add(categoryHeaderRoleVariant.gameObject);
             num -= 0.696f;
 
-            foreach (var customRole in filteredRoles)
+            foreach (var customRole in grouping)
             {
                 var roleBehaviour = customRole as RoleBehaviour;
                 if (roleBehaviour == null)
@@ -259,8 +269,6 @@ public static class LobbyViewPanePatches
                 var numPerGame =
                     GameOptionsManager.Instance.CurrentGameOptions.RoleOptions.GetNumPerGame(roleBehaviour.Role);
 
-                var flag = numPerGame == 0;
-
                 var viewSettingsInfoPanelRoleVariant =
                     Object.Instantiate(
                         instance.infoPanelRoleOrigin,
@@ -273,7 +281,7 @@ public static class LobbyViewPanePatches
                     .Where(x => x.AdvancedRole == customRole.GetType())
                     .ToList();
 
-                if (!flag && advancedRoleOptions.Count > 0)
+                if (numPerGame > 0 && advancedRoleOptions.Count > 0)
                 {
                     list.Add(customRole.GetType());
                 }
@@ -286,6 +294,8 @@ public static class LobbyViewPanePatches
                     customRole.RoleColor,
                     customRole.Configuration.Icon.LoadAsset(),
                     true);
+                viewSettingsInfoPanelRoleVariant.iconSprite.transform.localScale = new Vector3(0.365f, 0.365f, 1f);
+                viewSettingsInfoPanelRoleVariant.iconSprite.transform.localPosition = new Vector3(0.7144f, -0.028f, -2);
 
                 viewSettingsInfoPanelRoleVariant.titleText.color =
                     viewSettingsInfoPanelRoleVariant.chanceTitle.color =
@@ -370,6 +380,7 @@ public static class LobbyViewPanePatches
             maskLayer,
             role.TeamType == RoleTeamTypes.Crewmate,
             customRole.Configuration.Icon.LoadAsset());
+        viewPanel.header.icon.transform.localScale = new Vector3(0.465f, 0.465f, 1f);
         viewPanel.divider.material.SetInt(PlayerMaterial.MaskLayer, maskLayer);
 
         var num = viewPanel.yPosStart;

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -4,10 +4,12 @@ using MiraAPI.Networking;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
+using Reactor.Localization.Utilities;
 using Reactor.Networking.Rpc;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using TMPro;
 using UnityEngine;
@@ -20,10 +22,21 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(RolesSettingsMenu))]
 public static class RoleSettingMenuPatches
 {
+    private static Dictionary<RoleOptionsGroup, bool> RoleGroupHidden { get; set; } = new();
+    private static List<GameObject> Headers { get; set; } = new();
+    private static List<RoleOptionSetting> RoleOptionSettings { get; set; } = new();
+
+    private static float ScrollerNum { get; set; } = 0.522f;
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
     public static bool PatchStart(RolesSettingsMenu __instance)
     {
+        Headers.ForEach(Object.Destroy);
+        RoleOptionSettings.ForEach(Object.Destroy);
+        Headers.Clear();
+        RoleOptionSettings.Clear();
+
         __instance.roleChances = new Il2CppSystem.Collections.Generic.List<RoleOptionSetting>();
         __instance.advancedSettingChildren = new Il2CppSystem.Collections.Generic.List<OptionBehaviour>();
 
@@ -42,7 +55,7 @@ public static class RoleSettingMenuPatches
             return true;
         }
 
-        var num = 0.522f;
+        ScrollerNum = 0.522f;
 
         __instance.AllButton.transform.parent.gameObject.SetActive(false);
         __instance.AllButton.gameObject.SetActive(false);
@@ -54,92 +67,169 @@ public static class RoleSettingMenuPatches
 
         var num3 = 0;
 
-        var crewRoles = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values
-            .OfType<ICustomRole>()
-            .Where(role => role is { Team: ModdedRoleTeams.Crewmate, Configuration.HideSettings: false })
-            .ToList() ?? [];
+        var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType<ICustomRole>()
+            .ToLookup(x => x.RoleOptionsGroup);
 
-        if (crewRoles is { Count: > 0 })
+        if (roleGroups is null)
         {
-            var categoryHeaderEditRole = Object.Instantiate(
-                __instance.categoryHeaderEditRoleOrigin,
+            return true;
+        }
+
+        // sort the groups by priority
+        var sortedRoleGroups = roleGroups
+            .OrderBy(x => x.Key.Priority)
+            .ThenBy(x => x.Key.Name);
+
+        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())
+            {
+                continue;
+            }
+
+            var group = grouping.Key;
+
+            RoleGroupHidden.TryAdd(group, false);
+
+            var name = group.Name switch
+            {
+                "Crewmate" => StringNames.CrewmateRolesHeader,
+                "Impostor" => StringNames.ImpostorRolesHeader,
+                _ => CustomStringName.CreateAndRegister(group.Name),
+            };
+
+            var categoryHeaderMasked = Object.Instantiate(
+                template,
                 Vector3.zero,
                 Quaternion.identity,
                 __instance.RoleChancesSettings.transform);
-            categoryHeaderEditRole.SetHeader(StringNames.CrewmateRolesHeader, 20);
-            categoryHeaderEditRole.transform.localPosition = new Vector3(4.986f, num, -2f);
-            num -= 0.522f;
 
-            foreach (var role in crewRoles)
+            categoryHeaderMasked.SetHeader(name, 20);
+
+            var quotaInst = Object.Instantiate(quotaThing, categoryHeaderMasked.transform);
+            quotaInst.transform.localScale = new Vector3(1.3f, 1.3f, 1.3f);
+            quotaInst.transform.localPosition = new Vector3(0.7f, -0.82f, 0);
+
+            var chanceText = quotaInst.transform.FindChild("Chance Text");
+            chanceText.transform.localPosition = new Vector3(4.3f, 0.0993f, 0);
+
+            var countText = quotaInst.transform.FindChild("# Text");
+            countText.transform.localPosition = new Vector3(1.9f, 0.0993f, 0f);
+
+            var blankLabel = quotaInst.transform.FindChild("BlankLabel").gameObject;
+            var chanceLabel = quotaInst.transform.FindChild("Chance Label").gameObject;
+            var countLabel = quotaInst.transform.FindChild("# Label").gameObject;
+            blankLabel.Destroy();
+            chanceLabel.Destroy();
+            countLabel.Destroy();
+
+            if (name is StringNames.CrewmateRolesHeader)
             {
-                if (role is RoleBehaviour roleBehaviour)
+                categoryHeaderMasked.Title.color = Palette.CrewmateRoleHeaderTextBlue;
+                categoryHeaderMasked.Background.color = Palette.CrewmateRoleHeaderBlue;
+            }
+            else if (name is StringNames.ImpostorRolesHeader)
+            {
+                categoryHeaderMasked.Title.color = Palette.ImpostorRoleHeaderTextRed;
+                categoryHeaderMasked.Background.color = Palette.ImpostorRoleHeaderRed;
+            }
+            else
+            {
+                categoryHeaderMasked.Title.color = group.Color;
+                categoryHeaderMasked.Divider.color = group.Color;
+                categoryHeaderMasked.Background.color = group.Color;
+            }
+
+            categoryHeaderMasked.Title.color = categoryHeaderMasked.Title.color.IsColorDark() ?
+                categoryHeaderMasked.Title.color.LightenColor(0.3f) : categoryHeaderMasked.Title.color.LightenColor(0.1f);
+
+            categoryHeaderMasked.Title.fontStyle = __instance.categoryHeaderEditRoleOrigin.Title.fontStyle;
+            categoryHeaderMasked.Title.font = __instance.categoryHeaderEditRoleOrigin.Title.font;
+            categoryHeaderMasked.Title.fontMaterial = __instance.categoryHeaderEditRoleOrigin.Title.fontMaterial;
+
+            categoryHeaderMasked.Divider.color = categoryHeaderMasked.Background.color;
+            categoryHeaderMasked.Background.size = new Vector2(categoryHeaderMasked.Background.size.x + 1.5f, categoryHeaderMasked.Background.size.y);
+            categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f;
+            categoryHeaderMasked.transform.localPosition = new Vector3(-0.44f, ScrollerNum, -2f);
+            categoryHeaderMasked.gameObject.SetActive(true);
+            quotaInst.gameObject.SetActive(!RoleGroupHidden[group]);
+
+            var label = RoleGroupHidden[group]
+                ? "(Click to open)"
+                : "(Click to close)";
+            var newText = Object.Instantiate(categoryHeaderMasked.Title, categoryHeaderMasked.transform);
+            newText.text = $"<size=70%>{label}</size>";
+            newText.transform.localPosition = new Vector3(2.6249f, -0.165f, 0f);
+            newText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
+
+            Headers.Add(categoryHeaderMasked.gameObject);
+            ScrollerNum -= 0.422f;
+
+            if (!RoleGroupHidden[group])
+            {
+                foreach (var role in grouping)
                 {
-                    CreateQuotaOption(__instance, roleBehaviour, ref num, num3);
+                    if (role is not RoleBehaviour roleBehaviour)
+                    {
+                        continue;
+                    }
+
+                    var option = CreateQuotaOption(__instance, roleBehaviour, num3);
+                    if (option is not null)
+                    {
+                        RoleOptionSettings.Add(option);
+                        num3++;
+                    }
                 }
-                num3++;
+            }
+
+            var boxCol = categoryHeaderMasked.gameObject.AddComponent<BoxCollider2D>();
+            boxCol.size = new Vector2(7, 0.7f);
+            boxCol.offset = new Vector2(1.5f, -0.3f);
+
+            var headerBtn = categoryHeaderMasked.gameObject.AddComponent<PassiveButton>();
+            headerBtn.ClickSound = __instance.BackButton.GetComponent<PassiveButton>().ClickSound;
+            headerBtn.OnMouseOver = new UnityEvent();
+            headerBtn.OnMouseOut = new UnityEvent();
+            headerBtn.OnClick.AddListener(
+                (UnityAction)(() =>
+                {
+                    if (RoleGroupHidden.TryGetValue(group, out var value))
+                    {
+                        RoleGroupHidden[group] = !value;
+                    }
+                    foreach (var header in Headers)
+                    {
+                        header.Destroy();
+                    }
+                    Headers.Clear();
+                    foreach (var option in RoleOptionSettings)
+                    {
+                        option.gameObject.Destroy();
+                    }
+                    RoleOptionSettings.Clear();
+                    __instance.SetQuotaTab();
+                }));
+            headerBtn.SetButtonEnableState(true);
+
+            if (RoleGroupHidden.TryGetValue(group, out var value) && !value)
+            {
+                ScrollerNum -= 0.4f;
             }
         }
-
-        var impRoles = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values
-            .OfType<ICustomRole>()
-            .Where(role => role is { Team: ModdedRoleTeams.Impostor, Configuration.HideSettings: false })
-            .ToList() ?? [];
-
-        if (impRoles is { Count: > 0 })
-        {
-            num -= 0.4f;
-            var categoryHeaderEditRole2 = Object.Instantiate(
-                __instance.categoryHeaderEditRoleOrigin,
-                Vector3.zero,
-                Quaternion.identity,
-                __instance.RoleChancesSettings.transform);
-            categoryHeaderEditRole2.SetHeader(StringNames.ImpostorRolesHeader, 20);
-            categoryHeaderEditRole2.transform.localPosition = new Vector3(4.986f, num, -2f);
-            num -= 0.522f;
-
-            foreach (var role in impRoles)
-            {
-                if (role is RoleBehaviour roleBehaviour)
-                {
-                    CreateQuotaOption(__instance, roleBehaviour, ref num, num3);
-                }
-                num3++;
-            }
-        }
-
-        var neutRoles = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values
-            .OfType<ICustomRole>()
-            .Where(role => role is { Team: ModdedRoleTeams.Neutral, Configuration.HideSettings: false })
-            .ToList() ?? [];
-
-        if (neutRoles is { Count: > 0 })
-        {
-            num -= 0.4f;
-            var categoryHeaderEditRole3 = Object.Instantiate(
-                __instance.categoryHeaderEditRoleOrigin,
-                Vector3.zero,
-                Quaternion.identity,
-                __instance.RoleChancesSettings.transform);
-            categoryHeaderEditRole3.SetHeader(StringNames.None, 20);
-            categoryHeaderEditRole3.Title.text = "Neutral Roles";
-            categoryHeaderEditRole3.Background.color = Color.gray;
-            categoryHeaderEditRole3.Title.color = Color.white;
-            categoryHeaderEditRole3.transform.localPosition = new Vector3(4.986f, num, -2f);
-            num -= 0.522f;
-
-            foreach (var role in neutRoles)
-            {
-                if (role is RoleBehaviour roleBehaviour)
-                {
-                    CreateQuotaOption(__instance, roleBehaviour, ref num, num3);
-                }
-                num3++;
-            }
-        }
-
+        __instance.scrollBar.SetScrollBounds();
         return false;
     }
 
+    private static void SetScrollBounds(this Scroller scroller)
+    {
+        scroller.CalculateAndSetYBounds(1 + 1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
+    }
+
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RolesSettingsMenu.Update))]
     public static bool UpdatePatch()
@@ -151,7 +241,12 @@ public static class RoleSettingMenuPatches
     [HarmonyPatch(nameof(RolesSettingsMenu.OpenChancesTab))]
     public static void OpenChancesTabPostfix(RolesSettingsMenu __instance)
     {
-        __instance.scrollBar.CalculateAndSetYBounds(__instance.roleChances.Count + 5, 1f, 6f, 0.43f);
+        if (GameSettingMenuPatches.SelectedModIdx == 0)
+        {
+            return;
+        }
+
+        __instance.scrollBar.SetScrollBounds();
         __instance.scrollBar.ScrollToTop();
     }
 
@@ -199,14 +294,15 @@ public static class RoleSettingMenuPatches
 
     private static void CreateAdvancedSettings(RolesSettingsMenu __instance, RoleBehaviour role)
     {
-        foreach (var option in __instance.advancedSettingChildren)
+        foreach (var optBehaviour in __instance.AdvancedRolesSettings.GetComponentsInChildren<OptionBehaviour>())
         {
-            Object.Destroy(option.gameObject);
+            optBehaviour.gameObject.DestroyImmediate();
         }
 
         __instance.advancedSettingChildren.Clear();
 
-        var num = -0.872f;
+        var hasImage = role.RoleScreenshot != null;
+        var num = hasImage ? -0.872f : -1;
 
         var filteredOptions = GameSettingMenuPatches.SelectedMod?.Options.Where(x => x.AdvancedRole == role.GetType()) ?? [];
 
@@ -223,7 +319,7 @@ public static class RoleSettingMenuPatches
                 __instance.stringOptionOrigin,
                 __instance.AdvancedRolesSettings.transform);
 
-            newOpt.transform.localPosition = new Vector3(2.17f, num, -2f);
+            newOpt.transform.localPosition = new Vector3(hasImage ? 2.17f : 1.1f, num, -2f);
             newOpt.SetClickMask(__instance.ButtonClickMask);
 
             SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
@@ -261,15 +357,63 @@ public static class RoleSettingMenuPatches
         __instance.roleTitleText.text = TranslationController.Instance.GetString(
             role.StringName,
             new Il2CppReferenceArray<Il2CppSystem.Object>(0));
-        __instance.roleScreenshot.sprite = Sprite.Create(
-            customRole.Configuration.OptionsScreenshot.LoadAsset().texture,
-            new Rect(0, 0, 370, 230),
-            Vector2.one / 2,
-            100);
-        __instance.roleScreenshot.drawMode = SpriteDrawMode.Sliced;
+
+        var imgBg = __instance.AdvancedRolesSettings.transform.FindChild("Imagebackground");
+        var labelBg = __instance.AdvancedRolesSettings.transform.FindChild("InfoLabelBackground");
+        if (role.RoleScreenshot == null)
+        {
+            imgBg.gameObject.SetActive(false);
+            __instance.roleScreenshot.gameObject.SetActive(false);
+            __instance.roleDescriptionText.transform.parent.localPosition = new Vector3(1.5f, -0.2731f, -1);
+            __instance.roleDescriptionText.transform.parent.localScale = new Vector3(0.09f, 0.2f, 0.5687f);
+            labelBg.localPosition = new Vector3(-0.7f, 0.1054f, -2.5f);
+        }
+        else
+        {
+            imgBg.gameObject.SetActive(true);
+            __instance.roleScreenshot.gameObject.SetActive(true);
+            __instance.roleDescriptionText.transform.parent.localPosition = new Vector3(2.5176f, -0.2731f, -1f);
+            __instance.roleDescriptionText.transform.parent.localScale = new Vector3(0.0675f, 0.1494f, 0.5687f);
+            labelBg.transform.localPosition = new Vector3(1.082f, 0.1054f, -2.5f);
+
+            __instance.roleScreenshot.sprite = Sprite.Create(
+                role.RoleScreenshot.texture,
+                new Rect(0, 0, 370, 230),
+                Vector2.one / 2,
+                100);
+            __instance.roleScreenshot.drawMode = SpriteDrawMode.Sliced;
+        }
+
         __instance.roleHeaderSprite.color = customRole.RoleColor;
         __instance.roleHeaderText.color = customRole.RoleColor.GetAlternateColor();
 
+        var categoryHeaderMasked = __instance.AdvancedRolesSettings.transform.Find("CategoryHeaderMasked").GetComponent<CategoryHeaderMasked>();
+
+        if (categoryHeaderMasked.Title.gameObject.TryGetComponent<TextTranslatorTMP>(out var comp))
+        {
+            comp.Destroy();
+        }
+
+        categoryHeaderMasked.Title.text = "RETURN TO ROLE SETTINGS";
+
+        if (!categoryHeaderMasked.gameObject.TryGetComponent<PassiveButton>(out _))
+        {
+            var boxCol = categoryHeaderMasked.gameObject.AddComponent<BoxCollider2D>();
+            boxCol.size = new Vector2(7, 0.7f);
+            boxCol.offset = new Vector2(1.5f, -0.3f);
+
+            var headerBtn = categoryHeaderMasked.gameObject.AddComponent<PassiveButton>();
+            headerBtn.ClickSound = __instance.BackButton.GetComponent<PassiveButton>().ClickSound;
+            headerBtn.OnMouseOver = new UnityEvent();
+            headerBtn.OnMouseOut = new UnityEvent();
+            headerBtn.OnClick.AddListener(
+                (UnityAction)(() =>
+                {
+                    __instance.OpenChancesTab();
+                }));
+            headerBtn.SetButtonEnableState(true);
+        }
+
         var bg = __instance.AdvancedRolesSettings.transform.Find("Background");
         bg.localPosition = new Vector3(1.4041f, -7.08f, 0);
         bg.GetComponent<SpriteRenderer>().size = new Vector2(89.4628f, 100);
@@ -295,12 +439,17 @@ public static class RoleSettingMenuPatches
         __instance.RefreshChildren();
     }
 
-    private static void CreateQuotaOption(RolesSettingsMenu __instance, RoleBehaviour role, ref float yPos, int index)
+    private static RoleOptionSetting? CreateQuotaOption(RolesSettingsMenu __instance, RoleBehaviour role, int index)
     {
         if (role is not ICustomRole customRole)
         {
             Logger<MiraApiPlugin>.Error($"Role {role.NiceName} is not a custom role.");
-            return;
+            return null;
+        }
+
+        if (customRole.Configuration.HideSettings)
+        {
+            return null;
         }
 
         var roleOptionSetting = Object.Instantiate(
@@ -308,7 +457,7 @@ public static class RoleSettingMenuPatches
             Vector3.zero,
             Quaternion.identity,
             __instance.RoleChancesSettings.transform);
-        roleOptionSetting.transform.localPosition = new Vector3(-0.15f, yPos, -2f);
+        roleOptionSetting.transform.localPosition = new Vector3(-0.1f, ScrollerNum, -2f);
 
         roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20);
         roleOptionSetting.labelSprite.color = customRole.RoleColor;
@@ -355,7 +504,9 @@ public static class RoleSettingMenuPatches
 
         if (index < GameSettingMenuPatches.SelectedMod?.CustomRoles.Count - 1)
         {
-            yPos += -0.43f;
+            ScrollerNum += -0.43f;
         }
+
+        return roleOptionSetting;
     }
 }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -1,8 +1,12 @@
 using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 using Reactor.Utilities.Extensions;
+using System.Linq;
 
 namespace MiraAPI.Patches;
 
@@ -36,14 +40,50 @@ public static class PlayerControlPatches
     [HarmonyPatch(nameof(PlayerControl.Die))]
     public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason)
     {
+        var deathEvent = new PlayerDeathEvent(__instance, reason);
+        MiraEventManager.InvokeEvent(deathEvent);
+
         var modifiersComponent = __instance.GetComponent<ModifierComponent>();
 
         if (modifiersComponent)
         {
-            modifiersComponent.ActiveModifiers.ForEach(x=>x.OnDeath(reason));
+            modifiersComponent.ActiveModifiers.ForEach(x => x.OnDeath(reason));
         }
     }
 
+    /// <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))]
+    public static void PlayerCompleteTaskPostfix(PlayerControl __instance, uint idx)
+    {
+        var playerTask = __instance.myTasks.ToArray().First(playerTask => playerTask.Id == idx);
+        if (playerTask != null)
+        {
+            var completeTaskEvent = new CompleteTaskEvent(__instance, playerTask);
+            MiraEventManager.InvokeEvent(completeTaskEvent);
+        }
+    }
+
+    /// <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))]
+    public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed)
+    {
+        var beforeMurderEvent = new BeforeMurderEvent(__instance, target);
+        MiraEventManager.InvokeEvent(beforeMurderEvent);
+
+        didSucceed = beforeMurderEvent.IsCancelled;
+    }
+
     /// <summary>
     /// FixedUpdate handler for custom roles and custom buttons.
     /// </summary>
@@ -86,6 +126,6 @@ public static class PlayerControlPatches
     [HarmonyPatch(nameof(PlayerControl.OnDestroy))]
     public static void PlayerControlOnDestroyPrefix(PlayerControl __instance)
     {
-        ModifierExtensions.ModifierComponents.Remove(__instance);
+        Utilities.ModifierExtensions.ModifierComponents.Remove(__instance);
     }
 }

MiraAPI/Patches/Roles/EjectionPatches.cs

@@ -1,4 +1,6 @@
 using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Meeting;
 using MiraAPI.Roles;
 
 namespace MiraAPI.Patches.Roles;
@@ -13,6 +15,9 @@ public static class EjectionPatches
     [HarmonyPatch(nameof(ExileController.Begin))]
     public static void BeginPostfix(ExileController __instance)
     {
+        var @event = new EjectionEvent(__instance);
+        MiraEventManager.InvokeEvent(@event);
+
         if (!__instance.initData.networkedPlayer || !__instance.initData.networkedPlayer.Role ||
             __instance.initData.networkedPlayer.Role is not ICustomRole role)
         {

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -0,0 +1,27 @@
+using HarmonyLib;
+using MiraAPI.Roles;
+using UnityEngine;
+
+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))]
+public static class HauntMenuMinigamePatch
+{
+    public static void Postfix(HauntMenuMinigame __instance)
+    {
+        if (__instance.HauntTarget.Data.IsDead)
+        {
+            __instance.FilterText.color = Color.white;
+            return;
+        }
+
+        var role = __instance.HauntTarget.Data.Role;
+        var color = role is ICustomRole custom ? custom.RoleColor : role.TeamColor;
+
+        __instance.FilterText.text = role.NiceName;
+        __instance.FilterText.color = color;
+    }
+}

MiraAPI/Patches/Roles/NameTagPatch.cs

@@ -1,10 +1,11 @@
 using HarmonyLib;
+using MiraAPI.Roles;
 using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Set nametag color depending on option
+/// Set nametag color depending on visibility.
 /// </summary>
 [HarmonyPatch(typeof(PlayerNameColor))]
 public static class NameTagPatch
@@ -13,6 +14,12 @@ public static class NameTagPatch
     [HarmonyPatch(nameof(PlayerNameColor.Get), typeof(RoleBehaviour))]
     public static bool GetPatch([HarmonyArgument(0)] RoleBehaviour otherPlayerRole, ref Color __result)
     {
+        if (otherPlayerRole is ICustomRole customRole && customRole.CanLocalPlayerSeeRole(otherPlayerRole.Player))
+        {
+            __result = customRole.RoleColor;
+            return false;
+        }
+
         if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && otherPlayerRole.IsImpostor)
         {
             return true;

MiraAPI/Patches/Roles/RoleBehaviourPatch.cs

@@ -5,10 +5,10 @@ using UnityEngine;
 namespace MiraAPI.Patches.Roles;
 
 [HarmonyPatch(typeof(RoleBehaviour))]
-public static class RoleBehaviourPatches
+public static class RoleBehaviourPatch
 {
     /// <summary>
-    /// Update TeamColor text for Launchpad roles
+    /// Update TeamColor text for Mira roles.
     /// </summary>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(RoleBehaviour.TeamColor), MethodType.Getter)]
@@ -22,4 +22,4 @@ public static class RoleBehaviourPatches
         __result = behaviour.RoleColor;
         return false;
     }
-}
+}

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -1,5 +1,7 @@
 using AmongUs.GameOptions;
 using HarmonyLib;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 using System.Linq;
@@ -9,6 +11,14 @@ namespace MiraAPI.Patches.Roles;
 [HarmonyPatch(typeof(RoleManager))]
 public static class RoleManagerPatches
 {
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(RoleManager.SetRole))]
+    public static void SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType)
+    {
+        var @event = new SetRoleEvent(targetPlayer, roleType);
+        MiraEventManager.InvokeEvent(@event);
+    }
+
     [HarmonyPostfix]
     [HarmonyPatch(nameof(RoleManager.SelectRoles))]
     public static void ModifierSelectionPatches(RoleManager __instance)

MiraAPI/Patches/Stubs/MinigameStubs.cs

@@ -21,4 +21,16 @@ public static class MinigameStubs
     {
         // nothing needed
     }
+
+    /// <summary>
+    /// Reverse patch for Minigame.Close.
+    /// </summary>
+    /// <param name="instance">The Minigame instance.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(Minigame), nameof(Minigame.Close), [])]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void Close(Minigame instance)
+    {
+        // nothing needed
+    }
 }

MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs

@@ -0,0 +1,229 @@
+using System.Runtime.CompilerServices;
+using HarmonyLib;
+using Il2CppSystem.Text;
+
+namespace MiraAPI.Patches.Stubs;
+
+[HarmonyPatch]
+public static class RoleBehaviourStubs
+{
+    /// <summary>
+    /// Stub method for RoleBehaviour.Initialize.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="player">The PlayerControl to initialize.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.Initialize))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void Initialize(RoleBehaviour instance, PlayerControl player)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.AdjustTasks.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="player">The PlayerControl to adjust tasks for.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.AdjustTasks))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void AdjustTasks(RoleBehaviour instance, PlayerControl player)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.AppendTaskHint.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="taskStringBuilder">The StringBuilder to append the task hint to.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.AppendTaskHint), typeof(StringBuilder))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void AppendTaskHint(RoleBehaviour instance, StringBuilder taskStringBuilder)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.CanUse.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="console">The IUsable console to check.</param>
+    /// <returns>Whether the console can be used.</returns>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.CanUse))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static bool CanUse(RoleBehaviour instance, IUsable console)
+    {
+        return default;
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.Deinitialize.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="targetPlayer">The PlayerControl to deinitialize for.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.Deinitialize))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void Deinitialize(RoleBehaviour instance, PlayerControl targetPlayer)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.DidWin.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="gameOverReason">The reason for game over.</param>
+    /// <returns>Whether the role won.</returns>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.DidWin))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static bool DidWin(RoleBehaviour instance, GameOverReason gameOverReason)
+    {
+        return default;
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.FindClosestTarget.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <returns>The closest target PlayerControl.</returns>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.FindClosestTarget))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static PlayerControl FindClosestTarget(RoleBehaviour instance)
+    {
+        return null;
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.GetAbilityDistance.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <returns>The ability distance.</returns>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.GetAbilityDistance))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static float GetAbilityDistance(RoleBehaviour instance)
+    {
+        return default;
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.IsValidTarget.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="target">The NetworkedPlayerInfo to validate.</param>
+    /// <returns>Whether the target is valid.</returns>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.IsValidTarget))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static bool IsValidTarget(RoleBehaviour instance, NetworkedPlayerInfo target)
+    {
+        return default;
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.OnDeath.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="reason">The reason for death.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.OnDeath))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void OnDeath(RoleBehaviour instance, DeathReason reason)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.OnMeetingStart.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.OnMeetingStart))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void OnMeetingStart(RoleBehaviour instance)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.OnVotingComplete.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.OnVotingComplete))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void OnVotingComplete(RoleBehaviour instance)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.SetCooldown.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.SetCooldown))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void SetCooldown(RoleBehaviour instance)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.SetPlayerTarget.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="target">The PlayerControl target to set.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.SetPlayerTarget))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void SetPlayerTarget(RoleBehaviour instance, PlayerControl target)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.SetUsableTarget.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="target">The IUsable target to set.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.SetUsableTarget))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void SetUsableTarget(RoleBehaviour instance, IUsable target)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.SpawnTaskHeader.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    /// <param name="playerControl">The PlayerControl to spawn the task header for.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.SpawnTaskHeader))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void SpawnTaskHeader(RoleBehaviour instance, PlayerControl playerControl)
+    {
+        // nothing needed
+    }
+
+    /// <summary>
+    /// Stub method for RoleBehaviour.UseAbility.
+    /// </summary>
+    /// <param name="instance">The RoleBehaviour object.</param>
+    [HarmonyReversePatch]
+    [HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.UseAbility))]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void UseAbility(RoleBehaviour instance)
+    {
+        // nothing needed
+    }
+}

MiraAPI/Patches/VentPatches.cs

@@ -1,6 +1,8 @@
 using HarmonyLib;
-using MiraAPI.Modifiers;
+using MiraAPI.Events;
+using MiraAPI.Events.Vanilla.Usables;
 using MiraAPI.Roles;
+using MiraAPI.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Patches;
@@ -18,6 +20,15 @@ public static class VentPatches
     [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)
     {
+        var @event = new PlayerCanUseEvent(__instance.Cast<IUsable>());
+        MiraEventManager.InvokeEvent(@event);
+
+        if (@event.IsCancelled)
+        {
+            canUse = couldUse = false;
+            return;
+        }
+
         var @object = pc.Object;
         var role = @object.Data.Role;
 
@@ -29,10 +40,10 @@ public static class VentPatches
         {
             switch (canVent)
             {
-                case true when modifiers.Exists(x => x.CanVent().HasValue && x.CanVent()==false):
+                case true when modifiers.Exists(x => x.CanVent().HasValue && x.CanVent() == false):
                     couldUse = canUse = false;
                     return;
-                case false when modifiers.Exists(x => x.CanVent().HasValue && x.CanVent()==true):
+                case false when modifiers.Exists(x => x.CanVent().HasValue && x.CanVent() == true):
                     couldUse = true;
                     break;
             }
@@ -48,6 +59,7 @@ public static class VentPatches
             num = Vector2.Distance(center, position);
             canUse &= num <= __instance.UsableDistance && !PhysicsHelpers.AnythingBetween(@object.Collider, center, position, Constants.ShipOnlyMask, false);
         }
+
         __result = num;
     }
 }

MiraAPI/PluginLoading/MiraIgnoreAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace MiraAPI.PluginLoading;
+
+/// <summary>
+/// Skip an element during plugin loading.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, Inherited = false)]
+public class MiraIgnoreAttribute : Attribute;

MiraAPI/PluginLoading/MiraPluginInfo.cs

@@ -5,6 +5,7 @@ using MiraAPI.GameOptions;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using MiraAPI.Hud;
+using MiraAPI.Modifiers;
 
 namespace MiraAPI.PluginLoading;
 
@@ -21,6 +22,15 @@ public class MiraPluginInfo
         PluginId = info.Metadata.GUID;
     }
 
+    /// <summary>
+    /// Get a read only collection of this plugin's modifiers. This is probably not safe because they are uninitialized.
+    /// </summary>
+    /// <returns>Readonly collection of modifiers.</returns>
+    public IReadOnlyCollection<BaseModifier> GetModifiers()
+    {
+        return Modifiers.AsReadOnly();
+    }
+
     /// <summary>
     /// Get a read only collection of this plugin's Option Groups.
     /// </summary>
@@ -61,6 +71,8 @@ public class MiraPluginInfo
 
     internal List<IModdedOption> Options { get; } = [];
 
+    internal List<BaseModifier> Modifiers { get; } = [];
+
     internal Dictionary<ushort, RoleBehaviour> CustomRoles { get; } = [];
 
     internal Dictionary<int, CustomGameMode> GameModes { get; } = [];

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using BepInEx.Unity.IL2CPP;
+using BepInEx.Unity.IL2CPP;
 using MiraAPI.Colors;
 using MiraAPI.Events;
 using MiraAPI.GameOptions;
@@ -13,6 +9,11 @@ using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Networking;
 using Reactor.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
 
 namespace MiraAPI.PluginLoading;
 
@@ -38,42 +39,75 @@ public sealed class MiraPluginManager
             }
 
             var info = new MiraPluginInfo(miraPlugin, pluginInfo);
+            var roles = new List<Type>();
 
-            RegisterModifierAttribute(assembly);
-            RegisterAllOptions(assembly, info);
+            foreach (var type in assembly.GetTypes())
+            {
+                if (type.GetCustomAttribute<MiraIgnoreAttribute>() != null)
+                {
+                    continue;
+                }
 
-            RegisterRoleAttribute(assembly, info);
-            RegisterButtonAttribute(assembly, info);
+                if (RegisterModifier(type, info))
+                {
+                    continue;
+                }
 
-            RegisterColorClasses(assembly);
+                if (RegisterOptions(type, info))
+                {
+                    continue;
+                }
+
+                if (RegisterRoleAttribute(type, info, out var role))
+                {
+                    roles.Add(role!);
+                    continue;
+                }
+
+                if (RegisterButtonAttribute(type, info))
+                {
+                    continue;
+                }
+
+                RegisterColorClasses(type);
+            }
+
+            info.OptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
+            CustomRoleManager.RegisterRoleTypes(roles, info);
 
             _registeredPlugins.Add(assembly, info);
-
             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);
+        };
     }
 
     /// <summary>
     /// Get a mira plugin by its GUID.
     /// </summary>
-    /// <param name="guid">The plugin GUID.</param>
+    /// <param name="pluginId">The plugin GUID.</param>
     /// <returns>A MiraPluginInfo.</returns>
-    public static MiraPluginInfo GetPluginByGuid(string guid)
+    public static MiraPluginInfo? GetPluginByGuid(string pluginId)
     {
-        return Instance._registeredPlugins.Values.First(plugin => plugin.PluginId == guid);
+        return Instance._registeredPlugins.Values.FirstOrDefault(plugin => plugin.PluginId == pluginId);
     }
 
-    private static void RegisterAllOptions(Assembly assembly, MiraPluginInfo pluginInfo)
+    private static bool RegisterOptions(Type type, MiraPluginInfo pluginInfo)
     {
-        var filteredTypes = assembly.GetTypes().Where(type => type.IsAssignableTo(typeof(AbstractOptionGroup)));
-
-        foreach (var type in filteredTypes)
+        try
         {
+            if (!type.IsAssignableTo(typeof(AbstractOptionGroup)))
+            {
+                return false;
+            }
+
             if (!ModdedOptionsManager.RegisterGroup(type, pluginInfo))
             {
-                continue;
+                return false;
             }
 
             foreach (var property in type.GetProperties())
@@ -92,53 +126,55 @@ public sealed class MiraPluginManager
 
                 ModdedOptionsManager.RegisterAttributeOption(type, attribute, property, pluginInfo);
             }
-        }
 
-        pluginInfo.OptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
+            return true;
+        }
+        catch (Exception e)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to register options for {type.Name}: {e}");
+        }
+        return false;
     }
 
-    private static void RegisterRoleAttribute(Assembly assembly, MiraPluginInfo pluginInfo)
+    private static bool RegisterRoleAttribute(Type type, MiraPluginInfo pluginInfo, out Type? role)
     {
-        List<Type> roles = [];
-        foreach (var type in assembly.GetTypes())
+        role = null;
+        try
         {
-            var attribute = type.GetCustomAttribute<RegisterCustomRoleAttribute>();
-            if (attribute == null)
-            {
-                continue;
-            }
-
             if (!(typeof(RoleBehaviour).IsAssignableFrom(type) && typeof(ICustomRole).IsAssignableFrom(type)))
             {
-                Logger<MiraApiPlugin>.Error($"{type.Name} does not inherit from RoleBehaviour or ICustomRole.");
-                continue;
+                return false;
             }
 
             if (!ModList.GetById(pluginInfo.PluginId).IsRequiredOnAllClients)
             {
                 Logger<MiraApiPlugin>.Error("Custom roles are only supported on all clients.");
-                return;
+                return false;
             }
 
-            roles.Add(type);
+            role = type;
+            return true;
         }
-
-        CustomRoleManager.RegisterRoleTypes(roles, pluginInfo);
+        catch (Exception e)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to register role for {type.Name}: {e}");
+        }
+        return false;
     }
 
-    private static void RegisterColorClasses(Assembly assembly)
+    private static void RegisterColorClasses(Type type)
     {
-        foreach (var type in assembly.GetTypes())
+        try
         {
             if (type.GetCustomAttribute<RegisterCustomColorsAttribute>() == null)
             {
-                continue;
+                return;
             }
 
             if (!type.IsStatic())
             {
                 Logger<MiraApiPlugin>.Error($"Color class {type.Name} must be static.");
-                continue;
+                return;
             }
 
             foreach (var property in type.GetProperties())
@@ -157,29 +193,36 @@ public sealed class MiraPluginManager
                 PaletteManager.CustomColors.Add(color);
             }
         }
-    }
-
-    private static void RegisterModifierAttribute(Assembly assembly)
-    {
-        foreach (var type in assembly.GetTypes())
+        catch (Exception e)
         {
-            var attribute = type.GetCustomAttribute<RegisterModifierAttribute>();
-            if (attribute != null)
-            {
-                ModifierManager.RegisterModifier(type);
-            }
+            Logger<MiraApiPlugin>.Error($"Failed to register color class {type.Name}: {e}");
         }
     }
 
-    private static void RegisterButtonAttribute(Assembly assembly, MiraPluginInfo pluginInfo)
+    private static bool RegisterModifier(Type type, MiraPluginInfo info)
     {
-        foreach (var type in assembly.GetTypes())
+        try
         {
-            var attribute = type.GetCustomAttribute<RegisterButtonAttribute>();
-            if (attribute != null)
-            {
-                CustomButtonManager.RegisterButton(type, pluginInfo);
-            }
+            return ModifierManager.RegisterModifier(type, info);
         }
+        catch (Exception e)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to register modifier {type.Name}: {e}");
+            return false;
+        }
+    }
+
+    private static bool RegisterButtonAttribute(Type type, MiraPluginInfo pluginInfo)
+    {
+        try
+        {
+            return CustomButtonManager.RegisterButton(type, pluginInfo);
+        }
+        catch (Exception e)
+        {
+            Logger<MiraApiPlugin>.Error($"Failed to register button {type.Name}: {e}");
+        }
+
+        return false;
     }
 }

MiraAPI/Roles/CustomRoleConfiguration.cs

@@ -7,7 +7,7 @@ namespace MiraAPI.Roles;
 /// <summary>
 /// Used to configure the specific settings of a role.
 /// </summary>
-public struct CustomRoleConfiguration
+public record struct CustomRoleConfiguration
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="CustomRoleConfiguration"/> struct.
@@ -17,11 +17,6 @@ public struct CustomRoleConfiguration
     {
         var roleBehaviour = role as RoleBehaviour;
 
-        MaxRoleCount = 15;
-        DefaultRoleCount = 0;
-        DefaultChance = 0;
-
-        OptionsScreenshot = Icon = MiraAssets.Empty;
         AffectedByLightOnAirship = role.Team == ModdedRoleTeams.Crewmate;
         KillButtonOutlineColor = role.Team switch
         {
@@ -29,7 +24,6 @@ public struct CustomRoleConfiguration
             ModdedRoleTeams.Crewmate => Palette.CrewmateBlue,
             _ => role.RoleColor,
         };
-        RoleHintType = RoleHintType.RoleTab;
         GhostRole = role.Team is ModdedRoleTeams.Impostor ? RoleTypes.ImpostorGhost : RoleTypes.CrewmateGhost;
         CanGetKilled = roleBehaviour?.IsDead == false && role.Team is not ModdedRoleTeams.Impostor;
         UseVanillaKillButton = role.Team is ModdedRoleTeams.Impostor;
@@ -37,86 +31,92 @@ public struct CustomRoleConfiguration
         CanUseSabotage = role.Team is ModdedRoleTeams.Impostor;
         TasksCountForProgress = role.Team is ModdedRoleTeams.Crewmate;
         HideSettings = roleBehaviour?.IsDead == true;
-        CanModifyChance = true;
+        ShowInFreeplay = roleBehaviour?.IsDead == false;
+        OptionsScreenshot = null;
     }
 
     /// <summary>
-    /// Gets the hard limit of players that can have this role. This property is used to set a limit in the Role Options menu. If set to 0, the role will not be assigned at start.
+    /// Gets or sets the hard limit of players that can have this role. This property is used to set a limit in the Role Options menu. If set to 0, the role will not be assigned at start.
     /// </summary>
-    public int MaxRoleCount;
+    public int MaxRoleCount { get; set; } = 15;
 
     /// <summary>
-    /// Gets the default role count.
+    /// Gets or sets the default role count.
     /// </summary>
-    public int DefaultRoleCount;
+    public int DefaultRoleCount { get; set; } = 0;
 
     /// <summary>
-    /// Gets the default role chance.
+    /// Gets or sets the default role chance.
     /// </summary>
-    public int DefaultChance;
+    public int DefaultChance { get; set; } = 0;
 
     /// <summary>
-    /// Whether the chance option can be changed or not.
+    /// Gets or sets a value indicating whether the chance option can be changed or not.
     /// </summary>
-    public bool CanModifyChance;
+    public bool CanModifyChance { get; set; } = true;
 
     /// <summary>
-    /// Gets the Sprite used for the Role Options menu screenshot.
+    /// Gets or sets the Sprite used for the Role Options menu screenshot.
     /// </summary>
-    public LoadableAsset<Sprite> OptionsScreenshot;
+    public LoadableAsset<Sprite>? OptionsScreenshot { get; set; }
 
     /// <summary>
-    /// Gets the Sprite used for the Role Icon.
+    /// Gets or sets the Sprite used for the Role Icon.
     /// </summary>
-    public LoadableAsset<Sprite> Icon;
+    public LoadableAsset<Sprite> Icon { get; set; } = MiraAssets.Empty;
 
     /// <summary>
-    /// Gets a value indicating whether the role is affected by light affectors on Airship.
+    /// Gets or sets a value indicating whether the role is affected by light affectors on Airship.
     /// </summary>
-    public bool AffectedByLightOnAirship;
+    public bool AffectedByLightOnAirship { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the role can be killed by vanilla murder system.
+    /// Gets or sets a value indicating whether the role can be killed by vanilla murder system.
     /// </summary>
-    public bool CanGetKilled;
+    public bool CanGetKilled { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the role should use the vanilla kill button.
+    /// Gets or sets a value indicating whether the role should use the vanilla kill button.
     /// </summary>
-    public bool UseVanillaKillButton;
+    public bool UseVanillaKillButton { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the role can use vents.
+    /// Gets or sets a value indicating whether the role can use vents.
     /// </summary>
-    public bool CanUseVent;
+    public bool CanUseVent { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the role can use the sabotage button.
+    /// Gets or sets a value indicating whether the role can use the sabotage button.
     /// </summary>
-    public bool CanUseSabotage;
+    public bool CanUseSabotage { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the role's tasks count towards task progress.
+    /// Gets or sets a value indicating whether the role's tasks count towards task progress.
     /// </summary>
-    public bool TasksCountForProgress;
+    public bool TasksCountForProgress { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the role should show up in the Role Options menu.
+    /// Gets or sets a value indicating whether the role should show up in the Role Options menu.
     /// </summary>
-    public bool HideSettings;
+    public bool HideSettings { get; set; }
 
     /// <summary>
-    /// Gets the outline color for the KillButton if <see cref="UseVanillaKillButton"/> is true.
+    /// Gets or sets a value indicating whether the role should show up in the Freeplay Role Selection menu.
     /// </summary>
-    public Color KillButtonOutlineColor;
+    public bool ShowInFreeplay { get; set; }
 
     /// <summary>
-    /// Gets the role hint style. See <see cref="RoleHintType"/> enum for all options.
+    /// Gets or sets the outline color for the KillButton if <see cref="UseVanillaKillButton"/> is true.
     /// </summary>
-    public RoleHintType RoleHintType;
+    public Color KillButtonOutlineColor { get; set; }
 
     /// <summary>
-    /// Gets the Ghost role that is applied when the player is killed.
+    /// Gets or sets the role hint style. See <see cref="RoleHintType"/> enum for all options.
     /// </summary>
-    public RoleTypes GhostRole;
-}
+    public RoleHintType RoleHintType { get; set; } = RoleHintType.RoleTab;
+
+    /// <summary>
+    /// Gets or sets the Ghost role that is applied when the player is killed.
+    /// </summary>
+    public RoleTypes GhostRole { get; set; }
+}

MiraAPI/Roles/CustomRoleManager.cs

@@ -79,7 +79,7 @@ public static class CustomRoleManager
         var roleId = RoleIds[roleType];
 
         roleBehaviour.Role = (RoleTypes)roleId;
-        roleBehaviour.TeamType = customRole.Team == ModdedRoleTeams.Neutral ? RoleTeamTypes.Crewmate : (RoleTeamTypes)customRole.Team;
+        roleBehaviour.TeamType = customRole.Team == ModdedRoleTeams.Custom ? RoleTeamTypes.Crewmate : (RoleTeamTypes)customRole.Team;
         roleBehaviour.NameColor = customRole.RoleColor;
         roleBehaviour.StringName = CustomStringName.CreateAndRegister(customRole.RoleName);
         roleBehaviour.BlurbName = CustomStringName.CreateAndRegister(customRole.RoleDescription);
@@ -91,7 +91,7 @@ public static class CustomRoleManager
         roleBehaviour.CanVent = customRole.Configuration.CanUseVent;
         roleBehaviour.DefaultGhostRole = customRole.Configuration.GhostRole;
         roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount;
-        roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot.LoadAsset();
+        roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot?.LoadAsset();
 
         if (roleBehaviour.IsDead)
         {

MiraAPI/Roles/ICustomRole.cs

@@ -2,8 +2,8 @@
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
-using System.Text;
 using Reactor.Utilities;
+using System.Text;
 using UnityEngine;
 
 namespace MiraAPI.Roles;
@@ -43,6 +43,26 @@ public interface ICustomRole
     /// </summary>
     CustomRoleConfiguration Configuration { get; }
 
+    /// <summary>
+    /// Gets the role options group.
+    /// </summary>
+    public RoleOptionsGroup RoleOptionsGroup => Team switch
+    {
+        ModdedRoleTeams.Crewmate => RoleOptionsGroup.Crewmate,
+        ModdedRoleTeams.Impostor => RoleOptionsGroup.Impostor,
+        ModdedRoleTeams.Custom => RoleOptionsGroup.Neutral,
+        _ => new RoleOptionsGroup(RoleName, RoleColor),
+    };
+
+    /// <summary>
+    /// Gets the role's TeamIntroCutscene configuration.
+    /// </summary>
+    public TeamIntroConfiguration? IntroConfiguration => Team switch
+    {
+        ModdedRoleTeams.Custom => TeamIntroConfiguration.Neutral,
+        _ => null,
+    };
+
     /// <summary>
     /// Gets the parent mod of this role.
     /// </summary>
@@ -63,7 +83,7 @@ public interface ICustomRole
     /// Gets the role chance option.
     /// </summary>
     /// <returns>The role chance option.</returns>
-    public int? GetChance()
+    public virtual int? GetChance()
     {
         if (!Configuration.CanModifyChance)
         {
@@ -82,7 +102,7 @@ public interface ICustomRole
     /// Gets the role count option.
     /// </summary>
     /// <returns>The role count option.</returns>
-    public int? GetCount()
+    public virtual int? GetCount()
     {
         if (ParentMod.PluginConfig.TryGetEntry(NumConfigDefinition, out ConfigEntry<int> entry))
         {
@@ -96,7 +116,7 @@ public interface ICustomRole
     /// Sets the role chance option.
     /// </summary>
     /// <param name="chance">The chance between 0 and 100.</param>
-    public void SetChance(int chance)
+    public virtual void SetChance(int chance)
     {
         if (!Configuration.CanModifyChance)
         {
@@ -117,7 +137,7 @@ public interface ICustomRole
     /// Sets the role count option.
     /// </summary>
     /// <param name="count">The amount of this role between zero and its MaxRoleCount in the Configuration.</param>
-    public void SetCount(int count)
+    public virtual void SetCount(int count)
     {
         if (ParentMod.PluginConfig.TryGetEntry(NumConfigDefinition, out ConfigEntry<int> entry))
         {
@@ -128,6 +148,16 @@ public interface ICustomRole
         Logger<MiraApiPlugin>.Error($"Error getting count configuration for role: {RoleName}");
     }
 
+    /// <summary>
+    /// Whether the local player can see this role.
+    /// </summary>
+    /// <param name="player">The player with the role.</param>
+    /// <returns>Whether they can see the role (name color) or not.</returns>
+    public virtual bool CanLocalPlayerSeeRole(PlayerControl player)
+    {
+        return (PlayerControl.LocalPlayer.Data.Role.IsImpostor && player.Data.Role.IsImpostor) || PlayerControl.LocalPlayer.Data.IsDead;
+    }
+
     /// <summary>
     /// This method runs on the HudManager.Update method ONLY when the LOCAL player has this role.
     /// </summary>

MiraAPI/Roles/ModdedRoleTeams.cs

@@ -4,5 +4,5 @@ public enum ModdedRoleTeams
 {
     Crewmate,
     Impostor,
-    Neutral,
+    Custom,
 }

MiraAPI/Roles/RegisterCustomRoleAttribute.cs

@@ -1,6 +0,0 @@
-using System;
-
-namespace MiraAPI.Roles;
-
-[AttributeUsage(AttributeTargets.Class)]
-public class RegisterCustomRoleAttribute : Attribute;

MiraAPI/Roles/RoleOptionsGroup.cs

@@ -0,0 +1,27 @@
+using UnityEngine;
+
+namespace MiraAPI.Roles;
+
+/// <summary>
+/// Represents a group of roles.
+/// </summary>
+/// <param name="Name">The group's name.</param>
+/// <param name="Color">The group's color.</param>
+/// <param name="Priority">The priority to sort by on role setting screen. Negative means first.</param>
+public record struct RoleOptionsGroup(string Name, Color Color, int Priority = 0)
+{
+    /// <summary>
+    /// Gets the default group for crewmates.
+    /// </summary>
+    public static RoleOptionsGroup Crewmate { get; } = new("Crewmate", Palette.CrewmateBlue, -2);
+
+    /// <summary>
+    /// Gets the default group for impostors.
+    /// </summary>
+    public static RoleOptionsGroup Impostor { get; } = new("Impostor", Palette.ImpostorRed, -1);
+
+    /// <summary>
+    /// Gets the default group for neutral roles.
+    /// </summary>
+    public static RoleOptionsGroup Neutral { get; } = new("Neutral Roles", Color.gray);
+}

MiraAPI/Roles/TeamIntroConfiguration.cs

@@ -0,0 +1,20 @@
+using UnityEngine;
+
+namespace MiraAPI.Roles;
+
+/// <summary>
+/// Used to configure the TEAM part of the intro cutscene.
+/// </summary>
+/// <param name="IntroTeamColor">The color to show during the "Team" part of the intro cutscene.</param>
+/// <param name="IntroTeamTitle">The title text to show during the "Team" part of the intro cutscene.</param>
+/// <param name="IntroTeamDescription">The description text to show during the "Team" part of the intro cutscene.</param>
+public record struct TeamIntroConfiguration(Color IntroTeamColor, string IntroTeamTitle, string IntroTeamDescription)
+{
+    /// <summary>
+    /// Gets the default configuration for the "Neutral" team.
+    /// </summary>
+    public static TeamIntroConfiguration Neutral { get; } = new(
+        Color.gray,
+        "NEUTRAL",
+        "You are Neutral. You do not have a team.");
+}

MiraAPI/Utilities/Extensions.cs

@@ -1,11 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using HarmonyLib;
 using MiraAPI.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
 using Reactor.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using TMPro;
 using UnityEngine;
 
 namespace MiraAPI.Utilities;
@@ -37,6 +38,16 @@ public static class Extensions
             BitConverter.GetBytes(count.Value).AddRangeToArray(BitConverter.GetBytes(chance.Value)));
     }
 
+    /// <summary>
+    /// Enables stencil masking on a TMP text object.
+    /// </summary>
+    /// <param name="text">The TMP text.</param>
+    public static void EnableStencilMasking(this TMP_Text text)
+    {
+        text.fontMaterial.SetFloat(ShaderID.Get("_Stencil"), 1);
+        text.fontMaterial.SetFloat(ShaderID.Get("_StencilComp"), 4);
+    }
+
     /// <summary>
     /// Checks if a type is static.
     /// </summary>
@@ -251,4 +262,16 @@ public static class Extensions
 
         return predicate != null ? filteredPlayers.Find(predicate) : filteredPlayers.FirstOrDefault();
     }
+
+    /// <summary>
+    /// Fixed version of Reactor's SetOutline.
+    /// </summary>
+    /// <param name="renderer">The renderer you want to update the outline for.</param>
+    /// <param name="color">The outline color.</param>
+    public static void UpdateOutline(this Renderer renderer, Color? color)
+    {
+        renderer.material.SetFloat(ShaderID.Outline, color.HasValue ? 1 : 0);
+        renderer.material.SetColor(ShaderID.OutlineColor, color ?? Color.clear);
+        renderer.material.SetColor(ShaderID.AddColor, color ?? Color.clear);
+    }
 }

MiraAPI/Utilities/Helpers.cs

@@ -1,5 +1,5 @@
-using System.Collections;
-using MiraAPI.Roles;
+using MiraAPI.Roles;
+using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -15,6 +15,15 @@ namespace MiraAPI.Utilities;
 /// </summary>
 public static class Helpers
 {
+    /// <summary>
+    /// Get all living players.
+    /// </summary>
+    /// <returns>A list of alive players.</returns>
+    public static List<PlayerControl> GetAlivePlayers()
+    {
+        return PlayerControl.AllPlayerControls.ToArray().Where(x => !x.Data.IsDead).ToList();
+    }
+
     /// <summary>
     /// Returns an empty coroutine.
     /// </summary>
@@ -99,14 +108,14 @@ public static class Helpers
         }
 
         return (from player in newList
-            let vector = player.GetTruePosition() - source
-            let magnitude = vector.magnitude
-            where !PhysicsHelpers.AnyNonTriggersBetween(
-                source,
-                vector.normalized,
-                magnitude,
-                Constants.ShipAndObjectsMask)
-            select player).ToList();
+                let vector = player.GetTruePosition() - source
+                let magnitude = vector.magnitude
+                where !PhysicsHelpers.AnyNonTriggersBetween(
+                    source,
+                    vector.normalized,
+                    magnitude,
+                    Constants.ShipAndObjectsMask)
+                select player).ToList();
     }
 
     /// <summary>
@@ -168,7 +177,7 @@ public static class Helpers
             select playerControl);
 
         outputList.Sort(
-            delegate(PlayerControl a, PlayerControl b)
+            delegate (PlayerControl a, PlayerControl b)
             {
                 var magnitude2 = (a.GetTruePosition() - source).magnitude;
                 var magnitude3 = (b.GetTruePosition() - source).magnitude;

MiraAPI/Utilities/ModifierExtensions.cs

@@ -0,0 +1,252 @@
+using System;
+using System.Collections.Generic;
+using MiraAPI.Modifiers;
+using MiraAPI.Networking;
+using Reactor.Networking.Attributes;
+using Reactor.Utilities;
+
+namespace MiraAPI.Utilities;
+
+/// <summary>
+/// Extensions for modifiers.
+/// </summary>
+public static class ModifierExtensions
+{
+    /// <summary>
+    /// Gets the dictionary to cache ModifierComponents.
+    /// </summary>
+    public static Dictionary<PlayerControl, ModifierComponent> ModifierComponents { get; } = [];
+
+    /// <summary>
+    /// Remote Procedure Call to add a modifier to a player.
+    /// </summary>
+    /// <param name="target">The player to add the modifier to.</param>
+    /// <param name="modifierId">The modifier ID.</param>
+    [MethodRpc((uint)MiraRpc.AddModifier)]
+    public static void RpcAddModifier(this PlayerControl target, uint modifierId)
+    {
+        var type = ModifierManager.GetModifierType(modifierId);
+        if (type == null)
+        {
+            Logger<MiraApiPlugin>.Error($"Cannot add modifier with id {modifierId} because it is not registered.");
+            return;
+        }
+
+        target.AddModifier(type);
+    }
+
+    /// <summary>
+    /// Remote Procedure Call to add a modifier to a player.
+    /// </summary>
+    /// <param name="player">The player to add the modifier to.</param>
+    /// <typeparam name="T">The modifier Type.</typeparam>
+    public static void RpcAddModifier<T>(this PlayerControl player) where T : BaseModifier
+    {
+        var id = ModifierManager.GetModifierId(typeof(T));
+        if (id == null)
+        {
+            Logger<MiraApiPlugin>.Error($"Cannot add modifier {typeof(T).Name} because it is not registered.");
+            return;
+        }
+
+        player.RpcAddModifier(id.Value);
+    }
+
+    /// <summary>
+    /// Remote Procedure Call to remove a modifier from a player.
+    /// </summary>
+    /// <param name="target">The player to remove the modifier from.</param>
+    /// <param name="modifierId">The ID of the modifier.</param>
+    [MethodRpc((uint)MiraRpc.RemoveModifier)]
+    public static void RpcRemoveModifier(this PlayerControl target, uint modifierId)
+    {
+        target.RemoveModifier(modifierId);
+    }
+
+    /// <summary>
+    /// Remote Procedure Call to remove a modifier from a player.
+    /// </summary>
+    /// <param name="player">The player to remove the modifier from.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    public static void RpcRemoveModifier<T>(this PlayerControl player) where T : BaseModifier
+    {
+        var id = ModifierManager.GetModifierId(typeof(T));
+        if (id == null)
+        {
+            Logger<MiraApiPlugin>.Error($"Cannot add modifier {typeof(T).Name} because it is not registered.");
+            return;
+        }
+
+        player.RpcRemoveModifier(id.Value);
+    }
+
+    /// <summary>
+    /// Gets the ModifierComponent for a player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <returns>A ModifierComponent if there is one, null otherwise.</returns>
+    public static ModifierComponent? GetModifierComponent(this PlayerControl player)
+    {
+        if (ModifierComponents.TryGetValue(player, out var component))
+        {
+            return component;
+        }
+
+        component = player.GetComponent<ModifierComponent>();
+        if (!component)
+        {
+            return null;
+        }
+
+        ModifierComponents[player] = component;
+        return component;
+    }
+
+    /// <summary>
+    /// Gets the ModifierComponent for a player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="component">The ModifierComponent if it is found.</param>
+    /// <returns>A ModifierComponent if there is one, null otherwise.</returns>
+    public static bool TryGetModifierComponent(this PlayerControl player, out ModifierComponent? component)
+    {
+        if (ModifierComponents.TryGetValue(player, out component))
+        {
+            return component;
+        }
+
+        component = player.GetComponent<ModifierComponent>();
+        return component;
+    }
+
+    /// <summary>
+    /// Gets a collection of modifiers by their type, or null if the player doesn't have one.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>The Modifier if it is found, null otherwise.</returns>
+    public static IEnumerable<T> GetModifiersByType<T>(this PlayerControl player) where T : BaseModifier
+    {
+        return player.GetModifierComponent()!.GetModifiersByType<T>();
+    }
+
+    /// <summary>
+    /// Gets a modifier by its type, or null if the player doesn't have it.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>The Modifier if it is found, null otherwise.</returns>
+    public static T? GetModifier<T>(this PlayerControl player) where T : BaseModifier
+    {
+        return player.GetModifierComponent()!.GetModifier<T>();
+    }
+
+    /// <summary>
+    /// Tries to get a modifier by its type.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="modifier">The modifier or null.</param>
+    /// <typeparam name="T">The Type of the Modifier.</typeparam>
+    /// <returns>True if the modifier was found, false otherwise.</returns>
+    public static bool TryGetModifier<T>(this PlayerControl player, out T? modifier) where T : BaseModifier
+    {
+        return player.GetModifierComponent()!.TryGetModifier(out modifier);
+    }
+
+    /// <summary>
+    /// Removes a modifier from the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="type">The modifier type.</param>
+    public static void RemoveModifier(this PlayerControl player, Type type)
+    {
+        player.GetModifierComponent()!.RemoveModifier(type);
+    }
+
+    /// <summary>
+    /// Removes a modifier from the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <typeparam name="T">The modifier type.</typeparam>
+    public static void RemoveModifier<T>(this PlayerControl player) where T : BaseModifier
+    {
+        player.GetModifierComponent()!.RemoveModifier<T>();
+    }
+
+    /// <summary>
+    /// Removes a modifier from the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="modifierId">The modifier ID.</param>
+    public static void RemoveModifier(this PlayerControl player, uint modifierId)
+    {
+        player.GetModifierComponent()!.RemoveModifier(modifierId);
+    }
+
+    /// <summary>
+    /// Removes a modifier from the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="modifier">The modifier object.</param>
+    public static void RemoveModifier(this PlayerControl player, BaseModifier modifier)
+    {
+        player.GetModifierComponent()!.RemoveModifier(modifier);
+    }
+
+    /// <summary>
+    /// Adds a modifier to the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="modifier">The modifier to add.</param>
+    /// <returns>The modifier that was added.</returns>
+    public static BaseModifier? AddModifier(this PlayerControl player, BaseModifier modifier)
+    {
+        return player.GetModifierComponent()!.AddModifier(modifier);
+    }
+
+    /// <summary>
+    /// Adds a modifier to the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="type">The modifier type.</param>
+    /// <returns>The modifier that was added.</returns>
+    public static BaseModifier? AddModifier(this PlayerControl player, Type type)
+    {
+        return player.GetModifierComponent()!.AddModifier(type);
+    }
+
+    /// <summary>
+    /// Adds a modifier to the player.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <typeparam name="T">The Type of the modifier.</typeparam>
+    /// <returns>The new modifier.</returns>
+    public static T? AddModifier<T>(this PlayerControl player) where T : BaseModifier
+    {
+        return player.GetModifierComponent()!.AddModifier<T>();
+    }
+
+    /// <summary>
+    /// Checks if a player has an active or queued modifier by its ID.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</param>
+    /// <param name="id">The Modifier ID.</param>
+    /// <param name="predicate">The predicate to check the modifier.</param>
+    /// <returns>True if the Modifier is present, false otherwise.</returns>
+    public static bool HasModifier(this PlayerControl player, uint id, Func<BaseModifier, bool>? predicate=null)
+    {
+        return player.GetModifierComponent()!.HasModifier(id, predicate);
+    }
+
+    /// <summary>
+    /// Checks if a player has an active or queued modifier by its type.
+    /// </summary>
+    /// <param name="player">The PlayerControl object.</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>
+    public static bool HasModifier<T>(this PlayerControl player, Func<T, bool>? predicate=null) where T : BaseModifier
+    {
+        return player.GetModifierComponent()!.HasModifier(predicate);
+    }
+}