Revert "Fix role assignment"

AmongUs.props

@@ -2,7 +2,7 @@
     <ItemGroup>
         <PackageReference Include="Reactor" Version="2.5.0-ci.371" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.8.18" PrivateAssets="all" />
+        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.3.31" PrivateAssets="all" />
 
         <PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
@@ -11,4 +11,4 @@
     <Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
         <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" UseSymboliclinksIfPossible="true" />
     </Target>
-</Project>
+</Project>

MiraAPI.Example/ExamplePlugin.cs

@@ -3,11 +3,9 @@ using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
 using Reactor;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
-using UnityEngine;
 
 namespace MiraAPI.Example;
 
@@ -20,7 +18,6 @@ public partial class ExamplePlugin : BasePlugin, IMiraPlugin
 {
     public Harmony Harmony { get; } = new(Id);
     public string OptionsTitleText => "Mira API\nExample Mod";
-    public string CustomOptionMenuNameTwo => "angxl's Options";
     public ConfigFile GetConfigFile() => Config;
     public override void Load()
     {

MiraAPI.Example/GameModes/ExampleMode.cs

@@ -1,13 +0,0 @@
-using MiraAPI.GameModes;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Example.GameModes;
-
-public class ExampleMode : AbstractGameMode
-{
-    public override string Name => "Example Mode";
-    public override string Description => "An example gamemode.";
-    public override LoadableAsset<Sprite>? Icon => ExampleAssets.ExampleButton;
-    public override Color Color => Color.red;
-}

MiraAPI/Events/Mira/MiraButtonClickEvent.cs

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

MiraAPI/Events/MiraCancelableEvent.cs

@@ -1,11 +1,8 @@
-using MiraAPI.PluginLoading;
-
-namespace MiraAPI.Events;
+namespace MiraAPI.Events;
 
 /// <summary>
 /// Abstract class for Mira Events that can be cancelled.
 /// </summary>
-[MiraIgnore]
 public abstract class MiraCancelableEvent : MiraEvent
 {
     /// <summary>

MiraAPI/Events/MiraEvent.cs

@@ -1,9 +1,6 @@
-using MiraAPI.PluginLoading;
-
-namespace MiraAPI.Events;
+namespace MiraAPI.Events;
 
 /// <summary>
 /// Abstract class for Mira Events.
 /// </summary>
-[MiraIgnore]
 public abstract class MiraEvent;

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -16,76 +16,20 @@ public class AfterMurderEvent : MiraEvent
     public PlayerControl Target { get; }
 
     /// <summary>
-    /// Gets the <see cref="PlayerControl"/> that was framed, if any.
-    /// </summary>
-    public PlayerControl? Framed { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the murder was done indirectly.
-    /// This is commonly used to prevent the <see cref="Source"/> <see cref="PlayerControl"/> from being killed.
-    /// </summary>
-    public bool IsIndirectAttack { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the murder was able to bypass protective roles or general defense, such as <see cref="GuardianAngelRole"/>.
-    /// </summary>
-    public bool IgnoreDefense { get; }
-
-    /// <summary>
-    /// Gets the <see cref="Target"/>'s <see cref="DeadBody"/>, if it exists.
+    /// Gets the <see cref="Target"/>'s <see cref="global::DeadBody"/>, if it exists.
     /// </summary>
     public DeadBody? DeadBody { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
     /// </summary>
-    /// <param name="source">The <see cref="PlayerControl"/> that killed the <paramref name="target"/>.</param>
-    /// <param name="target">The <see cref="PlayerControl"/> that was killed.</param>
-    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="DeadBody"/>, if it exists.</param>
-    /// <param name="isIndirect">Whether the murder was caused indirectly.</param>
-    /// <param name="ignoreDefense">Whether the murder ignored protection.</param>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody, bool isIndirect, bool ignoreDefense = false)
-    {
-        Source = source;
-        Target = target;
-        Framed = null;
-        DeadBody = deadBody;
-        IsIndirectAttack = isIndirect;
-        IgnoreDefense = ignoreDefense;
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
-    /// </summary>
-    /// <param name="source">The <see cref="PlayerControl"/> that killed the <paramref name="target"/>.</param>
-    /// <param name="target">The <see cref="PlayerControl"/> that was killed.</param>
-    /// <param name="framed">The <see cref="PlayerControl"/> that was framed.</param>
-    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="DeadBody"/>, if it exists.</param>
-    /// <param name="isIndirect">Whether the murder was caused indirectly.</param>
-    /// <param name="ignoreDefense">Whether the murder ignored protection.</param>
-    public AfterMurderEvent(PlayerControl source, PlayerControl target, PlayerControl framed, DeadBody? deadBody, bool isIndirect = true, bool ignoreDefense = false)
-    {
-        Source = source;
-        Target = target;
-        Framed = framed;
-        DeadBody = deadBody;
-        IsIndirectAttack = isIndirect;
-        IgnoreDefense = ignoreDefense;
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
-    /// </summary>
-    /// <param name="source">The <see cref="PlayerControl"/> that killed the <paramref name="target"/>.</param>
-    /// <param name="target">The <see cref="PlayerControl"/> that was killed.</param>
-    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="DeadBody"/>, if it exists.</param>
+    /// <param name="source">The killer.</param>
+    /// <param name="target">The killed <see cref="PlayerControl"/>.</param>
+    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="global::DeadBody"/>, if it exists.</param>
     public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody)
     {
         Source = source;
         Target = target;
-        Framed = null;
         DeadBody = deadBody;
-        IsIndirectAttack = false;
-        IgnoreDefense = false;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

@@ -17,64 +17,11 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     /// </summary>
     public PlayerControl Target { get; }
 
-    /// <summary>
-    /// Gets the <see cref="PlayerControl"/> that is being framed, if any.
-    /// </summary>
-    public PlayerControl? Framed { get; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the murder is done indirectly.
-    /// This is commonly used to prevent the <see cref="Source"/> <see cref="PlayerControl"/> from being killed.
-    /// </summary>
-    public bool IsIndirectAttack { get; set; }
-
-    /// <summary>
-    /// Gets or sets  a value indicating whether the murder should bypass protective roles or general defense, such as <see cref="GuardianAngelRole"/>.
-    /// </summary>
-    public bool IgnoreDefense { get; set; }
-
     /// <summary>
     /// Gets whether the murder was meant to be done in a meeting, via an enum.
     /// </summary>
     public MeetingCheck InMeeting { get; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
-    /// </summary>
-    /// <param name="source">The <see cref="PlayerControl"/> that is killing the <paramref name="target"/>.</param>
-    /// <param name="target">The <see cref="PlayerControl"/> that is being killed.</param>
-    /// <param name="isIndirect">Whether the murder is caused indirectly.</param>
-    /// <param name="ignoreDefense">Whether the murder should ignore protection.</param>
-    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
-    public BeforeMurderEvent(PlayerControl source, PlayerControl target, bool isIndirect, bool ignoreDefense = false, MeetingCheck inMeeting = MeetingCheck.Ignore)
-    {
-        Source = source;
-        Target = target;
-        Framed = null;
-        IsIndirectAttack = isIndirect;
-        IgnoreDefense = ignoreDefense;
-        InMeeting = inMeeting;
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
-    /// </summary>
-    /// <param name="source">The <see cref="PlayerControl"/> that is killing the <paramref name="target"/>.</param>
-    /// <param name="target">The <see cref="PlayerControl"/> that is being killed.</param>
-    /// <param name="framed">The <see cref="PlayerControl"/> that is being framed.</param>
-    /// <param name="isIndirect">Whether the murder is caused indirectly.</param>
-    /// <param name="ignoreDefense">Whether the murder should ignore protection.</param>
-    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
-    public BeforeMurderEvent(PlayerControl source, PlayerControl target, PlayerControl framed, bool isIndirect = true, bool ignoreDefense = false, MeetingCheck inMeeting = MeetingCheck.Ignore)
-    {
-        Source = source;
-        Target = target;
-        Framed = framed;
-        IsIndirectAttack = isIndirect;
-        IgnoreDefense = ignoreDefense;
-        InMeeting = inMeeting;
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
     /// </summary>
@@ -85,9 +32,6 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     {
         Source = source;
         Target = target;
-        Framed = null;
-        IsIndirectAttack = false;
-        IgnoreDefense = false;
         InMeeting = inMeeting;
     }
 
@@ -100,9 +44,6 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     {
         Source = source;
         Target = target;
-        Framed = null;
-        IsIndirectAttack = false;
-        IgnoreDefense = false;
         InMeeting = MeetingCheck.Ignore;
     }
 }

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

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

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

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

MiraAPI/GameModes/AbstractGameMode.cs

@@ -1,296 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using AmongUs.GameOptions;
-using MiraAPI.GameOptions;
-using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-
-namespace MiraAPI.GameModes;
-
-/// <summary>
-/// Base class for custom gamemodes.
-/// </summary>
-[MiraIgnore]
-public abstract class AbstractGameMode : IOptionable
-{
-    /// <summary>
-    /// Gets the game mode name.
-    /// </summary>
-    public abstract string Name { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the mode is visible in the menu. Only checked at startup.
-    /// </summary>
-    public virtual bool HideMode => false;
-
-    /// <summary>
-    /// Gets the game mode description.
-    /// </summary>
-    public abstract string Description { get; }
-
-    /// <summary>
-    /// Gets the game mode description.
-    /// </summary>
-    public virtual Color Color { get; } = Color.white;
-
-    /// <summary>
-    /// Gets the icon of the gamemode. Will be shown in options menu underneath the gamemode option.
-    /// </summary>
-    public virtual LoadableAsset<Sprite>? Icon => null;
-
-    /// <summary>
-    /// Gets the icon of the gamemode for use on the options pop-up.
-    /// </summary>
-    public TMP_SpriteAsset TmpIcon { get; set; } = null!;
-
-    /// <summary>
-    /// Gets the colored game mode name, using the color and name properties.
-    /// </summary>
-    public string ColoredName => $"<color=#{this.Color.ToHtmlStringRGBA()}>{this.Name}</color>";
-
-    /// <summary>
-    /// Gets the game mode id.
-    /// </summary>
-    public uint ID { get; internal set; }
-
-    /// <summary>
-    /// Gets a value indicating whether a specific body type is used by the game mode.
-    /// </summary>
-    public virtual bool GameModeBodyTypeOverride => false;
-
-    /// <summary>
-    /// Gets a value indicating whether the gamemode removes the normal game settings.
-    /// </summary>
-    public virtual bool ShowNormalGameSettings => true;
-
-    /// <summary>
-    /// Gets a value indicating whether the gamemode removes the normal role settings.
-    /// </summary>
-    public virtual bool ShowNormalRoleSettings => true;
-
-    /// <summary>
-    /// Gets a value indicating the default kill cooldown for impostors in this mode.
-    /// </summary>
-    public virtual float DefaultImpostorKillCooldown => GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown);
-
-    /// <summary>
-    /// Called on GameManager.GetBodyType().
-    /// </summary>
-    /// <param name="player">Player to get body type from.</param>
-    /// <returns>Resulting body type.</returns>
-    public virtual PlayerBodyTypes GetBodyType(PlayerControl player)
-    {
-        if (AprilFoolsMode.ShouldHorseAround())
-        {
-            return PlayerBodyTypes.Horse;
-        }
-        if (AprilFoolsMode.ShouldLongAround())
-        {
-            return PlayerBodyTypes.Long;
-        }
-        return PlayerBodyTypes.Normal;
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether a custom intro sequence is implemented by the game mode.
-    /// </summary>
-    public virtual bool ShowGameModeIntroCutscene => false;
-
-    /// <summary>
-    /// Called when Intro Cutscene is destroyed.
-    /// </summary>
-    public virtual void Initialize()
-    {
-    }
-
-    /// <summary>
-    /// Called on HudManager.Start().
-    /// </summary>
-    /// <param name="instance">Instance of HudManager.</param>
-    public virtual void HudStart(HudManager instance)
-    {
-    }
-
-    /// <summary>
-    /// Called every frame on HudManager.Update().
-    /// </summary>
-    /// <param name="instance">Instance of HudManager.</param>
-    public virtual void HudUpdate(HudManager instance)
-    {
-    }
-
-    /// <summary>
-    /// Called when a player is killed.
-    /// </summary>
-    /// <param name="player">PlayerControl that was killed.</param>
-    /// <param name="assignGhostRole">Determines whether to assign a ghost role on the player.</param>
-    public virtual void OnPlayerDeath(PlayerControl player, bool assignGhostRole)
-    {
-        GameManager.Instance.LogicRoleSelection.OnPlayerDeath(player, assignGhostRole);
-    }
-
-    /// <summary>
-    /// Calculate Game End logic.
-    /// </summary>
-    /// <param name="runOriginal">Should original game end logic be used.</param>
-    /// <param name="instance">Instance of LogicGameFlowNormal.</param>
-    public virtual void CheckGameEnd(out bool runOriginal, LogicGameFlowNormal instance)
-    {
-        runOriginal = true;
-    }
-
-    /// <summary>
-    /// Custom role assignment.
-    /// </summary>
-    /// <param name="runOriginal">Should original role assignment be used.</param>
-    /// <param name="instance">Instance of LogicRoleSelection.</param>
-    public virtual void AssignRoles(out bool runOriginal, LogicRoleSelectionNormal instance)
-    {
-        runOriginal = true;
-    }
-
-    /// <summary>
-    /// Custom role assignment to run after all roles are handed out.
-    /// </summary>
-    /// <param name="instance">Instance of LogicRoleSelection.</param>
-    public virtual void PostAssignRoles(LogicRoleSelectionNormal instance)
-    {
-    }
-
-    /// <summary>
-    /// Custom murder logic.
-    /// </summary>
-    /// <param name="runOriginal">Should the original murder logic be used.</param>
-    /// <param name="result">Result of custom murder logic.</param>
-    /// <param name="target">Target player for murder.</param>
-    public virtual void CanKill(out bool runOriginal, out bool result, PlayerControl target)
-    {
-        result = false;
-        runOriginal = true;
-    }
-
-    /// <summary>
-    /// Custom winner selection.
-    /// </summary>
-    /// <returns>List of winners or null.</returns>
-    public virtual List<NetworkedPlayerInfo>? CalculateWinners() => null;
-
-    /// <summary>
-    /// The IEnumerator that plays the intro cutscene for this gamemode.
-    /// </summary>
-    /// <param name="__instance">An instance of IntroCutscene.</param>
-    /// <returns>An IEnumerator to run the intro cutscene instead of the base game one.</returns>
-    public virtual IEnumerator IntroCutscene(IntroCutscene __instance)
-    {
-        yield return new WaitForEndOfFrame();
-    }
-
-    /// <summary>
-    /// Can Admin be used in this gamemode.
-    /// </summary>
-    /// <param name="console">Admin Console.</param>
-    /// <returns>True if Admin console is enabled.</returns>
-    public virtual bool CanUseMapConsole(MapConsole console) => true;
-
-    /// <summary>
-    /// Can a body be reported in this gamemode.
-    /// </summary>
-    /// <param name="body">Target body for reporting.</param>
-    /// <returns>True if dead bodies can be reported.</returns>
-    public virtual bool CanReport(DeadBody body) => true;
-
-    /// <summary>
-    /// Can system consoles be used in this gamemode.
-    /// </summary>
-    /// <param name="console">System Console.</param>
-    /// <returns>True if system consoles are enabled in this mode.</returns>
-    public virtual bool CanUseSystemConsole(SystemConsole console) => true;
-
-    /// <summary>
-    /// Can tasks be interacted with in this gamemode.
-    /// </summary>
-    /// <param name="console">Task console.</param>
-    /// <returns>True if tasks are enabled in this mode.</returns>
-    public virtual bool CanUseTasks(Console console) => true;
-
-    /// <summary>
-    /// Should the sabotage map be used when attempting to open sabotage overlay.
-    /// </summary>
-    /// <param name="map">MapBehaviour object.</param>
-    /// <returns>True if the sabotage map should be shown.</returns>
-    public virtual bool ShouldShowSabotageMap(MapBehaviour map) => true;
-
-    /// <summary>
-    /// Gets the <see cref="MapOptions"/> to display on the map.
-    /// </summary>
-    /// <returns>The <see cref="MapOptions"/> for the gamemode.</returns>
-    public virtual MapOptions GetMapOptions()
-    {
-        return new MapOptions
-        {
-            Mode = PlayerControl.LocalPlayer.Data.Role.IsImpostor && !MeetingHud.Instance
-                ? MapOptions.Modes.Sabotage
-                : MapOptions.Modes.Normal,
-        };
-    }
-
-    /// <summary>
-    /// Can a player vent in this gamemode.
-    /// </summary>
-    /// <param name="vent">Target vent.</param>
-    /// <param name="playerInfo">Player attempting to vent.</param>
-    /// <returns>True if venting is enabled in this mode.</returns>
-    public virtual bool CanVent(Vent vent, NetworkedPlayerInfo playerInfo) => true;
-
-    /// <summary>
-    /// Does the task bar appear in the gamemode.
-    /// </summary>
-    /// <returns>True if the task bar is enabled in this mode.</returns>
-    public virtual bool ShowTaskBar => true;
-
-    public virtual void UpdateTaskPanel(TaskPanelBehaviour instance)
-    {
-        instance.background.transform.localScale = (instance.taskText.textBounds.size.x > 0f)
-            ? new Vector3(instance.taskText.textBounds.size.x + 0.2f, instance.taskText.textBounds.size.y + 0.2f, 1f)
-            : Vector3.zero;
-        Vector3 vector = instance.background.sprite.bounds.extents;
-        vector.y = -vector.y;
-        vector = vector.Mul(instance.background.transform.localScale);
-        instance.background.transform.localPosition = vector;
-        Vector3 vector2 = instance.tab.sprite.bounds.extents;
-        vector2 = vector2.Mul(instance.tab.transform.localScale);
-        vector2.y = -vector2.y;
-        vector2.x += vector.x * 2f;
-        instance.tab.transform.localPosition = vector2;
-        if (GameManager.Instance == null)
-        {
-            return;
-        }
-
-        var yPos = 0.6f;
-        var xPos = -instance.background.sprite.bounds.size.x * instance.background.transform.localScale.x;
-        instance.closedPosition = new Vector3(xPos, yPos, instance.closedPosition.z);
-        instance.openPosition = new Vector3(instance.openPosition.x, yPos, instance.openPosition.z);
-        if (instance.open)
-        {
-            instance.timer = Mathf.Min(1f, instance.timer + Time.deltaTime / instance.animationTimeSeconds);
-        }
-        else
-        {
-            instance.timer = Mathf.Max(0f, instance.timer - Time.deltaTime / instance.animationTimeSeconds);
-        }
-
-        Vector3 relativePos = new(
-            Mathf.SmoothStep(instance.closedPosition.x, instance.openPosition.x, instance.timer),
-            yPos,
-            instance.openPosition.z);
-        instance.transform.localPosition =
-            AspectPosition.ComputePosition(AspectPosition.EdgeAlignments.LeftTop, relativePos);
-    }
-
-    /// <inheritdoc/>
-    public override string ToString() => Name;
-}

MiraAPI/GameModes/ClassicMode.cs

@@ -1,20 +0,0 @@
-using MiraAPI.PluginLoading;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.GameModes;
-
-/// <summary>
-/// The classic game mode.
-/// </summary>
-[MiraIgnore]
-public class ClassicMode : AbstractGameMode
-{
-    /// <inheritdoc/>
-    public override string Name => "Classic";
-
-    /// <inheritdoc/>
-    public override string Description => "The classic Among Us experience!\nFind the Impostors or deceive the Crew.";
-
-    public override LoadableAsset<Sprite>? Icon => MiraAssets.ClassicGamemodeIcon;
-}

MiraAPI/GameModes/CustomGameMode.cs

@@ -0,0 +1,154 @@
+using System.Collections.Generic;
+
+namespace MiraAPI.GameModes;
+
+/// <summary>
+/// Base class for custom gamemodes.
+/// </summary>
+public abstract class CustomGameMode
+{
+    /// <summary>
+    /// Gets the game mode name.
+    /// </summary>
+    public abstract string Name { get; }
+
+    /// <summary>
+    /// Gets the game mode description.
+    /// </summary>
+    public abstract string Description { get; }
+
+    /// <summary>
+    /// Gets the game mode ID.
+    /// </summary>
+    public abstract int Id { get; }
+
+    /// <summary>
+    /// Called when <see cref="IntroCutscene"/> is destroyed.
+    /// </summary>
+    public virtual void Initialize()
+    {
+    }
+
+    /// <summary>
+    /// Called on <see cref="HudManager.Start"/>.
+    /// </summary>
+    /// <param name="instance">Instance of <see cref="HudManager"/>.</param>
+    public virtual void HudStart(HudManager instance)
+    {
+    }
+
+    /// <summary>
+    /// Called every frame on <see cref="HudManager.Update"/>.
+    /// </summary>
+    /// <param name="instance">Instance of <see cref="HudManager"/>.</param>
+    public virtual void HudUpdate(HudManager instance)
+    {
+    }
+
+    /// <summary>
+    /// Called when a player is killed.
+    /// </summary>
+    /// <param name="player"><see cref="PlayerControl"/> that was killed.</param>
+    public virtual void OnDeath(PlayerControl player)
+    {
+    }
+
+    /// <summary>
+    /// Calculate Game End logic.
+    /// </summary>
+    /// <param name="runOriginal">Should original game end logic be used.</param>
+    /// <param name="instance">Instance of <see cref="LogicGameFlowNormal"/>.</param>
+    public virtual void CheckGameEnd(out bool runOriginal, LogicGameFlowNormal instance)
+    {
+        runOriginal = true;
+    }
+
+    /// <summary>
+    /// Custom role assignment.
+    /// </summary>
+    /// <param name="runOriginal">Should original role assignment be used.</param>
+    /// <param name="instance">Instance of <see cref="LogicRoleSelection"/>.</param>
+    public virtual void AssignRoles(out bool runOriginal, LogicRoleSelectionNormal instance)
+    {
+        runOriginal = true;
+    }
+
+    /// <summary>
+    /// Custom murder logic.
+    /// </summary>
+    /// <param name="runOriginal">Should the original murder logic be used.</param>
+    /// <param name="result">Result of custom murder logic.</param>
+    /// <param name="target">Target <see cref="PlayerControl"/> for murder.</param>
+    public virtual void CanKill(out bool runOriginal, out bool result, PlayerControl target)
+    {
+        result = false;
+        runOriginal = true;
+    }
+
+    /// <summary>
+    /// Should Roles Settings be available when this gamemode is selected.
+    /// </summary>
+    /// <returns><see langword="true"/> if Role Settings are enabled in this game mode.</returns>
+    public virtual bool AreRoleSettingsEnabled() => true;
+
+    /// <summary>
+    /// Should Game Settings be available when this gamemode is selected.
+    /// </summary>
+    /// <returns><see langword="true"/> if Game Settings are enabled in this mode.</returns>
+    public virtual bool AreGameSettingsEnabled() => true;
+
+    /// <summary>
+    /// Custom winner selection.
+    /// </summary>
+    /// <returns>List of winners or <see langword="null"/>.</returns>
+    public virtual List<NetworkedPlayerInfo>? CalculateWinners() => null;
+
+    /// <summary>
+    /// Show gamemode in <see cref="IntroCutscene"/>.
+    /// </summary>
+    /// <returns><see langword="true"/> if the game mode should be shown in the intro cutscene.</returns>
+    public virtual bool ShowGameModeIntroCutscene() => false;
+
+    /// <summary>
+    /// Can Admin be used in this gamemode.
+    /// </summary>
+    /// <param name="console">Admin Console.</param>
+    /// <returns><see langword="true"/> if Admin console is enabled.</returns>
+    public virtual bool CanUseMapConsole(MapConsole console) => true;
+
+    /// <summary>
+    /// Can a <see cref="DeadBody"/> be reported in this gamemode.
+    /// </summary>
+    /// <param name="body">Target <see cref="DeadBody"/> for reporting.</param>
+    /// <returns><see langword="true"/> if <see cref="DeadBody"/>s can be reported.</returns>
+    public virtual bool CanReport(DeadBody body) => true;
+
+    /// <summary>
+    /// Can <see cref="SystemConsole"/>s be used in this gamemode.
+    /// </summary>
+    /// <param name="console">System Console.</param>
+    /// <returns><see langword="true"/> if <see cref="SystemConsole"/>s are enabled in this mode.</returns>
+    public virtual bool CanUseSystemConsole(SystemConsole console) => true;
+
+    /// <summary>
+    /// Can tasks be interacted with in this gamemode.
+    /// </summary>
+    /// <param name="console">Task console.</param>
+    /// <returns><see langword="true"/> if tasks are enabled in this mode.</returns>
+    public virtual bool CanUseTasks(Console console) => true;
+
+    /// <summary>
+    /// Should the sabotage map be used when attempting to open sabotage overlay.
+    /// </summary>
+    /// <param name="map"><see cref="MapBehaviour"/> object.</param>
+    /// <returns><see langword="true"/> if the sabotage map should be shown.</returns>
+    public virtual bool ShouldShowSabotageMap(MapBehaviour map) => true;
+
+    /// <summary>
+    /// Can a player vent in this gamemode.
+    /// </summary>
+    /// <param name="vent">Target vent.</param>
+    /// <param name="playerInfo">Player attempting to vent.</param>
+    /// <returns><see langword="true"/> if venting is enabled in this mode.</returns>
+    public virtual bool CanVent(Vent vent, NetworkedPlayerInfo playerInfo) => true;
+}

MiraAPI/GameModes/CustomGameModeManager.cs

@@ -1,123 +1,70 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MiraAPI.PluginLoading;
-using Reactor.Utilities;
 
 namespace MiraAPI.GameModes;
 
 /// <summary>
-/// Manages custom gamemodes.
+/// Manages <see cref="CustomGameMode"/>s.
 /// </summary>
 public static class CustomGameModeManager
 {
-    internal static readonly Dictionary<uint, AbstractGameMode> IdToModeMap = [];
-
-    private static uint GetNextId() => ++LastId;
-
-    private static uint LastId { get; set; }
-
     /// <summary>
-    /// Register gamemode from type.
+    /// List of registered <see cref="CustomGameMode"/>.
     /// </summary>
-    /// <param name="gameModeType">Type of gamemode class, should inherit from <see cref="AbstractGameMode"/>.</param>
-    /// <param name="pluginInfo">The custom plugin info of the mod.</param>
-    /// <returns>Whether the gamemode was successfully registered.</returns>
-    internal static bool RegisterGameMode(Type gameModeType, MiraPluginInfo pluginInfo)
+    internal static readonly Dictionary<int, CustomGameMode> GameModes = [];
+
+    public static bool IsDefault()
     {
-        if (!typeof(AbstractGameMode).IsAssignableFrom(gameModeType))
-        {
-            Warning($"{gameModeType.Name} does not inherit CustomGameMode!");
-            return false;
-        }
-
-        var instance = Activator.CreateInstance(gameModeType);
-
-        if (instance is not AbstractGameMode mode)
-        {
-            Error($"Failed to create instance of {gameModeType.Name}");
-            return false;
-        }
-
-        if (!mode.HideMode)
-        {
-            IdToModeMap.Add(GetNextId(), mode);
-            pluginInfo.GameModes.Add(LastId, mode);
-            mode.ID = LastId;
-            GameModeOption.AddOption(mode);
-        }
-        return true;
+        return ActiveMode?.Id == 0;
     }
 
     /// <summary>
-    /// Checks to see if the current game mode is an instance of the classic mode.
+    /// Gets the current <see cref="CustomGameMode"/>.
     /// </summary>
-    /// <returns>True if the classic mode is the current one.</returns>
-    public static bool IsClassic() => ActiveMode != null && ActiveMode.GetType().IsAssignableTo(typeof(ClassicMode));
+    public static CustomGameMode? ActiveMode { get; internal set; } = new DefaultMode();
 
     /// <summary>
-    /// Checks to see if the current game mode is an instance of the HNS mode.
+    /// Set current <see cref="CustomGameMode"/>.
     /// </summary>
-    /// <returns>True if the Hide & Seek mode is the current one.</returns>
-    public static bool IsHideNSeek() => ActiveMode != null && ActiveMode.GetType().IsAssignableTo(typeof(HideAndSeekMode));
-
-    /// <summary>
-    /// Checks if a provided GameMode is the current active one.
-    /// </summary>
-    /// <typeparam name="T">The AbstractGameMode subclass being checked.</typeparam>
-    /// <returns>Whether the provided mode is the current active one.</returns>
-    public static bool IsActiveGameMode<T>() where T : AbstractGameMode => ActiveMode is T;
-
-    /// <summary>
-    /// Gets the current gamemode.
-    /// </summary>
-    public static AbstractGameMode? ActiveMode { get; private set; }
-
-    /// <summary>
-    /// Gets a gamemode from an ID.
-    /// </summary>
-    /// <param name="id">The ID of the gamemode to fetch.</param>
-    /// <returns>The gamemode matching that ID.</returns>
-    public static AbstractGameMode GetMode(uint id) => IdToModeMap[id];
-
-    /// <summary>
-    /// Finds the parent mod of a custom gamemode.
-    /// </summary>
-    /// <param name="gameMode">The <see cref="AbstractGameMode"/> object.</param>
-    /// <returns>A <see cref="MiraPluginInfo"/> object representing the parent mod of the gamemode.</returns>
-    public static MiraPluginInfo? FindParentMod(AbstractGameMode gameMode)
+    /// <param name="id"><see cref="CustomGameMode"/> ID.</param>
+    public static void SetGameMode(int id)
     {
-        return MiraPluginManager.Instance.RegisteredPlugins.FirstOrDefault(plugin => plugin.GameModes.ContainsValue(gameMode));
-    }
-
-    internal static void RegisterDefaultMode()
-    {
-        var defaultMode = new ClassicMode();
-        IdToModeMap.Add(0, defaultMode);
-        // no need to add to game mode option as it already contains it
-        // because we cannot have the option be created with no values
-        defaultMode.ID = 0;
-        var hnsMode = new HideAndSeekMode();
-        if (!hnsMode.HideMode)
+        if (GameModes.TryGetValue(id, out var gameMode))
         {
-            IdToModeMap.Add(1, hnsMode);
-            hnsMode.ID = 1;
-            GameModeOption.AddOption(hnsMode);
-            LastId++;
-        }
-    }
-
-    internal static void GetAndSetGameMode()
-    {
-        var id = (uint)GameModeOption.Value;
-
-        if (IdToModeMap.TryGetValue(id, out var mode))
-        {
-            ActiveMode = mode;
+            ActiveMode = gameMode;
             return;
         }
 
-        ActiveMode = IdToModeMap[0];
-        Logger<MiraApiPlugin>.Warning($"Unable to find game mode of id {id}!");
+        Error($"No gamemode with id {id} found!");
+    }
+
+    /// <summary>
+    /// Register <see cref="CustomGameMode"/> from type.
+    /// </summary>
+    /// <param name="gameModeType">Type of <see cref="CustomGameMode"/>, should inherit from <see cref="CustomGameMode"/>.</param>
+    internal static void RegisterGameMode(Type gameModeType)
+    {
+        if (!typeof(CustomGameMode).IsAssignableFrom(gameModeType))
+        {
+            Warning($"{gameModeType.Name} does not inherit CustomGameMode!");
+            return;
+        }
+
+        var modeObj = Activator.CreateInstance(gameModeType);
+
+        if (modeObj is not CustomGameMode gameMode)
+        {
+            Error($"Failed to create instance of {gameModeType.Name}");
+            return;
+        }
+
+        if (GameModes.Any(x => x.Key == gameMode.Id))
+        {
+            Error($"ID for gamemode {gameMode.Name} already exists!");
+            return;
+        }
+
+        GameModes.Add(gameMode.Id, gameMode);
     }
 }

MiraAPI/GameModes/DefaultMode.cs

@@ -0,0 +1,8 @@
+namespace MiraAPI.GameModes;
+
+public class DefaultMode : CustomGameMode
+{
+    public override string Name => "Default";
+    public override string Description => "Default Among Us GameMode";
+    public override int Id => 0;
+}

MiraAPI/GameModes/GameModeOption.cs

@@ -1,160 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using MiraAPI.GameOptions;
-using MiraAPI.Networking;
-using MiraAPI.Patches.GameModes;
-using MiraAPI.Patches.Options;
-using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
-using Reactor.Localization.Utilities;
-using Reactor.Networking.Attributes;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.ProBuilder;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.GameModes;
-
-/// <summary>
-/// The game mode option.
-/// </summary>
-[HarmonyPatch]
-public static class GameModeOption
-{
-    /// <summary>
-    /// Gets the current index of the Game Mode Option
-    /// For the value as an <see cref="AbstractGameMode"/>, see <see cref="CustomGameModeManager.ActiveMode"/>.
-    /// </summary>
-    public static int Value
-    {
-        get =>
-            OptionBehaviour != null
-                ? OptionBehaviour.GetInt()
-                : _lastValue;
-        private set
-        {
-            _lastValue = value;
-            if (OptionBehaviour == null)
-                return;
-            OptionBehaviour.Value = value;
-            OptionBehaviour.UpdateValue();
-            _lastValue = value;
-        }
-    }
-    internal static StringOption OptionBehaviour { get; set; } = null!;
-
-    internal static int _lastValue;
-    internal static readonly StringNames GamemodeName = CustomStringName.CreateAndRegister("Gamemode");
-    internal static readonly StringNames CustomName = CustomStringName.CreateAndRegister("Custom");
-    internal static readonly Dictionary<uint, StringNames> Values = new()
-    {
-        [0] = CustomStringName.CreateAndRegister("Classic"),
-    };
-
-    internal static void AddOption(AbstractGameMode mode)
-    {
-        if (!Values.ContainsKey(mode.ID))
-            Values.Add(mode.ID, CustomStringName.CreateAndRegister(mode.ColoredName));
-    }
-    /*[HarmonyPatch(typeof(GameOptionsMenu), nameof(GameOptionsMenu.CreateSettings))]
-    [HarmonyPostfix]
-    private static void CreateSettingsPatch(GameOptionsMenu __instance)
-    {
-        if (MenuState.Instance.CurrentModIdx != 0 || GameManager.Instance.IsHideAndSeek() || CustomGameModeManager.ActiveMode == null)
-        {
-            return;
-        }
-
-        var num = 0.713f;
-
-        foreach (var category in __instance.settingsContainer.GetComponentsInChildren<CategoryHeaderMasked>())
-        {
-            if (category)
-                category.gameObject.transform.localPosition -= new Vector3(0, 1.3f, 0);
-        }
-        CategoryHeaderMasked categoryHeaderMasked = Object.Instantiate(__instance.categoryHeaderOrigin, Vector3.zero, Quaternion.identity, __instance.settingsContainer);
-        categoryHeaderMasked.SetHeader(CustomName, 20);
-        categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f;
-        categoryHeaderMasked.transform.localPosition = new Vector3(-0.903f, num, -2f);
-        OptionBehaviour = Object.Instantiate(
-            __instance.stringOptionOrigin,
-            Vector3.zero,
-            Quaternion.identity,
-            __instance.settingsContainer);
-        num -= 0.63f;
-        OptionBehaviour.transform.localPosition = new Vector3(0.952f, num, -2f);
-        OptionBehaviour.SetClickMask(__instance.ButtonClickMask);
-        StringGameSetting setting = ScriptableObject.CreateInstance<StringGameSetting>();
-        setting.Type = OptionTypes.MultipleChoice;
-        setting.Title = GamemodeName;
-        setting.Index = _lastValue;
-        setting.Values = new Il2CppStructArray<StringNames>([Values[0]]);
-        OptionBehaviour.SetUpFromData(setting, 20);
-        Set(_lastValue);
-        OptionBehaviour.TitleText.fontSize = 3;
-        foreach (var optionBehaviour in __instance.Children.ToArray().Skip(1))
-        {
-            optionBehaviour.gameObject.transform.localPosition -= new Vector3(0, 1.3f, 0);
-        }
-        __instance.Children.Add(OptionBehaviour);
-        for (var i = 1; i < Values.Count; i++)
-            OptionBehaviour.Values = (Il2CppStructArray<StringNames>)OptionBehaviour.Values.Add(Values.ElementAt(i).Value);
-        __instance.scrollBar.SetYBoundsMax(__instance.scrollBar.GetYBounds().max + 1);
-    }*/
-
-    internal static void Set(int val)
-    {
-        Value = val;
-        var previousMode = CustomGameModeManager.ActiveMode;
-        CustomGameModeManager.GetAndSetGameMode();
-        HudPatches.SetGameModeText(CustomGameModeManager.GetMode(Values.ElementAt(_lastValue).Key).ColoredName);
-        var gm = CustomGameModeManager.ActiveMode!;
-        if (gm != previousMode)
-        {
-            ModdedOptionsManager.AddSettingsChangeMessage(
-                HudManager.Instance.Notifier,
-                GamemodeName,
-                gm.ColoredName,
-                new Color(0.7333f, 0.7333f, 0.7333f, 1),
-                gm.TmpIcon,
-                true);
-            if (MenuState.Instance)
-            {
-                // should force reset roles for gamemodes properly
-                foreach (var roleMenu in MenuState.Instance.QueuedRoleMenuRefresh)
-                {
-                    MenuState.Instance.QueuedRoleMenuRefresh[roleMenu.Key] = true;
-                }
-            }
-        }
-        // could make Values a dict of AbstractGameMode too
-    }
-
-    [HarmonyPatch(typeof(GameOptionsMenu), nameof(GameOptionsMenu.ValueChanged))]
-    [HarmonyPrefix]
-    private static bool ValueChanged(GameOptionsMenu __instance, OptionBehaviour option)
-    {
-        if (OptionBehaviour.Equals(option))
-        {
-            Info($"Game mode changed to {option.GetInt()}");
-            RpcSyncGamemode(PlayerControl.LocalPlayer, option.GetInt());
-            if (GameSettingMenu.Instance && CustomGameModeManager.ActiveMode != null)
-            {
-                GameOptionsMenuPatch.ToggleGamemodeOptions(CustomGameModeManager.ActiveMode, __instance);
-                GameSettingMenu.Instance.RoleSettingsButton.gameObject.SetActive(CustomGameModeManager.ActiveMode.ShowNormalRoleSettings);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    [MethodRpc((uint) MiraRpc.SyncGamemodeOption)]
-    internal static void RpcSyncGamemode(PlayerControl host, int data)
-    {
-        Set(data);
-    }
-}

MiraAPI/GameModes/HideAndSeekMode.cs

@@ -1,534 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using AmongUs.Data;
-using AmongUs.GameOptions;
-using HarmonyLib;
-using InnerNet;
-using MiraAPI.GameOptions;
-using MiraAPI.HnsReimplemented;
-using MiraAPI.HnsReimplemented.Options;
-using MiraAPI.PluginLoading;
-using MiraAPI.Roles;
-using MiraAPI.Utilities;
-using MiraAPI.Utilities.Assets;
-using PowerTools;
-using UnityEngine;
-
-namespace MiraAPI.GameModes;
-
-/// <summary>
-/// The vanilla Hide and Seek game mode, ported to Mira.
-/// </summary>
-[MiraIgnore]
-public class HideAndSeekMode : AbstractGameMode
-{
-    /// <inheritdoc/>
-    public override string Name => "Hide n Seek";
-
-    /// <inheritdoc/>
-    public override string Description => "You can run, but you can't hide!\nOutlive the timer or eliminate the crew.";
-
-    // TODO: Once the Hide n Seek port is ready for release, we will remove this.
-    public override bool HideMode => !MiraApiPlugin.IsDevBuild;
-
-    public override Color Color { get; } = new Color32(255, 88, 90, 255);
-    public override LoadableAsset<Sprite>? Icon => MiraAssets.HnSGamemodeIcon;
-    public override bool CanReport(DeadBody body) => false;
-    public override bool ShouldShowSabotageMap(MapBehaviour map) => false;
-    public override bool ShowGameModeIntroCutscene => true;
-    public override bool GameModeBodyTypeOverride => true;
-    public override bool ShowNormalGameSettings => false;
-    public override bool ShowNormalRoleSettings => false;
-    public override float DefaultImpostorKillCooldown => 1f;
-
-    public override bool ShowTaskBar => false;
-    public static int ImpostorPlayerID()
-    {
-        return OptionGroupSingleton<HnsImpostorOptions>.Instance.SelectedSeeker.Value;
-    }
-
-    public static bool HasImpostorPlayerID()
-    {
-        return ImpostorPlayerID() > -1;
-    }
-
-    public static bool ValidateImpostorPlayerID(List<NetworkedPlayerInfo> players)
-    {
-        return HasImpostorPlayerID() && players.Find((NetworkedPlayerInfo p) => (int)p.PlayerId == ImpostorPlayerID()) != null;
-    }
-
-    public override void AssignRoles(out bool runOriginal, LogicRoleSelectionNormal instance)
-    {
-        runOriginal = false;
-        Il2CppSystem.Collections.Generic.List<ClientData> list = new();
-        AmongUsClient.Instance.GetAllClients(list);
-        List<NetworkedPlayerInfo> list2 = list.ToArray()
-            .Where(c => c.Character != null && c.Character.Data != null && !c.Character.Data.Disconnected &&
-                        !c.Character.Data.IsDead).OrderBy(c => c.Id).Select(c => c.Character.Data)
-            .ToList();
-
-        foreach (NetworkedPlayerInfo networkedPlayerInfo in GameData.Instance.AllPlayers)
-        {
-            if (networkedPlayerInfo.Object != null && networkedPlayerInfo.Object.isDummy)
-            {
-                list2.Add(networkedPlayerInfo);
-            }
-        }
-        IGameOptions currentGameOptions = GameOptionsManager.Instance.CurrentGameOptions;
-        int adjustedNumImpostors = GameOptionsManager.Instance.CurrentGameOptions.GetAdjustedNumImpostors(list2.Count);
-        AssignRolesForTeam(list2, currentGameOptions, RoleTeamTypes.Impostor, Math.Max(adjustedNumImpostors, 1), RoleTypes.Impostor);
-        AssignRolesForTeam(list2, currentGameOptions, RoleTeamTypes.Crewmate, int.MaxValue, RoleTypes.Engineer);
-    }
-
-    public static void AssignRolesForTeam(
-        List<NetworkedPlayerInfo> players,
-        IGameOptions opts,
-        RoleTeamTypes team,
-        int teamMax,
-        RoleTypes defaultRole)
-    {
-        Error($"Hide And Seek Mode - AssignRolesForTeam: Team: {team}, Max: {teamMax}, Players: {players.Count}, DefaultRole: {defaultRole}");
-        int num = 0;
-        IRoleOptionsCollection roleOptions = opts.RoleOptions;
-        var source = RoleManager.Instance.AllRoles.ToArray()
-            .Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
-                           CustomRoleUtils.CanSpawnOnCurrentMode(role));
-        var assignmentData = source.Where(x => !x.IsDead).Select(role =>
-            new RoleManager.RoleAssignmentData(
-                role,
-                roleOptions.GetNumPerGame(role.Role),
-                roleOptions.GetChancePerGame(role.Role))).ToList();
-        var source2 = CustomRoleUtils.GetPossibleRoles(assignmentData, x => x.Chance == 100);
-        var guaranteedRoles = source.Where(x => source2.Contains(((ushort)x.Role, 100)));
-        List<RoleTypes> list = new List<RoleTypes>();
-        if (team == RoleTeamTypes.Crewmate)
-        {
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
-                         new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
-            {
-                while (true)
-                {
-                    RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
-                    int count = roleAssignmentData2.Count;
-                    roleAssignmentData2.Count = count - 1;
-                    if (count <= 0)
-                    {
-                        break;
-                    }
-
-                    list.Add(roleAssignmentData.Role.Role);
-                }
-            }
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Guaranteed Assignment");
-            AssignRolesFromList(players, teamMax, list, ref num);
-
-            var list2 = source.Where(x => !x.IsDead).Select(role =>
-                new RoleManager.RoleAssignmentData(
-                    role,
-                    roleOptions.GetNumPerGame(role.Role),
-                    roleOptions.GetChancePerGame(role.Role))).ToList();
-
-            list.Clear();
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
-            {
-                for (int i = 0; i < roleAssignmentData3.Count; i++)
-                {
-                    if (HashRandom.Next(101) < roleAssignmentData3.Chance)
-                    {
-                        list.Add(roleAssignmentData3.Role.Role);
-                    }
-                }
-            }
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Potential Assignment");
-
-            AssignRolesFromList(players, teamMax, list, ref num);
-            var basicRole = RoleTypes.Engineer;
-            while (list.Count < players.Count && list.Count + num < teamMax)
-            {
-                list.Add(basicRole);
-            }
-
-            AssignRolesFromList(players, teamMax, list, ref num);
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Fallback Assignment");
-        }
-        else if (team == RoleTeamTypes.Impostor)
-        {
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
-            var newImpostors = new List<NetworkedPlayerInfo>();
-            // Specified Seeker
-            if (HasImpostorPlayerID() &&
-               ValidateImpostorPlayerID(players) &&
-                !AmongUsClient.Instance.IsGamePublic)
-            {
-                NetworkedPlayerInfo networkedPlayerInfo = players.ToArray()
-                    .First(p => p.PlayerId == ImpostorPlayerID());
-                players.Remove(networkedPlayerInfo);
-                newImpostors.Add(networkedPlayerInfo);
-                Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Seeker is {networkedPlayerInfo.PlayerName}, ID: {networkedPlayerInfo.PlayerId}");
-            }
-            // Random Seeker
-            else
-            {
-                int num2 = 0;
-                while (num2 < teamMax && players.Count > 0)
-                {
-                    PseudoRandomList<NetworkedPlayerInfo> pseudoRandomList = new PseudoRandomList<NetworkedPlayerInfo>(AmongUsClient.Instance.GameId);
-                    players.Do(x => pseudoRandomList.Add(x));
-                    for (int i = 0; i < GameData.RoundsPlayedInSession; i++)
-                    {
-                        pseudoRandomList.PickRandom();
-                    }
-                    NetworkedPlayerInfo networkedPlayerInfo = pseudoRandomList.PickRandom();
-                    players.Remove(networkedPlayerInfo);
-                    newImpostors.Add(networkedPlayerInfo);
-                    num2++;
-                    Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Seeker is {networkedPlayerInfo.PlayerName}, ID: {networkedPlayerInfo.PlayerId}");
-                }
-            }
-            Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Guaranteed Assignment");
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
-                         new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
-            {
-                while (true)
-                {
-                    RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
-                    int count = roleAssignmentData2.Count;
-                    roleAssignmentData2.Count = count - 1;
-                    if (count <= 0)
-                    {
-                        break;
-                    }
-
-                    list.Add(roleAssignmentData.Role.Role);
-                }
-            }
-            AssignRolesFromList(newImpostors, teamMax, list, ref num);
-
-            var list2 = source.Where(x => !x.IsDead).Select(role =>
-                new RoleManager.RoleAssignmentData(
-                    role,
-                    roleOptions.GetNumPerGame(role.Role),
-                    roleOptions.GetChancePerGame(role.Role))).ToList();
-
-            list.Clear();
-            foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
-            {
-                for (int i = 0; i < roleAssignmentData3.Count; i++)
-                {
-                    if (HashRandom.Next(101) < roleAssignmentData3.Chance)
-                    {
-                        list.Add(roleAssignmentData3.Role.Role);
-                    }
-                }
-            }
-
-            AssignRolesFromList(newImpostors, teamMax, list, ref num);
-            var basicRole = RoleTypes.Impostor;
-            while (list.Count < newImpostors.Count && list.Count + num < teamMax)
-            {
-                list.Add(basicRole);
-            }
-
-            AssignRolesFromList(newImpostors, teamMax, list, ref num);
-        }
-    }
-
-    public static void AssignRolesFromList(List<NetworkedPlayerInfo> players, int teamMax, List<RoleTypes> roleList, ref int rolesAssigned)
-    {
-        while (roleList.Count > 0 && players.Count > 0 && rolesAssigned < teamMax)
-        {
-            int index = HashRandom.FastNext(roleList.Count);
-            RoleTypes roleType = roleList[index];
-            roleList.RemoveAt(index);
-            int index2 = HashRandom.FastNext(players.Count);
-            players[index2].Object.RpcSetRole(roleType, false);
-            players.RemoveAt(index2);
-            rolesAssigned++;
-        }
-    }
-
-    public override IEnumerator IntroCutscene(IntroCutscene __instance)
-    {
-        SoundManager.Instance.PlaySound(__instance.IntroStinger, false, 1f, null);
-        Logger.GlobalInstance.Info("IntroCutscene :: CoBegin() :: Game Mode: Hide and Seek (MiraAPI)", null);
-        __instance.LogPlayerRoleData();
-        __instance.HideAndSeekPanels.SetActive(true);
-        if (PlayerControl.LocalPlayer.Data.Role.IsImpostor)
-        {
-            __instance.CrewmateRules.SetActive(false);
-            __instance.ImpostorRules.SetActive(true);
-        }
-        else
-        {
-            __instance.CrewmateRules.SetActive(true);
-            __instance.ImpostorRules.SetActive(false);
-        }
-
-        __instance.ImpostorName.gameObject.SetActive(true);
-        __instance.ImpostorTitle.gameObject.SetActive(true);
-        __instance.BackgroundBar.enabled = false;
-        __instance.TeamTitle.gameObject.SetActive(false);
-        var impostor = PlayerControl.AllPlayerControls.ToArray().FirstOrDefault(x => x.Data.Role.IsImpostor);
-        if (impostor == null)
-        {
-            Logger.GlobalInstance.Error("IntroCutscene :: CoBegin() :: impostor is NULL", null);
-        }
-
-        GameManager.Instance.SetSpecialCosmetics(impostor);
-        if (impostor != null)
-        {
-            __instance.ImpostorName.text = impostor.Data.PlayerName;
-        }
-        else
-        {
-            __instance.ImpostorName.text = "???";
-        }
-
-        yield return new WaitForSecondsRealtime(0.1f);
-        if (impostor != null)
-        {
-            __instance.ImpostorTitle.text = impostor.Data.Role.GetRoleName();
-        }
-        PoolablePlayer playerSlot = null;
-        if (impostor != null)
-        {
-            playerSlot = __instance.CreatePlayer(1, 1, impostor.Data, false);
-            playerSlot.SetBodyType(PlayerBodyTypes.Normal);
-            playerSlot.SetFlipX(false);
-            playerSlot.transform.localPosition = __instance.impostorPos;
-            playerSlot.transform.localScale = Vector3.one * __instance.impostorScale;
-        }
-
-        yield return ShipStatus.Instance.CosmeticsCache.PopulateFromPlayers();
-        yield return new WaitForSecondsRealtime(6f);
-        if (playerSlot != null)
-        {
-            playerSlot.gameObject.SetActive(false);
-        }
-
-        __instance.HideAndSeekPanels.SetActive(false);
-        __instance.CrewmateRules.SetActive(false);
-        __instance.ImpostorRules.SetActive(false);
-        HnsMusicHandler.Instance.StartMusicWithIntro();
-        var hideTimer = 10f;
-
-        if (PlayerControl.LocalPlayer.Data.Role.IsImpostor)
-        {
-            __instance.HideAndSeekTimerText.gameObject.SetActive(true);
-            PoolablePlayer poolablePlayer;
-            AnimationClip anim;
-            if (AprilFoolsMode.ShouldHorseAround())
-            {
-                poolablePlayer = __instance.HorseWrangleVisualSuit;
-                poolablePlayer.gameObject.SetActive(true);
-                poolablePlayer.SetBodyType(PlayerBodyTypes.Seeker);
-                anim = __instance.HnSSeekerSpawnHorseAnim;
-                __instance.HorseWrangleVisualPlayer.SetBodyType(PlayerBodyTypes.Normal);
-                __instance.HorseWrangleVisualPlayer.UpdateFromPlayerData(
-                    PlayerControl.LocalPlayer.Data,
-                    PlayerControl.LocalPlayer.CurrentOutfitType,
-                    PlayerMaterial.MaskType.None,
-                    false,
-                    null,
-                    false);
-            }
-            else if (AprilFoolsMode.ShouldLongAround())
-            {
-                poolablePlayer = __instance.HideAndSeekPlayerVisual;
-                poolablePlayer.gameObject.SetActive(true);
-                poolablePlayer.SetBodyType(PlayerBodyTypes.LongSeeker);
-                anim = __instance.HnSSeekerSpawnLongAnim;
-            }
-            else
-            {
-                poolablePlayer = __instance.HideAndSeekPlayerVisual;
-                poolablePlayer.gameObject.SetActive(true);
-                poolablePlayer.SetBodyType(PlayerBodyTypes.Seeker);
-                anim = __instance.HnSSeekerSpawnAnim;
-            }
-
-            poolablePlayer.SetBodyCosmeticsVisible(false);
-            poolablePlayer.UpdateFromPlayerData(
-                PlayerControl.LocalPlayer.Data,
-                PlayerControl.LocalPlayer.CurrentOutfitType,
-                PlayerMaterial.MaskType.None,
-                false,
-                null,
-                false);
-            SpriteAnim component = poolablePlayer.GetComponent<SpriteAnim>();
-            poolablePlayer.gameObject.SetActive(true);
-            poolablePlayer.ToggleName(false);
-            component.Play(anim, 1f);
-            while (hideTimer > 0f)
-            {
-                __instance.HideAndSeekTimerText.text = Mathf.RoundToInt(hideTimer).ToString();
-                hideTimer -= Time.deltaTime;
-                yield return null;
-            }
-        }
-        else
-        {
-            HideAndSeekHudHelper.Instance.HideCountdown = hideTimer;
-            if (AprilFoolsMode.ShouldHorseAround())
-            {
-                if (impostor != null)
-                {
-                    impostor.AnimateCustom(__instance.HnSSeekerSpawnHorseInGameAnim);
-                }
-            }
-            else if (AprilFoolsMode.ShouldLongAround())
-            {
-                if (impostor != null)
-                {
-                    impostor.AnimateCustom(__instance.HnSSeekerSpawnLongInGameAnim);
-                }
-            }
-            else if (impostor != null)
-            {
-                impostor.AnimateCustom(__instance.HnSSeekerSpawnAnim);
-                impostor.cosmetics.SetBodyCosmeticsVisible(false);
-            }
-        }
-        ShipStatus.Instance.StartSFX();
-        HnsMusicHandler.Instance.OnGameStart();
-        HnsDangerMeter.Instance.OnGameStart();
-        UnityEngine.Object.Destroy(__instance.gameObject);
-    }
-    public override void Initialize()
-    {
-        deadPlayerCount = 0;
-        ShipStatus.Instance.BreakEmergencyButton();
-        PlayerControl.LocalPlayer.SetKillTimer(0.01f);
-        if (HudManager.InstanceExists)
-        {
-            HudManager.Instance.gameObject.AddComponent<HnsMusicHandler>();
-            HudManager.Instance.gameObject.AddComponent<HideAndSeekHudHelper>();
-            HudManager.Instance.gameObject.AddComponent<HnsDangerMeter>();
-        }
-    }
-    public override MapOptions GetMapOptions()
-    {
-        MapOptions mapOptions = new MapOptions
-        {
-            Mode = MapOptions.Modes.Normal,
-        };
-        if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && HideAndSeekHudHelper.Instance.SeekerAdminMapEnabled(PlayerControl.LocalPlayer))
-        {
-            mapOptions.Mode = MapOptions.Modes.CountOverlay;
-            mapOptions.AllowMovementWhileMapOpen = true;
-            mapOptions.IncludeDeadBodies = false;
-            mapOptions.ShowLivePlayerPosition = false;
-        }
-        return mapOptions;
-    }
-
-    public override void CheckGameEnd(out bool runOriginal, LogicGameFlowNormal instance)
-    {
-        runOriginal = false;
-        if (Helpers.GetAlivePlayers().Count(x => x.Data.Role.IsImpostor) == 0)
-        {
-            instance.Manager.RpcEndGame(GameOverReason.ImpostorDisconnect, !DataManager.Player.Ads.HasPurchasedAdRemoval);
-        }
-        if (Helpers.GetAlivePlayers().Count(x => !x.Data.Role.IsImpostor) != 0)
-        {
-            if (HideAndSeekHudHelper.Instance.AllTimersExpired())
-            {
-                instance.Manager.RpcEndGame(GameOverReason.HideAndSeek_CrewmatesByTimer, !DataManager.Player.Ads.HasPurchasedAdRemoval);
-            }
-            return;
-        }
-        instance.Manager.RpcEndGame(GameOverReason.HideAndSeek_ImpostorsByKills, !DataManager.Player.Ads.HasPurchasedAdRemoval);
-    }
-
-    public override PlayerBodyTypes GetBodyType(PlayerControl player)
-    {
-        if (player == null || player.Data == null || player.Data.Role == null)
-        {
-            if (AprilFoolsMode.ShouldHorseAround())
-            {
-                return PlayerBodyTypes.Horse;
-            }
-            if (AprilFoolsMode.ShouldLongAround())
-            {
-                return PlayerBodyTypes.Long;
-            }
-            return PlayerBodyTypes.Normal;
-        }
-        else if (AprilFoolsMode.ShouldHorseAround())
-        {
-            if (player.Data.Role.IsImpostor)
-            {
-                return PlayerBodyTypes.Normal;
-            }
-            return PlayerBodyTypes.Horse;
-        }
-        else if (AprilFoolsMode.ShouldLongAround())
-        {
-            if (player.Data.Role.IsImpostor)
-            {
-                return PlayerBodyTypes.LongSeeker;
-            }
-            return PlayerBodyTypes.Long;
-        }
-        else
-        {
-            if (player.Data.Role.IsImpostor)
-            {
-                return PlayerBodyTypes.Seeker;
-            }
-            return PlayerBodyTypes.Normal;
-        }
-    }
-    public override void UpdateTaskPanel(TaskPanelBehaviour instance)
-    {
-        instance.background.transform.localScale = (instance.taskText.textBounds.size.x > 0f)
-            ? new Vector3(instance.taskText.textBounds.size.x + 0.2f, instance.taskText.textBounds.size.y + 0.2f, 1f)
-            : Vector3.zero;
-        Vector3 vector = instance.background.sprite.bounds.extents;
-        vector.y = -vector.y;
-        vector = vector.Mul(instance.background.transform.localScale);
-        instance.background.transform.localPosition = vector;
-        Vector3 vector2 = instance.tab.sprite.bounds.extents;
-        vector2 = vector2.Mul(instance.tab.transform.localScale);
-        vector2.y = -vector2.y;
-        vector2.x += vector.x * 2f;
-        instance.tab.transform.localPosition = vector2;
-        if (GameManager.Instance == null)
-        {
-            return;
-        }
-
-        var yPos = 1.6f;
-        var xPos = -instance.background.sprite.bounds.size.x * instance.background.transform.localScale.x;
-        instance.closedPosition = new Vector3(xPos, yPos, instance.closedPosition.z);
-        instance.openPosition = new Vector3(instance.openPosition.x, yPos, instance.openPosition.z);
-        if (instance.open)
-        {
-            instance.timer = Mathf.Min(1f, instance.timer + Time.deltaTime / instance.animationTimeSeconds);
-        }
-        else
-        {
-            instance.timer = Mathf.Max(0f, instance.timer - Time.deltaTime / instance.animationTimeSeconds);
-        }
-
-        Vector3 relativePos = new(
-            Mathf.SmoothStep(instance.closedPosition.x, instance.openPosition.x, instance.timer),
-            yPos,
-            instance.openPosition.z);
-        instance.transform.localPosition =
-            AspectPosition.ComputePosition(AspectPosition.EdgeAlignments.LeftTop, relativePos);
-    }
-    private int deadPlayerCount;
-    public override void OnPlayerDeath(PlayerControl player, bool assignGhostRole)
-    {
-        base.OnPlayerDeath(player, assignGhostRole);
-        HudManager.Instance.NotifyOfDeath();
-        var popup = GameManagerCreator.Instance.HideAndSeekManagerPrefab.DeathPopupPrefab;
-        deadPlayerCount++;
-        var item = UnityEngine.Object.Instantiate(popup, HudManager.Instance.transform.parent);
-        item.Show(player, deadPlayerCount);
-    }
-}

MiraAPI/GameOptions/Attributes/ModdedOptionAttribute.cs

@@ -8,9 +8,8 @@ namespace MiraAPI.GameOptions.Attributes;
 /// </summary>
 /// <param name="title">The option title.</param>
 /// <param name="roleType">Optional parameter to specify a role Type.</param>
-/// <param name="modeType">Optional parameter to specify a game mode Type.</param>
 [AttributeUsage(AttributeTargets.Property)]
-public abstract class ModdedOptionAttribute(string title, Type? roleType = null, Type? modeType = null) : Attribute
+public abstract class ModdedOptionAttribute(string title, Type? roleType = null) : Attribute
 {
     internal IModdedOption? HolderOption { get; set; }
 
@@ -24,11 +23,6 @@ public abstract class ModdedOptionAttribute(string title, Type? roleType = null,
     /// </summary>
     protected Type? RoleType { get; private set; } = roleType;
 
-    /// <summary>
-    /// Gets the game mode type of the option.
-    /// </summary>
-    protected Type? ModeType { get; private set; } = modeType;
-
     /// <summary>
     /// Sets the value of the option.
     /// </summary>

MiraAPI/GameOptions/ModdedOptionsManager.cs

@@ -5,8 +5,6 @@ using System.Linq;
 using System.Reflection;
 using BepInEx.Configuration;
 using HarmonyLib;
-using Il2CppInterop.Runtime.Injection;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.GameOptions.OptionTypes;
 using MiraAPI.Networking;
@@ -28,8 +26,6 @@ public static class ModdedOptionsManager
     private static readonly Dictionary<Type, AbstractOptionGroup> TypeToGroup = [];
 
     internal static readonly Dictionary<OptionBehaviour, ModdedPlayerOption> CreatedPlayerOptions = [];
-    internal static readonly Dictionary<OptionBehaviour, ModdedStringOption> CreatedStringOptions = [];
-    internal static readonly Dictionary<Type, List<AbstractOptionGroup>> GameModeOptionGroups = [];
     internal static readonly Dictionary<uint, IModdedOption> ModdedOptions = [];
     internal static readonly List<AbstractOptionGroup> Groups = [];
 
@@ -38,7 +34,7 @@ public static class ModdedOptionsManager
 
     public static void AddSettingsChangeMessage(NotificationPopper notif, StringNames key, string value, Color textColor, TMP_SpriteAsset? sprite, bool playSound = true)
     {
-        string item;
+        var item = string.Empty;
         var text = textColor.ToTextColor();
         if (sprite != null)
         {
@@ -66,29 +62,6 @@ public static class ModdedOptionsManager
         notif.SettingsChangeMessageLogic(key, item, playSound);
     }
 
-    internal static bool RegisterGroup(Type type)
-    {
-        if (Activator.CreateInstance(type) is not AbstractOptionGroup group)
-        {
-            return false;
-        }
-
-        if (TypeToGroup.ContainsKey(type))
-        {
-            Logger<MiraApiPlugin>.Error($"Group {type.Name} already exists.");
-            return false;
-        }
-
-        Groups.Add(group);
-        TypeToGroup.Add(type, group);
-
-        typeof(OptionGroupSingleton<>).MakeGenericType(type)
-            .GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
-            .SetValue(null, group);
-
-        return true;
-    }
-
     internal static bool RegisterGroup(Type type, MiraPluginInfo pluginInfo)
     {
         if (Activator.CreateInstance(type) is not AbstractOptionGroup group)
@@ -104,17 +77,6 @@ public static class ModdedOptionsManager
 
         Groups.Add(group);
         TypeToGroup.Add(type, group);
-        if (group.OptionableType?.IsAssignableTo(typeof(AbstractGameMode)) == true)
-        {
-            if (GameModeOptionGroups.TryGetValue(group.OptionableType, out var oldList))
-            {
-                oldList.Add(group);
-            }
-            else
-            {
-                GameModeOptionGroups.Add(group.OptionableType, new List<AbstractOptionGroup>() { group });
-            }
-        }
         pluginInfo.InternalOptionGroups.Add(group);
 
         typeof(OptionGroupSingleton<>).MakeGenericType(type)

MiraAPI/GameOptions/ModifierOptionGroup.cs

@@ -1,10 +1,8 @@
 using System.Linq;
-using MiraAPI.PluginLoading;
 
 namespace MiraAPI.GameOptions;
 
 #pragma warning disable CA1852
-[MiraIgnore]
 internal class ModifierOptionGroup : AbstractOptionGroup
 #pragma warning restore CA1852
 {

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using BepInEx.Configuration;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;

MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs

@@ -1,176 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using MiraAPI.Networking;
-using Reactor.Localization.Utilities;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.GameOptions.OptionTypes;
-
-/// <summary>
-/// An option for selecting an enum value.
-/// </summary>
-public class ModdedStringOption : ModdedOption<string>
-{
-    /// <summary>
-    /// Gets or sets the string values of the option.
-    /// </summary>
-    public string[] Values { get; set; }
-
-    /// <summary>
-    /// Gets or sets the String Name values of the option.
-    /// </summary>
-    public StringNames[] StringNameValues { get; set; }
-
-    /// <summary>
-    /// Gets the string's index.
-    /// </summary>
-    /// <param name="value">The option's string value.</param>
-    /// <returns>The option's value in the index.</returns>
-    public int GetIndex(string value, int location)
-    {
-        if (Values.Contains(value))
-        {
-            return Values.ToList().IndexOf(value);
-        }
-        Info($"Cannot find a valid index for {value} in {location}. Returning 0 instead. Values: {string.Join(", ", Values)}");
-        return 0;
-    }
-
-    /// <summary>
-    /// Adds a value to the option.
-    /// </summary>
-    /// <param name="value">The option's string value.</param>
-    /// <param name="index">The additional value's index on the list.</param>
-    public void RegisterExtraValue(string value, int index = -1)
-    {
-        if (!Values.Contains(value))
-        {
-            if (index <= -1)
-                index = Values.Length;
-
-            var newVals = Values.ToList();
-            newVals.Insert(index, value);
-            Values = newVals.ToArray();
-            var newStrVals = StringNameValues.ToList();
-            newStrVals.Insert(index, CustomStringName.CreateAndRegister(value));
-            StringNameValues = newStrVals.ToArray();
-        }
-
-        if (Data != null)
-        {
-            var data = (StringGameSetting)Data;
-            data.Values = StringNameValues;
-
-            data.Index = GetIndex(Value, 1);
-            if (OptionBehaviour != null)
-            {
-                var strOpt = OptionBehaviour.TryCast<StringOption>();
-                if (strOpt != null)
-                {
-                    strOpt.Values = StringNameValues;
-                    strOpt.Value = GetIndex(Value, 2);
-                    Warning("StringOption is valid");
-                }
-                else
-                {
-                    Error("StringOption is null.");
-                }
-                Warning("OptionBehaviour is valid");
-            }
-            else
-            {
-                Error("OptionBehaviour is null.");
-            }
-            Warning("Data is valid");
-        }
-        else
-        {
-            Error("Data is null.");
-        }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedStringOption"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="defaultValue">The default value as a string.</param>
-    /// <param name="values">An option list of string values to use.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
-    public ModdedStringOption(string title, string defaultValue, string[] values, bool includeInPreset=true) : base(title, defaultValue, includeInPreset)
-    {
-        Values = values;
-        Data = ScriptableObject.CreateInstance<StringGameSetting>();
-        var data = (StringGameSetting)Data;
-
-        data.Title = StringName;
-        data.Type = global::OptionTypes.String;
-        StringNameValues = values.Select(CustomStringName.CreateAndRegister).ToArray();
-        data.Values = StringNameValues;
-
-        data.Index = GetIndex(Value, 3);
-    }
-
-    /// <inheritdoc />
-    public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
-    {
-        var stringOption = Object.Instantiate(stringOpt, container);
-        stringOption.name =
-            $"{ParentMod!.OptionsTitleText}.StringOption.{TranslationController.Instance.GetString(StringName)}";
-
-        stringOption.SetUpFromData(Data, 20);
-        stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
-
-        // SetUpFromData method doesnt work correctly so we must set the values manually
-        stringOption.Title = StringName;
-        stringOption.Values = (Data as StringGameSetting)?.Values ?? new Il2CppStructArray<StringNames>(0);
-        stringOption.Value = GetIndex(Value, 4);
-
-        OptionBehaviour = stringOption;
-        ModdedOptionsManager.CreatedStringOptions.TryAdd(stringOption, this);
-
-        return stringOption;
-    }
-
-    /// <inheritdoc />
-    public override float GetFloatData()
-    {
-        return Array.IndexOf(Values, Value);
-    }
-
-    /// <inheritdoc />
-    public override NetData GetNetData()
-    {
-        return new NetData(Id, Encoding.Unicode.GetBytes(Convert.ToString(Value, NumberFormatInfo.InvariantInfo)));
-    }
-
-    /// <inheritdoc />
-    public override void HandleNetData(byte[] data)
-    {
-        SetValue(Encoding.Unicode.GetString(data));
-    }
-
-    /// <inheritdoc />
-    public override string GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
-    {
-        return Values[optionBehaviour.GetInt()];
-    }
-
-    /// <inheritdoc />
-    protected override void OnValueChanged(string newValue)
-    {
-        HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(GetIndex(newValue, 5)), false);
-        if (!OptionBehaviour)
-        {
-            return;
-        }
-
-        if (OptionBehaviour is StringOption opt)
-        {
-            opt.Value = GetIndex(newValue, 5);
-        }
-    }
-}

MiraAPI/HnsReimplemented/HideAndSeekHudHelper.cs

@@ -1,285 +0,0 @@
-using System.Collections;
-using System.Linq;
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using MiraAPI.GameOptions;
-using MiraAPI.HnsReimplemented.Options;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Attributes;
-using UnityEngine;
-
-namespace MiraAPI.HnsReimplemented;
-
-[RegisterInIl2Cpp]
-public sealed class HideAndSeekHudHelper(nint cppPtr) : MonoBehaviour(cppPtr)
-{
-    public static HideAndSeekHudHelper Instance { get; private set; }
-
-    public AudioClip FinalHideAlertSfx;
-
-    public AudioClip FinalHideCountdownSfx;
-
-    private AudioClip TaskFinishedSound;
-
-    private const int SECONDS_TO_BEEP = 10;
-
-    private const float SECONDS_TO_SET_DIRTY = 1f;
-
-    private HideAndSeekTimerBar timerBar;
-
-    private float totalHideTime = float.MaxValue;
-
-    private float currentHideTime = float.MaxValue;
-
-    private float totalFinalHideTime = float.MaxValue;
-
-    private float currentFinalHideTime = float.MaxValue;
-
-    private float secondsSinceLastSetDirty;
-    private Coroutine beepCoroutine;
-
-    private void Awake()
-    {
-        Instance = this;
-    }
-
-    public bool IsFinalCountdown
-    {
-        get { return currentHideTime <= 0f; }
-    }
-
-    public bool SeekerAdminMapEnabled(PlayerControl player)
-    {
-        int item = Helpers.GetAlivePlayers().Count(x => !x.Data.Role.IsImpostor);
-        return !player.inVent && player.Data != null && player.Data.Role != null &&
-               ((!player.inVent && player.Data.Role.IsImpostor && IsFinalCountdown &&
-                 OptionGroupSingleton<HnsFinalHideOptions>.Instance.FinalHideSeekMap.Value) ||
-                (player.Data.Role.IsImpostor &&
-                 item <=
-                 (GameData.Instance.PlayerCount - 1) / 3));
-    }
-
-    public void OnTaskComplete(float timeDeduction)
-    {
-        if (timerBar != null)
-        {
-            timerBar.TaskComplete();
-        }
-
-        AdjustEscapeTimer(timeDeduction, true);
-    }
-
-    public float GetTotalRoundTime()
-    {
-        float escapeTime = OptionGroupSingleton<HnsCrewmateOptions>.Instance.HidingTime.Value;
-        float finalCountdownTime = OptionGroupSingleton<HnsFinalHideOptions>.Instance.FinalHideTime.Value;
-        return escapeTime + finalCountdownTime;
-    }
-
-    public float GetTotalTimeRemaining()
-    {
-        return currentHideTime + currentFinalHideTime;
-    }
-
-    public float GetRoundTimeElapsed()
-    {
-        return GetTotalRoundTime() - GetTotalTimeRemaining();
-    }
-
-    public void Start()
-    {
-        totalHideTime = OptionGroupSingleton<HnsCrewmateOptions>.Instance.HidingTime.Value;
-        currentHideTime = totalHideTime;
-        totalFinalHideTime = OptionGroupSingleton<HnsFinalHideOptions>.Instance.FinalHideTime.Value;
-        currentFinalHideTime = totalFinalHideTime;
-        if (timerBar != null)
-        {
-            Object.Destroy(timerBar);
-        }
-
-        FinalHideAlertSfx = GameManagerCreator.Instance.HideAndSeekManagerPrefab.FinalHideAlertSFX;
-        FinalHideCountdownSfx = GameManagerCreator.Instance.HideAndSeekManagerPrefab.FinalHideCountdownSFX;
-        TaskFinishedSound = GameManagerCreator.Instance.HideAndSeekManagerPrefab.TaskFinishedSound;
-        timerBar = Object.Instantiate<HideAndSeekTimerBar>(
-            GameManagerCreator.Instance.HideAndSeekManagerPrefab.TimerBarPrefab,
-            HudManager.Instance.transform.parent);
-    }
-
-    public void OnGameEnd()
-    {
-        if (timerBar != null)
-        {
-            Object.Destroy(timerBar.gameObject);
-        }
-
-        if (beepCoroutine != null)
-        {
-            StopCoroutine(beepCoroutine);
-        }
-
-        beepCoroutine = null!;
-    }
-    private float taskDirtyTimer;
-    public float HideCountdown { get; set; }
-
-    public void LateUpdate()
-    {
-        if (!HudManager.InstanceExists)
-        {
-            return;
-        }
-        if (HideCountdown > 0f && taskDirtyTimer > 0.25f)
-        {
-            float num = taskDirtyTimer;
-            taskDirtyTimer = 0f;
-            if (!PlayerControl.LocalPlayer)
-            {
-                HudManager.Instance.TaskPanel.SetTaskText(string.Empty);
-                return;
-            }
-            NetworkedPlayerInfo data = PlayerControl.LocalPlayer.Data;
-            if (data == null)
-            {
-                return;
-            }
-            bool flag = data.Role != null && data.Role.IsImpostor;
-            HudManager.Instance.tasksString.Clear();
-            if (PlayerControl.LocalPlayer.myTasks == null || PlayerControl.LocalPlayer.myTasks.Count == 0)
-            {
-                HudManager.Instance.tasksString.Append("None");
-            }
-            else
-            {
-                for (int i = 0; i < PlayerControl.LocalPlayer.myTasks.Count; i++)
-                {
-                    PlayerTask playerTask = PlayerControl.LocalPlayer.myTasks[i];
-                    if (playerTask)
-                    {
-                        if (playerTask.TaskType == TaskTypes.FixComms && !flag)
-                        {
-                            HudManager.Instance.tasksString.Clear();
-                            playerTask.AppendTaskText(HudManager.Instance.tasksString);
-                            break;
-                        }
-                        playerTask.AppendTaskText(HudManager.Instance.tasksString);
-                    }
-                }
-                if (data.Role != null)
-                {
-                    data.Role.AppendTaskHint(HudManager.Instance.tasksString);
-                }
-                if (HideCountdown > 0f)
-                {
-                    HideCountdown -= num;
-                    HudManager.Instance.tasksString.Append("\n\n" + ((int)HideCountdown));
-                }
-                HudManager.Instance.tasksString.TrimEnd();
-            }
-            HudManager.Instance.TaskPanel.SetTaskText(HudManager.Instance.tasksString.ToString());
-        }
-    }
-    public void FixedUpdate()
-    {
-        secondsSinceLastSetDirty += Time.fixedDeltaTime;
-        if (IsFinalCountdown)
-        {
-            AdjustFinalEscapeTimer(Time.fixedDeltaTime);
-            return;
-        }
-
-        AdjustEscapeTimer(Time.fixedDeltaTime, false);
-    }
-
-    public void OnDestroy()
-    {
-        if (timerBar != null)
-        {
-            Object.Destroy(timerBar);
-        }
-    }
-
-    private void OnFinalCountdownTriggered()
-    {
-        foreach (PlayerControl playerControl in PlayerControl.AllPlayerControls)
-        {
-            if (!playerControl.Data.Role.IsImpostor && !playerControl.Data.IsDead)
-            {
-                playerControl.ClearTasks();
-                PlayerTask.GetOrCreateTask<ImportantTextTask>(playerControl, 0).Text =
-                    DestroyableSingleton<TranslationController>.Instance.GetString(StringNames.HideActionButton);
-            }
-        }
-
-        if (!PlayerControl.LocalPlayer.Data.IsDead && Minigame.Instance != null)
-        {
-            Minigame instance = Minigame.Instance;
-            if (instance != null)
-            {
-                instance.ForceClose();
-            }
-        }
-
-        timerBar.StartFinalHide();
-        SoundManager.Instance.PlaySound(FinalHideAlertSfx, false, 1f, null);
-        DestroyableSingleton<HudManager>.Instance.SetAlertOverlay(true);
-    }
-
-    private void AdjustEscapeTimer(float timeDeduction, bool forceDirty)
-    {
-        float num = currentHideTime;
-        currentHideTime -= timeDeduction;
-        currentHideTime = Mathf.Max(currentHideTime, 0f);
-        if (currentHideTime <= 10f && beepCoroutine == null)
-        {
-            beepCoroutine = StartCoroutine(BeepAlmostEverySecond().WrapToIl2Cpp());
-        }
-
-        if (num > 0f && currentHideTime <= 0f)
-        {
-            OnFinalCountdownTriggered();
-        }
-
-        timerBar.UpdateTimer(currentHideTime, totalHideTime);
-        if (forceDirty || secondsSinceLastSetDirty > 1f)
-        {
-            secondsSinceLastSetDirty = 0f;
-        }
-    }
-
-    private IEnumerator BeepAlmostEverySecond()
-    {
-        while (!IsFinalCountdown)
-        {
-            float num = currentHideTime / 10f;
-            float pitch = 1.5f - num / 2f;
-            SoundManager.Instance.PlaySoundImmediate(FinalHideCountdownSfx, false, 1f, pitch, null);
-            yield return new WaitForSeconds(1f);
-        }
-
-        yield return Effects.Wait(currentFinalHideTime - 10f);
-        while (currentFinalHideTime > 0f)
-        {
-            float num2 = currentFinalHideTime / 10f;
-            float pitch2 = 1.5f - num2 / 2f;
-            SoundManager.Instance.PlaySoundImmediate(FinalHideCountdownSfx, false, 1f, pitch2, null);
-            yield return new WaitForSeconds(1f);
-        }
-
-        yield break;
-    }
-
-    private void AdjustFinalEscapeTimer(float timeDeduction)
-    {
-        currentFinalHideTime -= timeDeduction;
-        currentFinalHideTime = Mathf.Max(currentFinalHideTime, 0f);
-        timerBar.UpdateTimer(currentFinalHideTime, totalFinalHideTime);
-        if (secondsSinceLastSetDirty > 1f)
-        {
-            secondsSinceLastSetDirty = 0f;
-        }
-    }
-
-    public bool AllTimersExpired()
-    {
-        return currentHideTime <= 0f && currentFinalHideTime <= 0f;
-    }
-}

MiraAPI/HnsReimplemented/HnsDangerMeter.cs

@@ -1,142 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using MiraAPI.GameOptions;
-using MiraAPI.HnsReimplemented.Options;
-using MiraAPI.Utilities;
-using Reactor.Utilities.Attributes;
-using UnityEngine;
-
-namespace MiraAPI.HnsReimplemented;
-
-[RegisterInIl2Cpp]
-public sealed class HnsDangerMeter(nint cppPtr) : MonoBehaviour(cppPtr)
-{
-    public static HnsDangerMeter Instance;
-
-    private void Awake()
-    {
-        Instance = this;
-    }
-
-    private DangerMeter dangerMeter;
-
-    private List<PlayerControl> impostors = [];
-
-    private float scaryMusicDistance;
-
-    private float veryScaryMusicDistance;
-
-    private float dangerLevel1;
-
-    private float dangerLevel2;
-
-    private bool firstMusicActivation;
-
-    private float firstCrossfadeCountdown;
-
-    public void FixedUpdate()
-    {
-        PlayerControl localPlayer = PlayerControl.LocalPlayer;
-        if (impostors == null || localPlayer == null)
-        {
-            return;
-        }
-
-        if (impostors.Count <= 0)
-        {
-            return;
-        }
-
-        float num = float.MaxValue;
-        foreach (PlayerControl playerControl in impostors)
-        {
-            if (!(playerControl == null))
-            {
-                float sqrMagnitude = (playerControl.transform.position - localPlayer.transform.position).sqrMagnitude;
-                if (sqrMagnitude < scaryMusicDistance && num > sqrMagnitude)
-                {
-                    num = sqrMagnitude;
-                }
-            }
-        }
-
-        if (HideAndSeekHudHelper.Instance.HideCountdown > 0f)
-        {
-            dangerLevel1 = 0f;
-            dangerLevel2 = 0f;
-        }
-        else
-        {
-            if (firstMusicActivation)
-            {
-                firstMusicActivation = false;
-                firstCrossfadeCountdown = 3f;
-                HnsMusicHandler.Instance.SetMusicCrossfadeSpeed(0.6f);
-            }
-
-            if (firstCrossfadeCountdown > 0f)
-            {
-                firstCrossfadeCountdown -= Time.deltaTime;
-                if (firstCrossfadeCountdown <= 0f)
-                {
-                    HnsMusicHandler.Instance.SetMusicCrossfadeSpeed(5f);
-                }
-            }
-
-            dangerLevel1 = Mathf.Clamp01(
-                (scaryMusicDistance - num) / (scaryMusicDistance - veryScaryMusicDistance));
-            dangerLevel2 = Mathf.Clamp01((veryScaryMusicDistance - num) / veryScaryMusicDistance);
-        }
-
-        UpdateDangerMeter();
-        UpdateDangerMusic();
-    }
-
-    private void UpdateDangerMusic()
-    {
-        PlayerControl localPlayer = PlayerControl.LocalPlayer;
-        if (localPlayer != null && localPlayer.Data != null && localPlayer.Data.IsDead)
-        {
-            HnsMusicHandler.Instance.SetTaskState(false);
-            HnsMusicHandler.Instance.ResetMusic();
-            return;
-        }
-
-        HnsMusicHandler.Instance.SetMusicValues(dangerLevel1, dangerLevel2);
-    }
-
-    private void UpdateDangerMeter()
-    {
-        if (dangerMeter == null)
-        {
-            return;
-        }
-
-        dangerMeter.SetDangerValue(dangerLevel1, dangerLevel2);
-    }
-
-    public void OnGameStart()
-    {
-        firstMusicActivation = true;
-        if (!PlayerControl.LocalPlayer.Data.Role.IsImpostor)
-        {
-            dangerMeter = HudManager.Instance.DangerMeter;
-            dangerMeter.gameObject.SetActive(true);
-        }
-
-        impostors = Helpers.GetAlivePlayers().Where(x => x.Data.Role.IsImpostor).ToList();
-
-        var baseSpeed = OptionGroupSingleton<HnsCrewmateOptions>.Instance.PlayerSpeed.Value;
-        scaryMusicDistance = 55f *
-                                  baseSpeed;
-        veryScaryMusicDistance = 15f *
-                                      baseSpeed;
-        if (scaryMusicDistance < veryScaryMusicDistance)
-        {
-            float num = veryScaryMusicDistance;
-            float num2 = scaryMusicDistance;
-            scaryMusicDistance = num;
-            veryScaryMusicDistance = num2;
-        }
-    }
-}

MiraAPI/HnsReimplemented/HnsMusicHandler.cs

@@ -1,237 +0,0 @@
-using System.Collections.Generic;
-using Amongus.GameModes.HideAndSeek;
-using MiraAPI.GameOptions;
-using MiraAPI.HnsReimplemented.Options;
-using Reactor.Utilities.Attributes;
-using UnityEngine;
-
-namespace MiraAPI.HnsReimplemented;
-
-[RegisterInIl2Cpp]
-public sealed class HnsMusicHandler(nint cppPtr) : MonoBehaviour(cppPtr)
-{
-    public static HnsMusicHandler Instance;
-
-    private void Awake()
-    {
-        Instance = this;
-    }
-
-    private HideAndSeekMusicCollection musicCollection;
-
-    private float lastMusicSyncTime;
-
-    private bool isDoingTask;
-
-    private float normalVolume;
-
-    private float taskVolume;
-
-    private float dangerLevel1Volume;
-
-    private float dangerLevel2Volume;
-
-    private AudioSource normalSource;
-
-    private AudioSource taskSource;
-
-    private AudioSource dangerLevel1Source;
-
-    private AudioSource dangerLevel2Source;
-
-    private float musicLerpSpeed = 5f;
-
-    public void Start()
-    {
-        musicCollection = GameManagerCreator.Instance.HideAndSeekManagerPrefab.MusicCollection;
-    }
-
-    public void OnGameStart()
-    {
-        InitMusic();
-        ResetMusic();
-    }
-
-    public void OnDestroy()
-    {
-        ResetMusic();
-    }
-
-    private void InitMusic()
-    {
-        if (normalSource == null)
-        {
-            normalSource =
-                SoundManager.Instance.GetNamedSfxSource(musicNames[LogicHnSMusic.HideAndSeekMusicTrack.Normal]);
-        }
-
-        normalSource.outputAudioMixerGroup = SoundManager.Instance.MusicChannel;
-        normalSource.clip = musicCollection.NormalMusic;
-        normalSource.loop = true;
-        if (taskSource == null)
-        {
-            taskSource =
-                SoundManager.Instance.GetNamedSfxSource(musicNames[LogicHnSMusic.HideAndSeekMusicTrack.Task]);
-        }
-
-        taskSource.outputAudioMixerGroup = SoundManager.Instance.MusicChannel;
-        taskSource.volume = 0f;
-        taskSource.clip = musicCollection.TaskMusic;
-        taskSource.loop = true;
-        if (dangerLevel1Source == null)
-        {
-            dangerLevel1Source =
-                SoundManager.Instance.GetNamedSfxSource(
-                    musicNames[LogicHnSMusic.HideAndSeekMusicTrack.DangerLevel1]);
-        }
-
-        dangerLevel1Source.outputAudioMixerGroup = SoundManager.Instance.MusicChannel;
-        dangerLevel1Source.volume = 0f;
-        dangerLevel1Source.clip = musicCollection.DangerLevel1Music;
-        dangerLevel1Source.loop = true;
-        if (dangerLevel2Source == null)
-        {
-            dangerLevel2Source =
-                SoundManager.Instance.GetNamedSfxSource(
-                    musicNames[LogicHnSMusic.HideAndSeekMusicTrack.DangerLevel2]);
-        }
-
-        dangerLevel2Source.outputAudioMixerGroup = SoundManager.Instance.MusicChannel;
-        dangerLevel2Source.volume = 0f;
-        dangerLevel2Source.clip = musicCollection.DangerLevel2Music;
-        dangerLevel2Source.loop = true;
-        normalSource.Play();
-        taskSource.Play();
-        dangerLevel1Source.Play();
-        dangerLevel2Source.Play();
-        SyncMusic();
-    }
-
-    public void StartMusicWithIntro()
-    {
-        if (PlayerControl.LocalPlayer.Data.Role.IsImpostor)
-        {
-            AudioClip clip = OptionGroupSingleton<HnsCrewmateOptions>.Instance.HidingTime.Value <= 180f
-                ? musicCollection.ImpostorShortMusic
-                : musicCollection.ImpostorLongMusic;
-            if (AprilFoolsMode.ShouldHorseAround())
-            {
-                clip = musicCollection.ImpostorRanchMusic;
-            }
-
-            SoundManager.Instance.PlaySound(clip, true, 1f, SoundManager.Instance.MusicChannel);
-        }
-    }
-
-    public void SetTaskState(bool isDoingTask)
-    {
-        isDoingTask = isDoingTask;
-    }
-
-    public void FixedUpdate()
-    {
-        if (normalSource == null || taskSource == null || dangerLevel1Source == null ||
-            dangerLevel2Source == null)
-        {
-            return;
-        }
-
-        if (Time.unscaledTime > lastMusicSyncTime + 1f)
-        {
-            SyncMusic();
-        }
-
-        normalSource.volume = Mathf.Lerp(
-            normalSource.volume,
-            normalVolume,
-            Time.fixedDeltaTime * musicLerpSpeed);
-        taskSource.volume = Mathf.Lerp(
-            taskSource.volume,
-            taskVolume,
-            Time.fixedDeltaTime * musicLerpSpeed);
-        dangerLevel1Source.volume = Mathf.Lerp(
-            dangerLevel1Source.volume,
-            dangerLevel1Volume,
-            Time.fixedDeltaTime * musicLerpSpeed);
-        dangerLevel2Source.volume = Mathf.Lerp(
-            dangerLevel2Source.volume,
-            dangerLevel2Volume,
-            Time.fixedDeltaTime * musicLerpSpeed);
-    }
-
-    private void SyncMusic()
-    {
-        taskSource.timeSamples = normalSource.timeSamples;
-        dangerLevel1Source.timeSamples = normalSource.timeSamples;
-        dangerLevel2Source.timeSamples = normalSource.timeSamples;
-        lastMusicSyncTime = Time.unscaledTime;
-    }
-
-    public void ResetMusic()
-    {
-        SetMusicValues(0f, 0f);
-    }
-
-    public void SetMusicCrossfadeSpeed(float lerpSpeed)
-    {
-        musicLerpSpeed = lerpSpeed;
-    }
-
-    public void SetMusicValues(float dangerLevel1, float dangerLevel2)
-    {
-        if (PlayerControl.LocalPlayer != null && PlayerControl.LocalPlayer.Data.Role.IsImpostor)
-        {
-            return;
-        }
-
-        if (normalSource == null || taskSource == null || dangerLevel1Source == null ||
-            dangerLevel2Source == null)
-        {
-            return;
-        }
-
-        normalVolume = (isDoingTask ? 0f : 1f);
-        taskVolume = (isDoingTask ? 1f : 0f);
-        dangerLevel1Volume = 0f;
-        dangerLevel2Volume = 0f;
-        if (dangerLevel1 > 0f)
-        {
-            dangerLevel1Volume = dangerLevel1;
-            if (isDoingTask)
-            {
-                taskVolume = 1f - dangerLevel1;
-            }
-            else
-            {
-                normalVolume = 1f - dangerLevel1;
-            }
-        }
-
-        if (dangerLevel2 > 0f)
-        {
-            dangerLevel2Volume = dangerLevel2;
-            dangerLevel1Volume = 1f - dangerLevel2;
-        }
-    }
-
-    private readonly Dictionary<LogicHnSMusic.HideAndSeekMusicTrack, string> musicNames =
-        new Dictionary<LogicHnSMusic.HideAndSeekMusicTrack, string>
-        {
-            {
-                LogicHnSMusic.HideAndSeekMusicTrack.Normal,
-                "HnS_Music_Normal"
-            },
-            {
-                LogicHnSMusic.HideAndSeekMusicTrack.Task,
-                "HnS_Music_Task"
-            },
-            {
-                LogicHnSMusic.HideAndSeekMusicTrack.DangerLevel1,
-                "HnS_Music_DangerLevel1"
-            },
-            {
-                LogicHnSMusic.HideAndSeekMusicTrack.DangerLevel2,
-                "HnS_Music_DangerLevel2"
-            },
-        };
-}

MiraAPI/HnsReimplemented/Options/HnsCrewmateOptions.cs

@@ -1,89 +0,0 @@
-using MiraAPI.GameModes;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.HnsReimplemented.Options;
-
-/// <inheritdoc />
-public class HnsCrewmateOptions : AbstractOptionGroup<HideAndSeekMode>
-{
-    /// <inheritdoc />
-    public override string GroupName => "Crewmates";
-
-    public ModdedNumberOption PlayerSpeed { get; set; } = new(
-        "Player Speed",
-        1f,
-        0.5f,
-        3f,
-        0.25f,
-        "#",
-        "#",
-        MiraNumberSuffixes.Multiplier,
-        "0.00");
-
-    public ModdedNumberOption HidingTime { get; set; } = new(
-        "Hiding Time",
-        200,
-        160,
-        300,
-        20,
-        "#",
-        "#",
-        MiraNumberSuffixes.Seconds);
-
-    public ModdedNumberOption CrewmateVision { get; set; } = new(
-        "Crewmate Vision",
-        0.6f,
-        0.25f,
-        1,
-        0.05f,
-        "#",
-        "#",
-        MiraNumberSuffixes.Multiplier,
-        "0.00");
-
-    public ModdedNumberOption MaxVentUses { get; set; } = new(
-        "Max Vent Uses",
-        1,
-        0,
-        5,
-        1,
-        "#",
-        "#",
-        MiraNumberSuffixes.None);
-
-    public ModdedNumberOption MaxTimeInVent { get; set; } = new(
-        "Max Time in Vent",
-        3,
-        1,
-        10,
-        1,
-        "#",
-        "#",
-        MiraNumberSuffixes.Seconds)
-    {
-        Visible = () => (int)OptionGroupSingleton<HnsCrewmateOptions>.Instance.MaxVentUses.Value > 0,
-    };
-
-    public ModdedToggleOption FlashlightMode { get; set; } = new(
-        "Flashlight Mode",
-        true);
-
-    public ModdedNumberOption CrewmateFlashlightSize { get; set; } = new(
-        "Crewmate Flashlight Size",
-        0.35f,
-        0.1f,
-        0.5f,
-        0.05f,
-        "#",
-        "#",
-        MiraNumberSuffixes.Multiplier)
-    {
-        Visible = () => OptionGroupSingleton<HnsCrewmateOptions>.Instance.FlashlightMode.Value,
-    };
-
-    public ModdedToggleOption ShowNames { get; set; } = new(
-        "Show Names",
-        false);
-}

MiraAPI/HnsReimplemented/Options/HnsFinalHideOptions.cs

@@ -1,52 +0,0 @@
-using MiraAPI.GameModes;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.HnsReimplemented.Options;
-
-/// <inheritdoc />
-public class HnsFinalHideOptions : AbstractOptionGroup<HideAndSeekMode>
-{
-    /// <inheritdoc />
-    public override string GroupName => "Final Hide";
-
-    public ModdedNumberOption FinalHideTime { get; set; } = new(
-        "Hiding Time",
-        50,
-        30,
-        120,
-        5,
-        "#",
-        "#",
-        MiraNumberSuffixes.Seconds);
-
-    public ModdedToggleOption FinalHidePings { get; set; } = new(
-        "Final Hide Pings",
-        true);
-
-    public ModdedNumberOption FinalHideImpostorSpeed { get; set; } = new(
-        "Final Hide Impostor Speed",
-        1.2f,
-        1f,
-        3,
-        0.05f,
-        "#",
-        "#",
-        MiraNumberSuffixes.Multiplier,
-        "0.00");
-
-    public ModdedNumberOption PingInterval { get; set; } = new(
-        "Ping Interval",
-        6,
-        3,
-        10,
-        5,
-        "#",
-        "#",
-        MiraNumberSuffixes.Seconds);
-
-    public ModdedToggleOption FinalHideSeekMap { get; set; } = new(
-        "Final Hide Seek Map",
-        true);
-}

MiraAPI/HnsReimplemented/Options/HnsImpostorOptions.cs

@@ -1,40 +0,0 @@
-using MiraAPI.GameModes;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.HnsReimplemented.Options;
-
-/// <inheritdoc />
-public class HnsImpostorOptions : AbstractOptionGroup<HideAndSeekMode>
-{
-    /// <inheritdoc />
-    public override string GroupName => "Impostors";
-
-    public ModdedPlayerOption SelectedSeeker { get; set; } = new(
-        "Forced Impostor");
-
-    public ModdedNumberOption ImpostorVision { get; set; } = new(
-        "Impostor Vision",
-        0.6f,
-        0.25f,
-        1,
-        0.05f,
-        "#",
-        "#",
-        MiraNumberSuffixes.Multiplier,
-        "0.00");
-
-    public ModdedNumberOption ImpostorFlashlightSize { get; set; } = new(
-        "Impostor Flashlight Size",
-        0.35f,
-        0.1f,
-        0.5f,
-        0.05f,
-        "#",
-        "#",
-        MiraNumberSuffixes.Multiplier)
-    {
-        Visible = () => OptionGroupSingleton<HnsCrewmateOptions>.Instance.FlashlightMode.Value,
-    };
-}

MiraAPI/HnsReimplemented/Options/HnsTaskOptions.cs

@@ -1,43 +0,0 @@
-using MiraAPI.GameModes;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
-using MiraAPI.Utilities;
-
-namespace MiraAPI.HnsReimplemented.Options;
-
-/// <inheritdoc />
-public class HnsTaskOptions : AbstractOptionGroup<HideAndSeekMode>
-{
-    /// <inheritdoc />
-    public override string GroupName => "Tasks";
-
-    public ModdedNumberOption CommonTasks { get; set; } = new(
-        "# Common Tasks",
-        1,
-        0,
-        4,
-        1,
-        "#",
-        "#",
-        MiraNumberSuffixes.None);
-
-    public ModdedNumberOption LongTasks { get; set; } = new(
-        "# Long Tasks",
-        1,
-        0,
-        4,
-        1,
-        "#",
-        "#",
-        MiraNumberSuffixes.None);
-
-    public ModdedNumberOption ShortTasks { get; set; } = new(
-        "# Short Tasks",
-        2,
-        0,
-        8,
-        1,
-        "#",
-        "#",
-        MiraNumberSuffixes.None);
-}

MiraAPI/Hud/CustomButtonManager.cs

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

MiraAPI/Hud/MiraHudHelper.cs

@@ -1,203 +0,0 @@
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using InnerNet;
-using MiraAPI.LocalSettings;
-using MiraAPI.Modifiers.ModifierDisplay;
-using Reactor.Utilities.Attributes;
-using Reactor.Utilities.Extensions;
-using UnityEngine;
-
-namespace MiraAPI.Hud;
-
-[RegisterInIl2Cpp]
-public sealed class MiraHudHelper(nint cppPtr) : MonoBehaviour(cppPtr)
-{
-    public static MiraHudHelper Instance { get; private set; }
-    public static GameObject ModifierDisplayObject;
-    public static GameObject VanillaMatchInfoButton;
-    public static bool ModifierDisplayOnRight;
-    public static GameObject ClonedChatButton;
-    public static GameObject ExtraUiTopRight;
-    public static GridArrange ExtraUiGrid;
-    public static AspectPosition ExtraUiAspectPos;
-    public static GameObject UiTopRight;
-    public static GridArrange UiGrid;
-    public static AspectPosition UiAspectPos;
-    public static GameObject SubmergedFloorButton;
-    public static SpriteRenderer SubmergedFloorButtonRenderer;
-    public static SpriteRenderer SubmergedFloorButtonRendererHover;
-    public void Awake()
-    {
-        Instance = this;
-    }
-
-    public void Start()
-    {
-        MiraApiSettings.OldButtonScaleFactor =
-            LocalSettingsTabSingleton<MiraApiSettings>.Instance.TopRightButtonsFactorSlider.Value;
-        StartCoroutine(MiraApiSettings.CoResizeSettingsUI().WrapToIl2Cpp());
-    }
-#pragma warning disable S2325
-    #pragma warning disable CA1822
-    public void FixedUpdate()
-    {
-        if (!HudManager.InstanceExists || !PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data)
-        {
-            return;
-        }
-
-        var instance = HudManager.Instance;
-
-        CreateUiRow(instance);
-        CreateNewUiRow(instance);
-        AdjustModifierTab();
-
-        if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data.Role ||
-            !ShipStatus.Instance ||
-            (AmongUsClient.Instance.GameState != InnerNetClient.GameStates.Started &&
-             !TutorialManager.InstanceExists))
-        {
-            return;
-        }
-        UpdateSubmergedButtons(instance);
-    }
-    #pragma warning restore CA1822
-    #pragma warning restore S2325
-
-    public static Vector3 BelowOptionPos = new(0.435f, 1.25f, 0f);
-    public static Vector3 FullTopPos = new(0.435f, 0.475f, 0f);
-    public static void CreateUiRow(HudManager instance)
-    {
-        if (!UiTopRight)
-        {
-            UiTopRight = instance.MapButton.transform.parent.gameObject;
-
-            UiGrid = UiTopRight.AddComponent<GridArrange>();
-            UiAspectPos = UiTopRight.AddComponent<AspectPosition>();
-
-            UiGrid.Alignment = GridArrange.StartAlign.Left;
-            UiGrid.CellSize = new Vector2(0.85f, 0.85f);
-            UiGrid.MaxColumns = 6;
-            UiAspectPos.Alignment = AspectPosition.EdgeAlignments.RightTop;
-            UiGrid.Start();
-            UiAspectPos.DistanceFromEdge = FullTopPos;
-            var mapButton = instance.MapButton.gameObject;
-            mapButton.GetComponent<AspectPosition>().Destroy();
-            var settingsButton = instance.SettingsButton;
-            settingsButton.GetComponent<AspectPosition>().Destroy();
-            VanillaMatchInfoButton = instance.MatchInfoButton.gameObject;
-            VanillaMatchInfoButton.GetComponent<AspectPosition>().Destroy();
-            var oldPos = settingsButton.transform.localPosition;
-            settingsButton.transform.localPosition = new Vector3(oldPos.x, oldPos.y, -100);
-            var chatButton = instance.Chat.chatButton.gameObject;
-            ClonedChatButton = Object.Instantiate(chatButton, chatButton.transform.parent);
-            ClonedChatButton.SetActive(false);
-            instance.Chat.chatButtonAspectPosition = ClonedChatButton.GetComponent<AspectPosition>();
-            chatButton.GetComponent<AspectPosition>().Destroy();
-            var inactivePos = settingsButton.transform.GetChild(1).transform.localPosition;
-            var bg = settingsButton.transform.GetChild(2).gameObject;
-            var bgPos = bg.transform.localPosition;
-            var bgSprite = bg.GetComponent<SpriteRenderer>().sprite;
-            var activePos = settingsButton.transform.GetChild(3).transform.localPosition;
-            var selectedPos = settingsButton.transform.GetChild(4).transform.localPosition;
-            chatButton.transform.GetChild(2).transform.localPosition = inactivePos;
-            var chatBg = chatButton.transform.GetChild(3);
-            chatBg.transform.localPosition = bgPos;
-            chatBg.GetComponent<SpriteRenderer>().sprite = bgSprite;
-            chatButton.transform.GetChild(4).transform.localPosition = activePos;
-            chatButton.transform.GetChild(5).transform.localPosition = selectedPos;
-            var collider = chatButton.GetComponent<BoxCollider2D>();
-            collider.size = new Vector2(0.4354f, 0.4003f);
-            collider.offset = new Vector2(0.0025f, 0.0254f);
-            if (FriendsListManager.InstanceExists && !TutorialManager.InstanceExists)
-            {
-                var listButton = FriendsListManager.Instance.FriendsListButton.transform.GetChild(0);
-                listButton.transform.SetParent(UiTopRight.transform, false);
-                FriendsListManager.Instance.FriendsListButton = listButton.GetComponent<FriendsListButton>();
-                listButton.GetComponent<AspectPosition>().Destroy();
-                listButton.localPosition = new Vector3(0, 0, 0);
-            }
-            settingsButton.transform.SetAsLastSibling();
-            chatButton.transform.SetParent(UiTopRight.transform, false);
-            instance.Chat.chatButton = chatButton.GetComponent<PassiveButton>();
-            var iconContainer = new GameObject("iconContainer")
-            {
-                layer = LayerMask.NameToLayer("UI"),
-            };
-            iconContainer.transform.SetParent(chatButton.transform, false);
-            iconContainer.transform.localPosition = new Vector3(0.1f, -0.1f, 0);
-            instance.Chat.chatNotifyDot.transform.SetParent(iconContainer.transform, false);
-            instance.Chat.chatNotifyDot = iconContainer.transform.GetChild(0).GetComponent<SpriteRenderer>();
-        }
-
-        if (UiTopRight && UiGrid)
-        {
-            var isChatButtonVisible = HudManager.Instance.Chat.isActiveAndEnabled;
-            instance.Chat.chatButton.gameObject.SetActive(isChatButtonVisible);
-            if (VanillaMatchInfoButton)
-            {
-                VanillaMatchInfoButton.SetActive(!GameSettingMenu.Instance && !Minigame.Instance);
-            }
-        }
-    }
-    public static void UpdateSubmergedButtons(HudManager instance)
-    {
-        if (ModCompatibility.IsSubmerged() && !SubmergedFloorButton && ExtraUiTopRight)
-        {
-            if (!SubmergedFloorButton && ExtraUiTopRight)
-            {
-                var transform = instance.MapButton.transform.parent.Find(instance.MapButton.name + "(Clone)");
-                if (transform != null)
-                {
-                    SubmergedFloorButton = transform.gameObject;
-                    SubmergedFloorButton.transform.SetParent(ExtraUiTopRight.transform, false);
-
-                    SubmergedFloorButtonRenderer =
-                        SubmergedFloorButton.transform.Find("Inactive").GetComponent<SpriteRenderer>();
-                    SubmergedFloorButtonRendererHover =
-                        SubmergedFloorButton.transform.Find("Active").GetComponent<SpriteRenderer>();
-
-                    MiraApiSettings.SetUpButtonPositions();
-                }
-            }
-        }
-    }
-
-    public static void AdjustModifierTab()
-    {
-        if (!ModifierDisplayObject && UiTopRight && ExtraUiTopRight && ModifierDisplayComponent.Instance)
-        {
-            ModifierDisplayObject = ModifierDisplayComponent.Instance?.gameObject ?? null!;
-            ModifierDisplayOnRight = !LocalSettingsTabSingleton<MiraApiSettings>.Instance.ModifiersHudLeftSide.Value;
-            if (ModifierDisplayOnRight)
-            {
-                ModifierDisplayObject.transform.SetParent(ExtraUiTopRight.transform, false);
-                ModifierDisplayObject.GetComponent<AspectPosition>().Destroy();
-                var oldPos = ModifierDisplayObject.transform.GetChild(0).localPosition;
-                ModifierDisplayObject.transform.GetChild(0).localPosition = new Vector3(-1.1757f, -2.1633f, oldPos.z);
-                oldPos = ModifierDisplayObject.transform.GetChild(1).localPosition;
-                ModifierDisplayObject.transform.GetChild(1).localPosition = new Vector3(-0.45f, 0.3f, oldPos.z);
-            }
-            MiraApiSettings.SetUpButtonPositions();
-        }
-    }
-    public static void CreateNewUiRow(HudManager instance)
-    {
-        if (!ExtraUiTopRight && UiTopRight)
-        {
-            ExtraUiTopRight = new GameObject("ExtraUiTopRight")
-            {
-                layer = UiTopRight.layer
-            };
-            ExtraUiTopRight.transform.SetParent(instance.MapButton.transform.parent.parent, false);
-
-            ExtraUiGrid = ExtraUiTopRight.AddComponent<GridArrange>();
-            ExtraUiAspectPos = ExtraUiTopRight.AddComponent<AspectPosition>();
-
-            ExtraUiGrid.Alignment = GridArrange.StartAlign.Left;
-            ExtraUiGrid.CellSize = new Vector2(0.85f, 0.85f);
-            ExtraUiAspectPos.Alignment = AspectPosition.EdgeAlignments.RightTop;
-            ExtraUiAspectPos.DistanceFromEdge = BelowOptionPos;
-            ExtraUiGrid.Start();
-        }
-    }
-}

MiraAPI/LocalSettings/SettingTypes/LocalSettingBase.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Linq;
 using BepInEx.Configuration;
-using MiraAPI.PluginLoading;
 using UnityEngine;
 
 namespace MiraAPI.LocalSettings.SettingTypes;
 
 /// <inheritdoc />
-[MiraIgnore]
 public abstract class LocalSettingBase<T> : ILocalSetting
 {
     /// <inheritdoc />

MiraAPI/MiraApiPlugin.cs

@@ -1,11 +1,9 @@
 global using static Reactor.Utilities.Logger<MiraAPI.MiraApiPlugin>;
 using System;
 using BepInEx;
-using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using MiraAPI.PluginLoading;
-using MiraAPI.VanillaEvents;
 using Reactor;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
@@ -20,21 +18,10 @@ namespace MiraAPI;
 [BepInAutoPlugin("mira.api", "MiraAPI")]
 [BepInProcess("Among Us.exe")]
 [BepInDependency(ReactorPlugin.Id)]
+[BepInDependency(ModCompatibility.SubmergedId, BepInDependency.DependencyFlags.SoftDependency)]
 [ReactorModFlags(ModFlags.RequireOnAllClients)]
-public partial class MiraApiPlugin : BasePlugin, IMiraPlugin
+public partial class MiraApiPlugin : BasePlugin
 {
-    /// <inheritdoc />
-    public ConfigFile GetConfigFile()
-    {
-        return Config;
-    }
-
-    /// <inheritdoc />
-    public string OptionsTitleText => "MiraAPI";
-
-    /// <inheritdoc />
-    public bool DisplayOnOptionsMenu => false;
-
     /// <summary>
     /// Gets a value indicating whether the current device is running Starlight (on mobile).
     /// </summary>
@@ -62,15 +49,10 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin
     public override void Load()
     {
         Harmony.PatchAll();
-        JudgeEvents.Initialize();
 
         ReactorCredits.Register("Mira API", Version, IsDevBuild, ReactorCredits.AlwaysShow);
 
         PluginManager = new MiraPluginManager();
-        PluginManager.Initialize(this, this);
-
-        IL2CPPChainloader.Instance.Finished +=
-            ModCompatibility
-                .Initialize; // Initialise AFTER the mods are loaded to ensure maximum parity (no need for the soft dependency either then)
+        PluginManager.Initialize();
     }
 }

MiraAPI/MiraApiSettings.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using BepInEx.Configuration;
-using MiraAPI.Hud;
+using BepInEx.Configuration;
 using MiraAPI.LocalSettings;
 using MiraAPI.LocalSettings.Attributes;
 using MiraAPI.Patches;
@@ -27,21 +25,15 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
     };
 
     /// <summary>
-    /// Gets or sets the value stored for scaling ability buttons properly.
+    /// Gets or sets the value stored for scaling buttons properly.
     /// </summary>
     public static float OldButtonScaleFactor { get; set; }
 
-    /// <summary>
-    /// Gets or sets the value stored for scaling UI buttons properly.
-    /// </summary>
-    public static float OldUiButtonScaleFactor { get; set; }
-
     /// <inheritdoc />
     public override void Open()
     {
         base.Open();
         OldButtonScaleFactor = ButtonUIFactorSlider.Value;
-        OldUiButtonScaleFactor = TopRightButtonsFactorSlider.Value;
     }
 
     /// <inheritdoc />
@@ -57,153 +49,12 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
             }
             OldButtonScaleFactor = ButtonUIFactorSlider.Value;
         }
-        else if (configEntry == TopRightButtonsFactorSlider)
-        {
-            if (MiraHudHelper.Instance)
-            {
-                ResizeUI(TopRightButtonsFactorSlider.Value);
-            }
-            OldUiButtonScaleFactor = TopRightButtonsFactorSlider.Value;
-        }
-        else if (configEntry == WikiOnBottomRow)
-        {
-            SetUpButtonPositions();
-        }
         else if (configEntry == SetFpsSlider)
         {
             Application.targetFrameRate = (int)SetFpsSlider.Value;
         }
     }
 
-    public static void SetUpButtonPositions()
-    {
-        var topUi = MiraHudHelper.UiTopRight;
-        var extraTopUi = MiraHudHelper.ExtraUiTopRight;
-        var wikiButton = MiraHudHelper.VanillaMatchInfoButton;
-        var subButton = MiraHudHelper.SubmergedFloorButton;
-        var modDisplay = MiraHudHelper.ModifierDisplayOnRight ? MiraHudHelper.ModifierDisplayObject : null!;
-        ResetButtonPositions();
-        if (topUi && extraTopUi)
-        {
-            var opts = LocalSettingsTabSingleton<MiraApiSettings>.Instance;
-            if (wikiButton)
-            {
-                wikiButton.transform.SetParent(opts.WikiOnBottomRow.Value ? extraTopUi.transform : topUi.transform);
-            }
-            if (subButton)
-            {
-                subButton.transform.SetParent(extraTopUi.transform);
-            }
-            if (modDisplay)
-            {
-                modDisplay.transform.SetParent(extraTopUi.transform);
-            }
-            MiraHudHelper.UiGrid.ArrangeChilds();
-            MiraHudHelper.ExtraUiGrid.ArrangeChilds();
-        }
-    }
-
-    public static void ResetButtonPositions()
-    {
-        var topUi = MiraHudHelper.UiTopRight;
-        var extraTopUi = MiraHudHelper.ExtraUiTopRight;
-        var subButton = MiraHudHelper.SubmergedFloorButton;
-        var modDisplay = MiraHudHelper.ModifierDisplayOnRight ? MiraHudHelper.ModifierDisplayObject : null!;
-        if (topUi && extraTopUi)
-        {
-            var wikiButton = MiraHudHelper.VanillaMatchInfoButton;
-            if (wikiButton)
-            {
-                wikiButton.transform.SetParent(null);
-            }
-            if (subButton)
-            {
-                subButton.transform.SetParent(null);
-            }
-            if (modDisplay)
-            {
-                modDisplay.transform.SetParent(null);
-            }
-        }
-    }
-
-    public static IEnumerator CoResizeSettingsUI()
-    {
-        while (!HudManager.Instance || !MiraHudHelper.UiGrid || !MiraHudHelper.ExtraUiGrid)
-        {
-            yield return null;
-        }
-
-        yield return new WaitForSeconds(0.01f);
-        ResizeUI(LocalSettingsTabSingleton<MiraApiSettings>.Instance.TopRightButtonsFactorSlider.Value);
-    }
-
-    public static void ResizeUI(float scaleFactor)
-    {
-        var alteredScale = scaleFactor * 0.85f;
-        var actualScaleVal = scaleFactor * 1.176470588235294f;
-        var actualScale = new Vector3(actualScaleVal, actualScaleVal, 1);
-        var baseAspect = MiraHudHelper.UiAspectPos;
-        var baseGrid = MiraHudHelper.UiGrid;
-        var baseUi = MiraHudHelper.UiTopRight;
-        if (baseUi && baseAspect && baseGrid)
-        {
-            baseAspect.DistanceFromEdge = new Vector2(0.435f * scaleFactor, 0.475f * scaleFactor);
-
-            foreach (var button in baseUi.GetComponentsInChildren<PassiveButton>(true))
-            {
-                if (button.gameObject == null)
-                {
-                    continue;
-                }
-                if (button.transform.name.Contains("Friends List Button"))
-                {
-                    button.gameObject.transform.localScale = new Vector3(0.2675f * actualScaleVal, 0.2675f * actualScaleVal, 1);
-                    continue;
-                }
-
-                button.gameObject.transform.localScale = actualScale;
-            }
-
-            baseGrid.CellSize = new Vector2(alteredScale, alteredScale);
-            if (baseGrid.gameObject.transform.childCount != 0)
-            {
-                baseGrid.ArrangeChilds();
-            }
-            baseAspect.AdjustPosition();
-        }
-
-        var extraAspect = MiraHudHelper.ExtraUiAspectPos;
-        var extraGrid = MiraHudHelper.ExtraUiGrid;
-        var extraUi = MiraHudHelper.ExtraUiTopRight;
-        if (extraUi && extraAspect && extraGrid)
-        {
-            extraAspect.DistanceFromEdge = new Vector3(0.435f * scaleFactor, 1.25f * scaleFactor, 0f);
-
-            foreach (var button in extraUi.GetAllChildren())
-            {
-                if (button.gameObject == null)
-                {
-                    continue;
-                }
-                if (button.transform.name.Contains("Modifiers"))
-                {
-                    button.gameObject.transform.localScale = new Vector3(0.65f * scaleFactor, 0.65f * scaleFactor, 1);
-                    continue;
-                }
-
-                button.gameObject.transform.localScale = actualScale;
-            }
-
-            extraGrid.CellSize = new Vector2(alteredScale, alteredScale);
-            if (extraGrid.gameObject.transform.childCount != 0)
-            {
-                extraGrid.ArrangeChilds();
-            }
-            extraAspect.AdjustPosition();
-        }
-    }
-
     /// <summary>
     /// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
     /// </summary>
@@ -217,19 +68,12 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
     public ConfigEntry<bool> ShowKeybinds { get; private set; } = config.Bind("Visuals/UI", "Show Keybinds on Buttons", true);
 
     /// <summary>
-    /// Gets the scale of the ability buttons.
+    /// Gets the scale of the buttons.
     /// </summary>
     [LocalSliderSetting(min: 0.5f, max: 1.5f, suffixType: MiraNumberSuffixes.Multiplier, formatString: "0.00", displayValue: true)]
     public ConfigEntry<float> ButtonUIFactorSlider { get; private set; } =
         config.Bind("Visuals/UI", "Button Scale Factor", 0.75f);
 
-    /// <summary>
-    /// Gets the scale of the UI buttons.
-    /// </summary>
-    [LocalSliderSetting(min: 0.3f, max: 2f, suffixType: MiraNumberSuffixes.Multiplier, formatString: "0.00", displayValue: true)]
-    public ConfigEntry<float> TopRightButtonsFactorSlider { get; private set; } =
-        config.Bind("Visuals/UI", "Top-Right UI Scale Factor", 1f);
-
     /// <summary>
     /// Gets the fps specified by the player.
     /// </summary>
@@ -237,10 +81,6 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
     public ConfigEntry<float> SetFpsSlider { get; private set; } =
         config.Bind("Visuals/UI", "Max FPS", 120f);
 
-    [LocalToggleSetting]
-    public ConfigEntry<bool> WikiOnBottomRow { get; private set; } =
-        config.Bind("Visuals/UI", "Display Wiki on Bottom Row", true);
-
     /// <summary>
     /// Gets whether to apply cosmetic changes to the TaskAdder.
     /// </summary>

MiraAPI/ModCompatibility.cs

@@ -1,6 +1,6 @@
-using System.Reflection;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using BepInEx.Unity.IL2CPP;
-using SemanticVersioning;
 
 namespace MiraAPI;
 
@@ -14,36 +14,15 @@ public static class ModCompatibility
     /// </summary>
     public const string SubmergedId = "Submerged";
 
-    public static Version SubVersion { get; private set; }
-    public static bool SubLoaded { get; private set; }
-    public static BasePlugin SubPlugin { get; private set; }
-    public static Assembly SubAssembly { get; private set; }
-
-    public const ShipStatus.MapType SubmergedMapType = (ShipStatus.MapType)6;
-
-    public static void Initialize()
+    /// <summary>
+    /// Checks if the Submerged mod is loaded.
+    /// </summary>
+    /// <param name="submergedAssembly">Submerged mod assembly if loaded, <see langword="null"/> otherwise.</param>
+    /// <returns><see langword="true"/> if the Submerged mod is loaded, <see langword="false"/> otherwise.</returns>
+    public static bool SubmergedLoaded([NotNullWhen(true)] out Assembly? submergedAssembly)
     {
-        InitSubmerged();
-    }
-
-    public static void InitSubmerged()
-    {
-        if (!IL2CPPChainloader.Instance.Plugins.TryGetValue(SubmergedId, out var plugin))
-        {
-            return;
-        }
-
-        SubPlugin = (plugin!.Instance as BasePlugin)!;
-        SubVersion = plugin.Metadata.Version;
-
-        SubAssembly = SubPlugin.GetType().Assembly;
-
-        SubLoaded = true;
-        Message("Submerged was detected");
-    }
-
-    public static bool IsSubmerged()
-    {
-        return SubLoaded && ShipStatus.Instance && ShipStatus.Instance.Type == SubmergedMapType;
+        var result = IL2CPPChainloader.Instance.Plugins.TryGetValue(SubmergedId, out var plugin);
+        submergedAssembly = result ? plugin?.Instance.GetType().Assembly : null;
+        return result;
     }
 }

MiraAPI/Modifiers/ModifierManager.cs

@@ -136,10 +136,7 @@ public static class ModifierManager
             var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
             if (validPlayers.Count == 0)
             {
-                if (MiraApiPlugin.IsDevBuild)
-                {
-                    Warning($"No valid players for modifier {modifier.ModifierName}");
-                }
+                Warning($"No valid players for modifier {modifier.ModifierName}");
                 continue;
             }
 
@@ -160,23 +157,15 @@ public static class ModifierManager
 
                 if (candidates.Count == 0)
                 {
-                    if (MiraApiPlugin.IsDevBuild)
-                    {
-                        Warning(
-                            $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
-                    }
-
+                    Warning(
+                        $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
                     break;
                 }
 
                 var plr = candidates.Random();
                 if (plr == null)
                 {
-                    if (MiraApiPlugin.IsDevBuild)
-                    {
-                        Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
-                    }
-
+                    Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
                     continue;
                 }
 

MiraAPI/Modifiers/Types/GameModifier.cs

@@ -1,12 +1,8 @@
-using MiraAPI.GameModes;
-using MiraAPI.PluginLoading;
-
-namespace MiraAPI.Modifiers.Types;
+namespace MiraAPI.Modifiers.Types;
 
 /// <summary>
 /// The base class for a game modifier. Game modifiers are applied at the start of the game on top of the player's role.
 /// </summary>
-[MiraIgnore]
 public abstract class GameModifier : BaseModifier
 {
     /// <inheritdoc />
@@ -55,5 +51,5 @@ public abstract class GameModifier : BaseModifier
     /// Determines whether the modifier can spawn in general, accounting for gamemodes and everything else.
     /// </summary>
     /// <returns><see langword="true"/> if the modifier is able to spawn, otherwise <see langword="false"/>.</returns>
-    public virtual bool CanSpawnOnCurrentMode() => CustomGameModeManager.IsClassic() && !GameManager.Instance.IsHideAndSeek();
+    public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
 }

MiraAPI/Modifiers/Types/TimedModifier.cs

@@ -1,6 +1,4 @@
 using System;
-using MiraAPI.PluginLoading;
-using Reactor.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Modifiers.Types;
@@ -8,7 +6,6 @@ namespace MiraAPI.Modifiers.Types;
 /// <summary>
 /// The base class for all timed modifiers. Timed modifiers have a duration and can be started and stopped.
 /// </summary>
-[MiraIgnore]
 public abstract class TimedModifier : BaseModifier
 {
     /// <summary>

MiraAPI/Networking/CustomMurderRpc.cs

@@ -7,7 +7,6 @@ using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.GameModes;
 using MiraAPI.Utilities;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
@@ -85,15 +84,13 @@ public static class CustomMurderRpc
 
         var beforeMurderEvent = new BeforeMurderEvent(source, target, inMeeting);
         MiraEventManager.InvokeEvent(beforeMurderEvent);
-        var defenseFlag = beforeMurderEvent.IgnoreDefense;
-        var indirectFlag = beforeMurderEvent.IsIndirectAttack;
         var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null;
         if ((inMeeting is MeetingCheck.ForMeeting && !isMeetingActive) || (inMeeting is MeetingCheck.OutsideMeeting && isMeetingActive))
         {
             beforeMurderEvent.Cancel();
         }
 
-        if (!defenseFlag && target.ProtectedByGa())
+        if (target.ProtectedByGa())
         {
             beforeMurderEvent.Cancel();
             murderResultFlags = MurderResultFlags.FailedProtected;
@@ -117,8 +114,6 @@ public static class CustomMurderRpc
             PlayerControl.LocalPlayer,
             source,
             target,
-            indirectFlag,
-            defenseFlag,
             murderResultFlags,
             resetKillTimer,
             createDeadBody,
@@ -133,8 +128,6 @@ public static class CustomMurderRpc
     /// <param name="host">The game host.</param>
     /// <param name="source">The killer.</param>
     /// <param name="target">The player to murder.</param>
-    /// <param name="isIndirect">Should the kill be indirect.</param>
-    /// <param name="ignoreDefense">Should the kill ignore defense.</param>
     /// <param name="murderResultFlags">End result for the murder.</param>
     /// <param name="resetKillTimer">Should the kill timer be reset.</param>
     /// <param name="createDeadBody">Should a dead body be created.</param>
@@ -146,149 +139,6 @@ public static class CustomMurderRpc
         this PlayerControl host,
         PlayerControl source,
         PlayerControl target,
-        bool isIndirect,
-        bool ignoreDefense,
-        MurderResultFlags murderResultFlags,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        if (LobbyBehaviour.Instance || !host.IsHost() || target.Data.IsDead || target.Data.Disconnected)
-        {
-            source.isKilling = false;
-            return;
-        }
-
-        var murderResultFlags2 = MurderResultFlags.DecisionByHost | murderResultFlags;
-
-        if (isIndirect || ignoreDefense)
-        {
-            source.CustomMurder(
-                target,
-                null,
-                isIndirect,
-                ignoreDefense,
-                murderResultFlags2,
-                resetKillTimer,
-                createDeadBody,
-                teleportMurderer,
-                showKillAnim,
-                playKillSound);
-        }
-        else
-        {
-            source.CustomMurder(
-                target,
-                murderResultFlags2,
-                resetKillTimer,
-                createDeadBody,
-                teleportMurderer,
-                showKillAnim,
-                playKillSound);
-        }
-    }
-
-    /// <summary>
-    /// Networked Custom Murder method, which checks for meetings as well, ran by clients for the host to confirm kills.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
-    /// <param name="isIndirect">Should the kill be indirect.</param>
-    /// <param name="ignoreDefense">Should the kill ignore defense.</param>
-    /// <param name="didSucceed">Whether the murder was successful or not.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.AdvancedCustomMurder, LocalHandling = RpcLocalHandling.Before)]
-    public static void RpcAdvancedCustomMurder(
-        this PlayerControl source,
-        PlayerControl target,
-        MeetingCheck inMeeting,
-        bool isIndirect,
-        bool ignoreDefense = false,
-        bool didSucceed = true,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        if (LobbyBehaviour.Instance)
-        {
-            return;
-        }
-        var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
-
-        var beforeMurderEvent = new BeforeMurderEvent(source, target, isIndirect, ignoreDefense, inMeeting);
-        MiraEventManager.InvokeEvent(beforeMurderEvent);
-        var defenseFlag = beforeMurderEvent.IgnoreDefense;
-        var indirectFlag = beforeMurderEvent.IsIndirectAttack;
-        var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null;
-        if ((inMeeting is MeetingCheck.ForMeeting && !isMeetingActive) || (inMeeting is MeetingCheck.OutsideMeeting && isMeetingActive))
-        {
-            beforeMurderEvent.Cancel();
-        }
-
-        if (!defenseFlag && target.ProtectedByGa())
-        {
-            beforeMurderEvent.Cancel();
-            murderResultFlags = MurderResultFlags.FailedProtected;
-        }
-        else if (beforeMurderEvent.IsCancelled)
-        {
-            murderResultFlags = MurderResultFlags.FailedError;
-        }
-
-        if (beforeMurderEvent.IsCancelled && source.AmOwner)
-        {
-            source.isKilling = true;
-        }
-
-        if (!PlayerControl.LocalPlayer.IsHost())
-        {
-            return;
-        }
-
-        RpcConfirmAdvancedCustomMurder(
-            PlayerControl.LocalPlayer,
-            source,
-            target,
-            indirectFlag,
-            defenseFlag,
-            murderResultFlags,
-            resetKillTimer,
-            createDeadBody,
-            teleportMurderer,
-            showKillAnim,
-            playKillSound);
-    }
-
-    /// <summary>
-    /// Networked Custom Murder method, which checks for meetings as well, ran by clients for the host to confirm kills.
-    /// </summary>
-    /// <param name="host">The game host.</param>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="isIndirect">Should the kill be indirect.</param>
-    /// <param name="ignoreDefense">Should the kill ignore defense.</param>
-    /// <param name="murderResultFlags">End result for the murder.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.ConfirmAdvancedCustomMurder, LocalHandling = RpcLocalHandling.After)]
-    public static void RpcConfirmAdvancedCustomMurder(
-        this PlayerControl host,
-        PlayerControl source,
-        PlayerControl target,
-        bool isIndirect,
-        bool ignoreDefense,
         MurderResultFlags murderResultFlags,
         bool resetKillTimer = true,
         bool createDeadBody = true,
@@ -306,9 +156,6 @@ public static class CustomMurderRpc
 
         source.CustomMurder(
             target,
-            null,
-            isIndirect,
-            ignoreDefense,
             murderResultFlags2,
             resetKillTimer,
             createDeadBody,
@@ -318,145 +165,10 @@ public static class CustomMurderRpc
     }
 
     /// <summary>
-    /// Networked Custom Murder method, which checks for meetings as well, ran by clients for the host to confirm kills.
+    /// Custom Murder method without networking. If you need a networked version, use <see cref="RpcCustomMurder(PlayerControl, PlayerControl, bool, bool, bool, bool, bool, bool)"/>.
     /// </summary>
     /// <param name="source">The killer.</param>
     /// <param name="target">The player to murder.</param>
-    /// <param name="framed">The player to frame.</param>
-    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
-    /// <param name="isIndirect">Should the kill be indirect.</param>
-    /// <param name="ignoreDefense">Should the kill ignore defense.</param>
-    /// <param name="didSucceed">Whether the murder was successful or not.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the framed player be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.FramedCustomMurder, LocalHandling = RpcLocalHandling.Before)]
-    public static void RpcFramedCustomMurder(
-        this PlayerControl source,
-        PlayerControl target,
-        PlayerControl framed,
-        MeetingCheck inMeeting,
-        bool isIndirect = true,
-        bool ignoreDefense = false,
-        bool didSucceed = true,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        if (LobbyBehaviour.Instance)
-        {
-            return;
-        }
-        var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
-
-        var beforeMurderEvent = new BeforeMurderEvent(source, target, framed, isIndirect, ignoreDefense, inMeeting);
-        MiraEventManager.InvokeEvent(beforeMurderEvent);
-        var defenseFlag = beforeMurderEvent.IgnoreDefense;
-        var indirectFlag = beforeMurderEvent.IsIndirectAttack;
-        var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null;
-        if ((inMeeting is MeetingCheck.ForMeeting && !isMeetingActive) || (inMeeting is MeetingCheck.OutsideMeeting && isMeetingActive))
-        {
-            beforeMurderEvent.Cancel();
-        }
-
-        if (!defenseFlag && target.ProtectedByGa())
-        {
-            beforeMurderEvent.Cancel();
-            murderResultFlags = MurderResultFlags.FailedProtected;
-        }
-        else if (beforeMurderEvent.IsCancelled)
-        {
-            murderResultFlags = MurderResultFlags.FailedError;
-        }
-
-        if (beforeMurderEvent.IsCancelled && source.AmOwner)
-        {
-            source.isKilling = true;
-        }
-
-        if (!PlayerControl.LocalPlayer.IsHost())
-        {
-            return;
-        }
-
-        RpcConfirmFramedCustomMurder(
-            PlayerControl.LocalPlayer,
-            source,
-            target,
-            framed,
-            indirectFlag,
-            defenseFlag,
-            murderResultFlags,
-            resetKillTimer,
-            createDeadBody,
-            teleportMurderer,
-            showKillAnim,
-            playKillSound);
-    }
-
-    /// <summary>
-    /// Networked Custom Murder method, which checks for meetings as well, ran by clients for the host to confirm kills.
-    /// </summary>
-    /// <param name="host">The game host.</param>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="framed">The player to frame.</param>
-    /// <param name="isIndirect">Should the kill be indirect.</param>
-    /// <param name="ignoreDefense">Should the kill ignore defense.</param>
-    /// <param name="murderResultFlags">End result for the murder.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the framed player be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    [MethodRpc((uint)MiraRpc.ConfirmFramedCustomMurder, LocalHandling = RpcLocalHandling.After)]
-    public static void RpcConfirmFramedCustomMurder(
-        this PlayerControl host,
-        PlayerControl source,
-        PlayerControl target,
-        PlayerControl framed,
-        bool isIndirect,
-        bool ignoreDefense,
-        MurderResultFlags murderResultFlags,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        if (LobbyBehaviour.Instance || !host.IsHost() || target.Data.IsDead || target.Data.Disconnected)
-        {
-            source.isKilling = false;
-            return;
-        }
-
-        var murderResultFlags2 = MurderResultFlags.DecisionByHost | murderResultFlags;
-
-        source.CustomMurder(
-            target,
-            framed,
-            isIndirect,
-            ignoreDefense,
-            murderResultFlags2,
-            resetKillTimer,
-            createDeadBody,
-            teleportMurderer,
-            showKillAnim,
-            playKillSound);
-    }
-
-    /// <summary>
-    /// Custom Murder method without networking. If you need a networked version, use <see cref="RpcFramedCustomMurder"/> or <see cref="RpcAdvancedCustomMurder"/>.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="framed">The player to frame, if any.</param>
-    /// <param name="isIndirect">Should the kill be indirect.</param>
-    /// <param name="ignoreDefense">Should the kill ignore defense.</param>
     /// <param name="resultFlags">Murder result flags.</param>
     /// <param name="resetKillTimer">Should the kill timer be reset.</param>
     /// <param name="createDeadBody">Should a dead body be created.</param>
@@ -466,9 +178,6 @@ public static class CustomMurderRpc
     public static void CustomMurder(
         this PlayerControl source,
         PlayerControl target,
-        PlayerControl? framed,
-        bool isIndirect,
-        bool ignoreDefense,
         MurderResultFlags resultFlags,
         bool resetKillTimer = true,
         bool createDeadBody = true,
@@ -482,9 +191,8 @@ public static class CustomMurderRpc
             return;
         }
 
-        if (!ignoreDefense && (resultFlags.HasFlag(MurderResultFlags.FailedProtected) ||
-                               (resultFlags.HasFlag(MurderResultFlags.DecisionByHost) &&
-                                target.protectedByGuardianId > -1)))
+        if (resultFlags.HasFlag(MurderResultFlags.FailedProtected) ||
+            (resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.protectedByGuardianId > -1))
         {
             target.protectedByGuardianThisRound = true;
             var flag = PlayerControl.LocalPlayer.Data.Role.Role == RoleTypes.GuardianAngel;
@@ -582,141 +290,7 @@ public static class CustomMurderRpc
             source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,
             source.shapeshiftTargetPlayerId,
             target.PlayerId);
-        source.MyPhysics.StartCoroutine(source.KillAnimations.RandomSnapshot().CoPerformCustomKill(source, target, framed, isIndirect, ignoreDefense, createDeadBody, teleportMurderer));
-    }
-
-    /// <summary>
-    /// Custom Murder method without networking. If you need a networked version, use <see cref="RpcCustomMurder(PlayerControl, PlayerControl, bool, bool, bool, bool, bool, bool)"/>.
-    /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The player to murder.</param>
-    /// <param name="resultFlags">Murder result flags.</param>
-    /// <param name="resetKillTimer">Should the kill timer be reset.</param>
-    /// <param name="createDeadBody">Should a dead body be created.</param>
-    /// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
-    /// <param name="showKillAnim">Should the kill animation be shown.</param>
-    /// <param name="playKillSound">Should the kill sound be played.</param>
-    public static void CustomMurder(
-        this PlayerControl source,
-        PlayerControl target,
-        MurderResultFlags resultFlags,
-        bool resetKillTimer = true,
-        bool createDeadBody = true,
-        bool teleportMurderer = true,
-        bool showKillAnim = true,
-        bool playKillSound = true)
-    {
-        source.isKilling = false;
-        if (resultFlags.HasFlag(MurderResultFlags.FailedError) || LobbyBehaviour.Instance)
-        {
-            return;
-        }
-
-        if (resultFlags.HasFlag(MurderResultFlags.FailedProtected) ||
-            (resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.protectedByGuardianId > -1))
-        {
-            target.protectedByGuardianThisRound = true;
-            var flag = PlayerControl.LocalPlayer.Data.Role.Role == RoleTypes.GuardianAngel;
-            if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
-            {
-                DataManager.Player.Stats.IncrementStat(StatID.Role_GuardianAngel_CrewmatesProtected);
-                AchievementManager.Instance.OnProtectACrewmate();
-            }
-
-            if (source.AmOwner || flag)
-            {
-                target.ShowFailedMurder();
-
-                if (resetKillTimer)
-                {
-                    source.SetKillTimer(
-                        CustomGameModeManager.ActiveMode != null
-                            ? CustomGameModeManager.ActiveMode.DefaultImpostorKillCooldown / 2f
-                            : GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown) /
-                              2f);
-                }
-            }
-            else
-            {
-                target.RemoveProtection();
-            }
-
-            return;
-        }
-
-        if (!resultFlags.HasFlag(MurderResultFlags.Succeeded) &&
-            !resultFlags.HasFlag(MurderResultFlags.DecisionByHost))
-        {
-            return;
-        }
-
-        DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
-        if (source.AmOwner)
-        {
-            DataManager.Player.Stats.IncrementStat(
-                GameManager.Instance.IsHideAndSeek()
-                    ? StatID.HideAndSeek_ImpostorKills
-                    : StatID.ImpostorKills);
-
-            if (source.CurrentOutfitType == PlayerOutfitType.Shapeshifted)
-            {
-                DataManager.Player.Stats.IncrementStat(StatID.Role_Shapeshifter_ShiftedKills);
-            }
-
-            if (Constants.ShouldPlaySfx() && playKillSound)
-            {
-                SoundManager.Instance.PlaySound(source.KillSfx, false, 0.8f);
-            }
-
-            if (resetKillTimer)
-            {
-                source.SetKillTimer(CustomGameModeManager.ActiveMode != null
-                    ? CustomGameModeManager.ActiveMode.DefaultImpostorKillCooldown
-                    : GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown));
-            }
-        }
-
-        UnityTelemetry.Instance.WriteMurder();
-        target.gameObject.layer = LayerMask.NameToLayer("Ghost");
-        if (target.AmOwner)
-        {
-            DataManager.Player.Stats.IncrementStat(StatID.TimesMurdered);
-            if (Minigame.Instance)
-            {
-                try
-                {
-                    Minigame.Instance.Close();
-                    Minigame.Instance.Close();
-                }
-                catch
-                {
-                    // ignored
-                }
-            }
-
-            if (showKillAnim)
-            {
-                try
-                {
-                    HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, target.Data);
-                }
-                catch (Exception e)
-                {
-                    Error($"Error with kill animation: {e.ToString()}");
-                }
-            }
-
-            target.cosmetics.SetNameMask(false);
-            target.RpcSetScanner(false);
-        }
-
-        AchievementManager.Instance.OnMurder(
-            source.AmOwner,
-            target.AmOwner,
-            source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,
-            source.shapeshiftTargetPlayerId,
-            target.PlayerId);
-        source.MyPhysics.StartCoroutine(source.KillAnimations.RandomSnapshot().CoPerformCustomKill(source, target, null, false, false, createDeadBody, teleportMurderer));
+        source.MyPhysics.StartCoroutine(source.KillAnimations.RandomSnapshot().CoPerformCustomKill(source, target, createDeadBody, teleportMurderer));
     }
 
     /// <summary>
@@ -725,9 +299,6 @@ public static class CustomMurderRpc
     /// <param name="anim">The kill animation.</param>
     /// <param name="source">The murderer.</param>
     /// <param name="target">The murdered player.</param>
-    /// <param name="framed">The framed player, if any.</param>
-    /// <param name="isIndirect">Was the kill indirect.</param>
-    /// <param name="ignoreDefense">Would the kill ignore defense.</param>
     /// <param name="createDeadBody">Should a dead body be created.</param>
     /// <param name="teleportMurderer">Should the murder be teleported.</param>
     /// <returns>Coroutine.</returns>
@@ -735,9 +306,6 @@ public static class CustomMurderRpc
         this KillAnimation anim,
         PlayerControl source,
         PlayerControl target,
-        PlayerControl? framed,
-        bool isIndirect,
-        bool ignoreDefense,
         bool createDeadBody = true,
         bool teleportMurderer = true)
     {
@@ -746,13 +314,12 @@ public static class CustomMurderRpc
             yield break;
         }
         var cam = Camera.main?.GetComponent<FollowerCamera>();
-        var playerToLunge = framed ?? source;
-        var isParticipant = playerToLunge.AmOwner || target.AmOwner;
-        var sourcePhys = playerToLunge.MyPhysics;
+        var isParticipant = source.AmOwner || target.AmOwner;
+        var sourcePhys = source.MyPhysics;
 
         if (teleportMurderer)
         {
-            KillAnimation.SetMovement(playerToLunge, false);
+            KillAnimation.SetMovement(source, false);
         }
 
         KillAnimation.SetMovement(target, false);
@@ -806,7 +373,7 @@ public static class CustomMurderRpc
             yield return source.MyPhysics.Animations.CoPlayCustomAnimation(anim.BlurAnim);
             sourcePhys.Animations.PlayIdleAnimation();
             source.NetTransform.SnapTo(target.transform.position);
-            KillAnimation.SetMovement(playerToLunge, true);
+            KillAnimation.SetMovement(source, true);
         }
 
         KillAnimation.SetMovement(target, true);
@@ -816,7 +383,7 @@ public static class CustomMurderRpc
             deadBody.enabled = true;
         }
 
-        var afterMurderEvent = framed != null ? new AfterMurderEvent(source, target, framed, deadBody, isIndirect, ignoreDefense) : new AfterMurderEvent(source, target, deadBody, isIndirect, ignoreDefense);
+        var afterMurderEvent = new AfterMurderEvent(source, target, deadBody);
         MiraEventManager.InvokeEvent(afterMurderEvent);
 
         if (!isParticipant)

MiraAPI/Networking/MiraRpc.cs

@@ -40,26 +40,6 @@ public enum MiraRpc : uint
     /// </summary>
     ConfirmCustomMurder,
 
-    /// <summary>
-    /// Advanced Custom Murder RPC.
-    /// </summary>
-    AdvancedCustomMurder,
-
-    /// <summary>
-    /// Advanced Custom Murder RPC Confirmation.
-    /// </summary>
-    ConfirmAdvancedCustomMurder,
-
-    /// <summary>
-    /// Framed Custom Murder RPC.
-    /// </summary>
-    FramedCustomMurder,
-
-    /// <summary>
-    /// Framed Custom Murder RPC Confirmation.
-    /// </summary>
-    ConfirmFramedCustomMurder,
-
     /// <summary>
     /// Custom Game Over RPC.
     /// </summary>
@@ -74,14 +54,4 @@ public enum MiraRpc : uint
     /// Custom RPC to replace Among Us CastVote.
     /// </summary>
     CastVote,
-
-    /// <summary>
-    /// Custom RPC to replace Among Us QueueOverruleVotes.
-    /// </summary>
-    QueueOverruleVotes,
-
-    /// <summary>
-    /// Custom RPC to sync the Gamemode option.
-    /// </summary>
-    SyncGamemodeOption,
 }

MiraAPI/Patches/AmongUsClientSyncPatch.cs

@@ -2,7 +2,6 @@
 using InnerNet;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Player;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Roles;
 
@@ -33,7 +32,6 @@ internal static class AmongUsClientSyncPatch
 
         ModdedOptionsManager.SyncAllOptions(clientData.Id);
         CustomRoleManager.SyncAllRoleSettings(clientData.Id);
-        GameModeOption.RpcSyncGamemode(PlayerControl.LocalPlayer, GameModeOption.Value);
     }
 
     [HarmonyPostfix]

MiraAPI/Patches/GameModes/BodyTypePatch.cs

@@ -1,20 +0,0 @@
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(IntroCutscene), nameof(IntroCutscene.CoBegin))]
-internal static class BodyTypePatch
-{
-    public static bool Prefix(IntroCutscene __instance, ref Il2CppSystem.Collections.IEnumerator __result)
-    {
-        if (CustomGameModeManager.ActiveMode?.ShowGameModeIntroCutscene == true)
-        {
-            __result = CustomGameModeManager.ActiveMode.IntroCutscene(__instance).WrapToIl2Cpp();
-            return false;
-        }
-
-        return true;
-    }
-}

MiraAPI/Patches/GameModes/ConsolePatches.cs

@@ -1,18 +1,14 @@
-using HarmonyLib;
-using InnerNet;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
+/*
 [HarmonyPatch]
-internal static class ConsolePatches
+public static class ConsolePatches
 {
-    [HarmonyPrefix, HarmonyPatch(typeof(Console), nameof(Console.CanUse))]
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(Console), nameof(Console.CanUse))]
     public static bool CanUsePatch(Console __instance, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] out bool canUse, [HarmonyArgument(2)] out bool couldUse)
     {
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
-            if (CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanUseTasks(__instance))
+            if (CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.CanUseConsole(__instance))
             {
                 var task = __instance.FindTask(pc.Object);
 
@@ -35,15 +31,15 @@ internal static class ConsolePatches
         return true;
     }
 
-    [HarmonyPrefix, HarmonyPatch(typeof(SystemConsole), nameof(SystemConsole.CanUse))]
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(SystemConsole), nameof(SystemConsole.CanUse))]
     public static bool SystemCanUsePatch(SystemConsole __instance, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] out bool canUse, [HarmonyArgument(2)] out bool couldUse)
     {
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
-            if (CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanUseSystemConsole(__instance))
+            if (CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.CanUseSystemConsole(__instance))
             {
-                canUse = couldUse = true;
-                return true;
+                return canUse = couldUse = true;
             }
 
             canUse = couldUse = false;
@@ -54,15 +50,15 @@ internal static class ConsolePatches
         return true;
     }
 
-    [HarmonyPrefix, HarmonyPatch(typeof(MapConsole), nameof(MapConsole.CanUse))]
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(MapConsole), nameof(MapConsole.CanUse))]
     public static bool MapCanUsePatch(MapConsole __instance, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] out bool canUse, [HarmonyArgument(2)] out bool couldUse)
     {
         if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
         {
-            if (CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanUseMapConsole(__instance))
+            if (CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.CanUseMapConsole(__instance))
             {
-                canUse = couldUse = true;
-                return true;
+                return canUse = couldUse = true;
             }
 
             canUse = couldUse = false;
@@ -72,40 +68,4 @@ internal static class ConsolePatches
         canUse = couldUse = true;
         return true;
     }
-
-    [HarmonyPrefix, HarmonyPatch(typeof(MapConsole), nameof(MapConsole.Use))]
-    public static bool MapUsePatch(MapConsole __instance)
-    {
-        if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
-        {
-            return CustomGameModeManager.ActiveMode == null ||
-                   CustomGameModeManager.ActiveMode.CanUseMapConsole(__instance);
-        }
-
-        return true;
-    }
-
-    [HarmonyPrefix, HarmonyPatch(typeof(SystemConsole), nameof(SystemConsole.Use))]
-    public static bool SystemUsePatch(SystemConsole __instance)
-    {
-        if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
-        {
-            return CustomGameModeManager.ActiveMode == null ||
-                   CustomGameModeManager.ActiveMode.CanUseSystemConsole(__instance);
-        }
-
-        return true;
-    }
-
-    [HarmonyPrefix, HarmonyPatch(typeof(Console), nameof(Console.Use))]
-    public static bool ConsoleUsePatch(Console __instance)
-    {
-        if (AmongUsClient.Instance.GameState == InnerNetClient.GameStates.Started && ShipStatus.Instance)
-        {
-            return CustomGameModeManager.ActiveMode == null ||
-                   CustomGameModeManager.ActiveMode.CanUseTasks(__instance);
-        }
-
-        return true;
-    }
-}
+}*/

MiraAPI/Patches/GameModes/CreateOptionsPatch.cs

@@ -1,18 +0,0 @@
-using HarmonyLib;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(CreateOptionsPicker), nameof(CreateOptionsPicker.SetGameMode))]
-internal static class CreateOptionsPatch
-{
-    public static bool Prefix(CreateOptionsPicker __instance, AmongUs.GameOptions.GameModes mode)
-    {
-        if (mode <= AmongUs.GameOptions.GameModes.SeekFools)
-        {
-            return true;
-        }
-
-        // TODO: finish this
-        return false;
-    }
-}

MiraAPI/Patches/GameModes/DeadBodyPatch.cs

@@ -1,14 +1,11 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
+/*
 [HarmonyPatch(typeof(DeadBody))]
-internal static class DeadBodyPatch
+public static class DeadBodyPatch
 {
-    [HarmonyPrefix, HarmonyPatch(nameof(DeadBody.OnClick))]
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(DeadBody.OnClick))]
     public static bool OnClickPatch(DeadBody __instance)
     {
-        return CustomGameModeManager.ActiveMode?.CanReport(__instance) == true;
+        return CustomGameModeManager.ActiveMode == null || CustomGameModeManager.ActiveMode.CanReport(__instance);
     }
-}
+}*/

MiraAPI/Patches/GameModes/GameLogicPatches.cs

@@ -1,78 +1,20 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
+/*
 [HarmonyPatch]
-internal static class GameLogicPatches
+public static class GameLogicPatches
 {
-    [HarmonyPrefix, HarmonyPatch(typeof(GameManager), nameof(GameManager.DidHumansWin))]
-    public static bool DidHumansWin(GameOverReason reason, ref bool __result)
+    [HarmonyPrefix, HarmonyPatch(typeof(LogicGameFlowNormal), nameof(LogicGameFlowNormal.CheckEndCriteria))]
+    public static bool EndCritPatch(LogicGameFlowNormal __instance)
     {
-        __result = reason == GameOverReason.CrewmatesByTask || reason == GameOverReason.CrewmatesByVote ||
-                   reason == GameOverReason.ImpostorDisconnect || reason == GameOverReason.HideAndSeek_CrewmatesByTimer;
-        return false;
+        var runOriginal = true;
+        CustomGameModeManager.ActiveMode?.CheckGameEnd(out runOriginal, __instance);
+        return runOriginal;
     }
 
-    [HarmonyPrefix, HarmonyPatch(typeof(GameManager), nameof(GameManager.DidImpostorsWin))]
-    public static bool DidImpostorsWin(GameOverReason reason, ref bool __result)
+    [HarmonyPrefix, HarmonyPatch(typeof(LogicRoleSelectionNormal), nameof(LogicRoleSelectionNormal.AssignRolesFromList))]
+    public static bool AssignRolesPatch(LogicRoleSelectionNormal __instance)
     {
-        __result = reason == GameOverReason.ImpostorsByKill || reason == GameOverReason.ImpostorsBySabotage ||
-                   reason == GameOverReason.ImpostorsByVote || reason == GameOverReason.HideAndSeek_ImpostorsByKills ||
-                   reason == GameOverReason.CrewmateDisconnect;
-        return false;
+        var runOriginal = true;
+        CustomGameModeManager.ActiveMode?.AssignRoles(out runOriginal, __instance);
+        return runOriginal;
     }
-
-    [HarmonyPrefix, HarmonyPatch(typeof(NormalGameManager), nameof(NormalGameManager.GetBodyType))]
-    public static bool BodyTypePatch(NormalGameManager __instance, PlayerControl player, ref PlayerBodyTypes __result)
-    {
-        if (CustomGameModeManager.ActiveMode == null || !CustomGameModeManager.ActiveMode.GameModeBodyTypeOverride)
-        {
-            return true;
-        }
-        __result = CustomGameModeManager.ActiveMode.GetBodyType(player);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(LogicGameFlowNormal), nameof(LogicGameFlowNormal.CheckEndCriteria))]
-    public static bool EndGamePatch(LogicGameFlowNormal __instance)
-    {
-        if (TutorialManager.InstanceExists)
-        {
-            return true;
-        }
-
-        if (!AmongUsClient.Instance.AmHost)
-        {
-            return false;
-        }
-
-        if (!GameData.Instance)
-        {
-            return false;
-        }
-
-        if (CustomGameModeManager.ActiveMode != null)
-        {
-            CustomGameModeManager.ActiveMode.CheckGameEnd(out var runOriginal, __instance);
-
-            if (!runOriginal)
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(LogicGameFlowNormal), nameof(LogicGameFlowNormal.IsGameOverDueToDeath))]
-    public static void IsGameOverDueToDeathPatch(LogicGameFlowNormal __instance, ref bool __result)
-    {
-        if (CustomGameModeManager.IsActiveGameMode<HideAndSeekMode>())
-        {
-            __result = false;
-        }
-    }
-}
+}*/

MiraAPI/Patches/GameModes/GameManagerPatches.cs

@@ -1,56 +0,0 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(GameManager))]
-internal static class GameManagerPatches
-{
-    [HarmonyPrefix, HarmonyPatch(nameof(GameManager.OnPlayerDeath))]
-    public static bool OnDeathPrefix([HarmonyArgument(0)] PlayerControl player, [HarmonyArgument(1)] bool assignGhostRole)
-    {
-        if (CustomGameModeManager.ActiveMode != null)
-        {
-            CustomGameModeManager.ActiveMode.OnPlayerDeath(player, assignGhostRole);
-            return false;
-        }
-
-        return true;
-    }
-    [HarmonyPrefix, HarmonyPatch(nameof(GameManager.ShowCrewmatesKilled))]
-    public static bool ShowCrewmatesKilledPrefix(ref bool __result)
-    {
-        if (CustomGameModeManager.ActiveMode != null)
-        {
-            __result = CustomGameModeManager.ActiveMode is HideAndSeekMode;
-            return false;
-        }
-
-        return true;
-    }
-    [HarmonyPatch(typeof(NormalGameManager), nameof(NormalGameManager.GetMapOptions))]
-    [HarmonyPrefix]
-    public static bool GetMapOptions(ref MapOptions __result)
-    {
-        if (CustomGameModeManager.ActiveMode == null)
-        {
-            return true;
-        }
-
-        __result = CustomGameModeManager.ActiveMode.GetMapOptions();
-        return false;
-    }
-}
-
-[HarmonyPatch(typeof(GameStartManager))]
-internal static class GameStartManagerPatches
-{
-    [HarmonyPrefix, HarmonyPatch(nameof(GameStartManager.Start))]
-    public static void StartPatch(GameStartManager __instance)
-    {
-        if (MiraApiPlugin.IsDevBuild)
-        {
-            __instance.MinPlayers = 1;
-        }
-    }
-}

MiraAPI/Patches/GameModes/HudPatches.cs

@@ -1,62 +0,0 @@
-using System.Collections;
-using HarmonyLib;
-using Il2CppSystem;
-using MiraAPI.GameModes;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
-using TMPro;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(HudManager))]
-internal static class HudPatches
-{
-    [HarmonyPostfix, HarmonyPatch(nameof(HudManager.Update))]
-    public static void HudUpdatePatch(HudManager __instance)
-    {
-        if (GameManager.Instance != null && GameManager.Instance.GameHasStarted &&
-            CustomGameModeManager.ActiveMode != null)
-        {
-            CustomGameModeManager.ActiveMode.HudUpdate(__instance);
-        }
-    }
-
-
-    [HarmonyPatch(typeof(HudManager), nameof(HudManager.Start))]
-    [HarmonyPostfix]
-    public static void PostHudStart(HudManager __instance)
-    {
-        Coroutines.Start(CoPostHudStart(__instance));
-    }
-
-    private static IEnumerator CoPostHudStart(HudManager instance)
-    {
-        yield return new WaitUntil((Func<bool>)(() => GameManager.Instance != null));
-        if (GameManager.Instance.IsHideAndSeek())
-            yield return null;
-        var infoPane = instance.gameObject.transform.FindChild("LobbyInfoPane");
-        var aspect = infoPane.gameObject.transform.Find("AspectSize");
-        var modeLabel = aspect!.Find("ModeLabel");
-        var modeValue = aspect.Find("ModeValue");
-        var modelText = modeLabel!.Find("Text_TMP").gameObject;
-        var modelTextClone = Object.Instantiate(modelText, modeLabel);
-        Object.Destroy(modelTextClone.GetComponent<TextTranslatorTMP>());
-        modelTextClone.GetComponent<TextMeshPro>().text = "Gamemode";
-        var gmText = modeValue!.Find("GameModeText").gameObject;
-        var gmTextClone = Object.Instantiate(gmText, modeValue);
-        gmText.SetActive(false);
-        modelText.SetActive(false);
-        _text = gmTextClone.GetComponent<TextMeshPro>();
-        _text.text = CustomGameModeManager.ActiveMode != null ? $"<color=#{CustomGameModeManager.ActiveMode.Color.ToHtmlStringRGBA()}>{CustomGameModeManager.ActiveMode.Name}</color>" : "Classic";
-        CustomGameModeManager.ActiveMode?.HudStart(instance);
-    }
-
-    private static TextMeshPro? _text;
-    internal static void SetGameModeText(string text)
-    {
-        if (_text != null)
-            _text.text = text;
-    }
-}

MiraAPI/Patches/GameModes/ImpostorTargetPatch.cs

@@ -1,13 +1,9 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
+/*
 /// <summary>
-/// Allow Impostors to kill each other if can kill is enabled in gamemode or friendly fire is toggled on.
+/// Allow Impostors to kill each other if can kill is enabled in gamemode or friendly fire is toggled on
 /// </summary>
 [HarmonyPatch(typeof(ImpostorRole), "IsValidTarget")]
-internal static class ImpostorTargetPatch
+public static class ImpostorTargetPatch
 {
     public static bool Prefix(ImpostorRole __instance, [HarmonyArgument(0)] NetworkedPlayerInfo target, ref bool __result)
     {
@@ -20,8 +16,9 @@ internal static class ImpostorTargetPatch
         }
 
         __result = target is { Disconnected: false, IsDead: false } &&
-                    target.PlayerId != __instance.Player.PlayerId && target.Role != null &&
-                    target.Object != null && !target.Object.inVent && !target.Object.inMovingPlat;
+                   target.PlayerId != __instance.Player.PlayerId && !(target.Role == null) &&
+                   !(target.Object == null) && !target.Object.inVent && !target.Object.inMovingPlat;
         return false;
+
     }
-}
+}*/

MiraAPI/Patches/GameModes/IntroCutscenePatch.cs

@@ -1,20 +0,0 @@
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(IntroCutscene), nameof(IntroCutscene.CoBegin))]
-internal static class IntroCutscenePatch
-{
-    public static bool Prefix(IntroCutscene __instance, ref Il2CppSystem.Collections.IEnumerator __result)
-    {
-        if (CustomGameModeManager.ActiveMode?.ShowGameModeIntroCutscene == true)
-        {
-            __result = CustomGameModeManager.ActiveMode.IntroCutscene(__instance).WrapToIl2Cpp();
-            return false;
-        }
-
-        return true;
-    }
-}

MiraAPI/Patches/GameModes/MapBehaviourPatch.cs

@@ -1,12 +1,9 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
+/*
 [HarmonyPatch(typeof(MapBehaviour))]
-internal static class MapBehaviourPatch
+public static class MapBehaviourPatch
 {
-    [HarmonyPrefix, HarmonyPatch(nameof(MapBehaviour.ShowSabotageMap))]
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(MapBehaviour.ShowSabotageMap))]
     public static bool ShowSabotagePatch(MapBehaviour __instance)
     {
         var shouldShow = CustomGameModeManager.ActiveMode?.ShouldShowSabotageMap(__instance);
@@ -18,4 +15,4 @@ internal static class MapBehaviourPatch
 
         return true;
     }
-}
+}*/

MiraAPI/Patches/GameModes/NormalGameManagerPatches.cs

@@ -1,19 +0,0 @@
-/*
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(NormalGameManager))]
-internal static class NormalGameManagerPatches
-{
-    [HarmonyPrefix, HarmonyPatch(nameof(NormalGameManager.IsNormal))]
-    public static void IsNormal(ref bool __result)
-    {
-        if (CustomGameModeManager.ActiveMode != null)
-        {
-            __result = !CustomGameModeManager.ActiveMode.IsHideAndSeek;
-        }
-    }
-}
-*/

MiraAPI/Patches/GameModes/OnDeathPatch.cs

@@ -0,0 +1,11 @@
+/*
+[HarmonyPatch(typeof(KillAnimation))]
+public static class OnDeathPatch
+{
+    [HarmonyPostfix]
+    [HarmonyPatch(nameof(KillAnimation.CoPerformKill))]
+    public static void OnDeathPostfix([HarmonyArgument(0)] PlayerControl source, [HarmonyArgument(1)] PlayerControl target)
+    {
+        CustomGameModeManager.ActiveMode?.OnDeath(target);
+    }
+}*/

MiraAPI/Patches/GameModes/ProgressTrackerPatch.cs

@@ -1,17 +0,0 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-[HarmonyPatch(typeof(ProgressTracker), nameof(ProgressTracker.Start))]
-internal static class ProgressTrackerPatch
-{
-    public static bool Prefix(ProgressTracker __instance)
-    {
-        if (CustomGameModeManager.ActiveMode != null && !CustomGameModeManager.ActiveMode.ShowTaskBar)
-        {
-            __instance.gameObject.SetActive(false);
-            return false;
-        }
-        return true;
-    }
-}

MiraAPI/Patches/GameModes/TaskPanelPatch.cs

@@ -1,17 +0,0 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-[HarmonyPatch(typeof(TaskPanelBehaviour), nameof(TaskPanelBehaviour.Update))]
-internal static class TaskPanelPatch
-{
-    public static bool Prefix(TaskPanelBehaviour __instance)
-    {
-        if (__instance != Roles.HudManagerPatches.RoleTab && CustomGameModeManager.ActiveMode != null)
-        {
-            CustomGameModeManager.ActiveMode.UpdateTaskPanel(__instance);
-            return false;
-        }
-        return true;
-    }
-}

MiraAPI/Patches/GameModes/VentPatches.cs

@@ -0,0 +1,47 @@
+/*
+[HarmonyPatch(typeof(Vent))]
+public static class VentPatches
+{
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(Vent.CanUse))]
+    public static bool CanUseVentPatch(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse)
+    {
+        if (CustomGameModeManager.ActiveMode?.CanVent(__instance, pc) == false)
+        {
+            return couldUse = canUse = false;
+        }
+
+        if (pc.Role is not ICustomRole role)
+        {
+            return couldUse = canUse = true;
+        }
+
+        var num = float.MaxValue;
+        var @object = pc.Object;
+        var customRoleUsable = role.CanUseVent;
+
+        canUse = couldUse = customRoleUsable && !pc.IsDead && (@object.CanMove || @object.inVent);
+        if (canUse)
+        {
+            var center = @object.Collider.bounds.center;
+            var position = __instance.transform.position;
+            num = Vector2.Distance(center, position);
+            canUse &= num <= __instance.UsableDistance && !PhysicsHelpers.AnythingBetween(@object.Collider, center, position, Constants.ShipOnlyMask, false);
+        }
+        __result = num;
+        return false;
+    }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(Vent.SetOutline))]
+    public static bool SetOutlinePatch(Vent __instance, [HarmonyArgument(0)] bool on, [HarmonyArgument(1)] bool mainTarget)
+    {
+        var color = PlayerControl.LocalPlayer.Data.Role is ICustomRole role
+            ? role.RoleColor : PlayerControl.LocalPlayer.Data.Role.IsImpostor ? Palette.ImpostorRed : Palette.CrewmateBlue;
+        __instance.myRend.material.SetFloat(ShaderID.Outline, on ? 1 : 0);
+        __instance.myRend.material.SetColor(ShaderID.OutlineColor, color);
+        __instance.myRend.material.SetColor(ShaderID.AddColor, mainTarget ? color : Color.clear);
+
+        return false;
+    }
+}*/

MiraAPI/Patches/GameModes/WinnersPatch.cs

@@ -1,27 +0,0 @@
-using HarmonyLib;
-using MiraAPI.GameModes;
-
-namespace MiraAPI.Patches.GameModes;
-
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
-internal static class WinnersPatch
-{
-    [HarmonyPostfix]
-    public static void ShowWinningScreen()
-    {
-        if (CustomGameModeManager.ActiveMode is null or ClassicMode)
-            return;
-
-        var winners = CustomGameModeManager.ActiveMode.CalculateWinners();
-
-        if (winners is null)
-            return;
-
-        EndGameResult.CachedWinners.Clear();
-
-        foreach (var data in winners)
-        {
-            EndGameResult.CachedWinners.Add(new(data));
-        }
-    }
-}

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,11 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using HarmonyLib;
 using MiraAPI.Hud;
 using MiraAPI.Keybinds;
 using MiraAPI.LocalSettings;
-using MiraAPI.Roles;
 using MiraAPI.Utilities;
 using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
@@ -125,47 +123,6 @@ public static class HudManagerPatches
         CustomGameModeManager.ActiveMode?.HudStart(__instance);
     }*/
 
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(FriendsListManager), nameof(FriendsListManager.SetFriendButtonColor))]
-    public static bool SetFriendButtonColor(FriendsListManager __instance, bool isGrayedOut)
-    {
-        __instance.FriendsListButton?.SetGlyphColor(isGrayedOut);
-        return false;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.Toggle))]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.Close))]
-    public static void TogglePrefix(ChatController __instance)
-    {
-        if (!MiraHudHelper.ClonedChatButton)
-        {
-            return;
-        }
-        __instance.chatButton.transform.localPosition = MiraHudHelper.ClonedChatButton.transform.localPosition + new Vector3(-0.3f, 0);
-    }
-
-    [HarmonyPostfix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.Toggle))]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.Close))]
-    public static void TogglePostfix(ChatController __instance)
-    {
-        MiraHudHelper.UiGrid.ArrangeChilds();
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.AddChatNote))]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.AddChat))]
-    [HarmonyPatch(typeof(ChatController), nameof(ChatController.AddChatWarning))]
-    public static void ChatBubbleUpdatePrefix(ChatController __instance)
-    {
-        __instance.chatNotifyDot.transform.localPosition = new Vector3(-0.34f, 0.373f, -1f);
-    }
-
     /// <summary>
     /// Create custom buttons and arrange them on the hud.
     /// </summary>
@@ -174,7 +131,6 @@ public static class HudManagerPatches
     [HarmonyPatch(nameof(HudManager.Start))]
     public static void StartPostfix(HudManager __instance)
     {
-        __instance.gameObject.AddComponent<MiraHudHelper>();
         if (Buttons == null)
         {
             Buttons = __instance.transform.Find("Buttons");

MiraAPI/Patches/IntroCutscenePatches.cs

@@ -3,7 +3,6 @@ using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.GameModes;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
 
@@ -30,11 +29,6 @@ public static class IntroCutscenePatches
     {
         var @event = new IntroBeginEvent(__instance);
         MiraEventManager.InvokeEvent(@event);
-
-        if (CustomGameModeManager.ActiveMode != null)
-        {
-            CustomGameModeManager.ActiveMode.Initialize();
-        }
     }
 
     [HarmonyPatch]
@@ -127,6 +121,8 @@ public static class IntroCutscenePatches
                 introCutscene = __instance.Cast<IntroCutscene>();
             }
 
+            Info("IntroCutscene ended");
+
             MiraEventManager.InvokeEvent(new IntroEndEvent(introCutscene));
 
             var @event = new BeforeRoundStartEvent(true);

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -7,8 +7,6 @@ using Reactor.Utilities.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MiraAPI.Utilities.Assets;
-using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;
 using Object = UnityEngine.Object;

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -3,9 +3,6 @@ using System.Collections;
 using System.Linq;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
 using HarmonyLib;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using Il2CppSystem.Collections.Generic;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.Presets;
@@ -16,7 +13,6 @@ using Reactor.Utilities.Extensions;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.ProBuilder;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
 
@@ -25,15 +21,6 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch(typeof(GameOptionsMenu))]
 internal static class GameOptionsMenuPatch
 {
-    private static List<CategoryHeaderMasked> _vanillaHeaders = new();
-    private static List<OptionBehaviour> _vanillaOptions = new();
-    private static List<OptionBehaviour> _mainOptions = new();
-    private static System.Collections.Generic.Dictionary<AbstractGameMode, System.Collections.Generic.List<AbstractOptionGroup>> _gameModeGroups = new();
-    private static System.Collections.Generic.Dictionary<AbstractGameMode, System.Collections.Generic.List<OptionBehaviour>> _gameModeOptions = new();
-    private static System.Collections.Generic.Dictionary<AbstractGameMode, System.Collections.Generic.List<CategoryHeaderMasked>> _gameModeHeaders = new();
-    private static TextMeshPro _gamemodeDescription = null!;
-    private static SpriteRenderer _modIcon = null!;
-
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameOptionsMenu.Initialize))]
     // ReSharper disable once InconsistentNaming
@@ -54,10 +41,15 @@ internal static class GameOptionsMenuPatch
                 var mapNameSetting = GameManager.Instance.GameSettingsList.MapNameSetting;
                 __instance.MapPicker.SetUpFromData(mapNameSetting, 20);
                 __instance.Children.Add(__instance.MapPicker);
-                CreateSettings(__instance, container);
-                if (CustomGameModeManager.ActiveMode != null)
+                __instance.CreateSettings();
+                foreach (var optionBehaviour in __instance.Children)
                 {
-                    ToggleGamemodeOptions(CustomGameModeManager.ActiveMode, __instance);
+                    if (AmongUsClient.Instance && !AmongUsClient.Instance.AmHost)
+                    {
+                        optionBehaviour.SetAsPlayer();
+                    }
+
+                    optionBehaviour.OnValueChanged = new Action<OptionBehaviour>(__instance.ValueChanged);
                 }
             }
             else
@@ -77,314 +69,6 @@ internal static class GameOptionsMenuPatch
         return false;
     }
 
-    public static float AdditionalVanillaScrollNum;
-    internal static void ToggleGamemodeOptions(AbstractGameMode gameMode, GameOptionsMenu instance)
-    {
-        float num = -1.217f;
-        instance.Children.Clear();
-        foreach (var opt in _mainOptions)
-        {
-            instance.Children.Add(opt);
-        }
-
-        var icon = gameMode.Icon;
-        if (icon != null)
-        {
-            _modIcon.gameObject.SetActive(true);
-            _gamemodeDescription.transform.localPosition = new Vector3(0.3f, 0, -0.01f);
-            _gamemodeDescription.horizontalAlignment = HorizontalAlignmentOptions.Left;
-            var texture = icon.LoadAsset().texture;
-            var scale = Mathf.Min(128f / texture.width, 128f / texture.height);
-
-            var newSprite = Sprite.Create(
-                texture,
-                new Rect(0, 0, texture.width, texture.height),
-                Vector2.one / 2,
-                100f / scale
-            );
-
-            _modIcon.sprite = newSprite;
-            _modIcon.drawMode = SpriteDrawMode.Simple;
-        }
-        else
-        {
-            _gamemodeDescription.transform.localPosition = new Vector3(0f, 0, -0.01f);
-            _gamemodeDescription.horizontalAlignment = HorizontalAlignmentOptions.Center;
-            _modIcon.gameObject.SetActive(false);
-        }
-
-        _gamemodeDescription.text = gameMode.Description;
-        if (gameMode.ShowNormalGameSettings)
-        {
-            foreach (var opt in _vanillaHeaders)
-            {
-                num -= 0.63f;
-                opt.gameObject.SetActive(true);
-            }
-            foreach (var opt in _vanillaOptions)
-            {
-                opt.gameObject.SetActive(true);
-                instance.Children.Add(opt);
-                num -= 0.45f;
-            }
-        }
-        else
-        {
-            foreach (var opt in _vanillaHeaders)
-            {
-                opt.gameObject.SetActive(false);
-            }
-            foreach (var opt in _vanillaOptions)
-            {
-                opt.gameObject.SetActive(false);
-            }
-        }
-
-        foreach (var pair in _gameModeGroups)
-        {
-            if (pair.Value.Count != 0)
-            {
-                if (gameMode == pair.Key)
-                {
-                    foreach (var opt in _gameModeHeaders[gameMode])
-                    {
-                        num -= 0.63f;
-                        opt.gameObject.SetActive(true);
-                    }
-
-                    foreach (var opt in _gameModeOptions[gameMode])
-                    {
-                        opt.gameObject.SetActive(true);
-                        instance.Children.Add(opt);
-                        num -= 0.45f;
-                    }
-                }
-                else
-                {
-                    foreach (var opt in _gameModeHeaders[pair.Key])
-                    {
-                        opt.gameObject.SetActive(false);
-                    }
-
-                    foreach (var opt in _gameModeOptions[pair.Key])
-                    {
-                        opt.gameObject.SetActive(false);
-                    }
-                }
-            }
-        }
-
-        instance.ControllerSelectable.Clear();
-        foreach (var obj in instance.scrollBar.GetComponentsInChildren<UiElement>())
-        {
-            if (obj.gameObject.activeSelf)
-            {
-                instance.ControllerSelectable.Add(obj);
-            }
-        }
-        instance.scrollBar.SetYBoundsMax(-num - 1.65f);
-    }
-    
-
-    private static void CreateSettings(GameOptionsMenu instance, Transform container)
-    {
-        float num = 0.713f;
-        _vanillaHeaders.Clear();
-        _vanillaOptions.Clear();
-        _mainOptions.Clear();
-        _gameModeHeaders.Clear();
-        _gameModeOptions.Clear();
-        _gameModeGroups.Clear();
-
-        CategoryHeaderMasked gmCategory = Object.Instantiate(instance.categoryHeaderOrigin, Vector3.zero, Quaternion.identity, container);
-        gmCategory.SetHeader(GameModeOption.CustomName, 20);
-        gmCategory.transform.localScale = Vector3.one * 0.63f;
-        gmCategory.transform.localPosition = new Vector3(-0.903f, num, -2f);
-        GameModeOption.OptionBehaviour = Object.Instantiate(
-            instance.stringOptionOrigin,
-            Vector3.zero,
-            Quaternion.identity,
-            container);
-        num -= 0.63f;
-        GameModeOption.OptionBehaviour.transform.localPosition = new Vector3(0.952f, num, -2f);
-        GameModeOption.OptionBehaviour.SetClickMask(instance.ButtonClickMask);
-        StringGameSetting setting = ScriptableObject.CreateInstance<StringGameSetting>();
-        setting.Type = OptionTypes.MultipleChoice;
-        setting.Title = GameModeOption.GamemodeName;
-        setting.Index = GameModeOption._lastValue;
-        setting.Values = new Il2CppStructArray<StringNames>([GameModeOption.Values[0]]);
-        GameModeOption.OptionBehaviour.SetUpFromData(setting, 20);
-        GameModeOption.Set(GameModeOption._lastValue);
-        GameModeOption.OptionBehaviour.TitleText.fontSize = 3;
-        instance.Children.Add(GameModeOption.OptionBehaviour);
-        foreach (var optionBehaviour in instance.Children)
-        {
-            _mainOptions.Add(optionBehaviour);
-        }
-        for (var i = 1; i < GameModeOption.Values.Count; i++)
-        {
-            GameModeOption.OptionBehaviour.Values =
-                (Il2CppStructArray<StringNames>)GameModeOption.OptionBehaviour.Values.Add(
-                    GameModeOption.Values.ElementAt(i).Value);
-        }
-
-        var modeInfoHolder = new GameObject("GamemodeInfo")
-        {
-            transform =
-            {
-                parent = container,
-                localPosition = new Vector3(1.2f, -0.675f, 1),
-                localScale = Vector3.one,
-            },
-            layer = container.gameObject.layer,
-        }.transform;
-
-        var gamemodeBg = Object.Instantiate(GameModeOption.OptionBehaviour.transform.GetChild(0).gameObject, Vector3.zero, Quaternion.identity, modeInfoHolder);
-        gamemodeBg.transform.localPosition = Vector3.zero;
-        gamemodeBg.transform.localScale = new Vector3(1.35f, 0.85f, 1);
-        gamemodeBg.name = "Background";
-
-        var modIconObj = new GameObject("ModIcon")
-        {
-            transform =
-            {
-                parent = modeInfoHolder,
-                localPosition = new Vector3(-1.75f, 0, -0.1f),
-                localScale = new Vector3(0.45f, 0.45f, 1),
-            },
-            layer = gamemodeBg.layer,
-        };
-        _modIcon = modIconObj.AddComponent<SpriteRenderer>();
-        _modIcon.sprite = MiraAssets.BlankSprite.LoadAsset();
-        _modIcon.material = gamemodeBg.gameObject.GetComponent<SpriteRenderer>().material;
-
-        var gamemodeTextObj = Object.Instantiate(GameModeOption.OptionBehaviour.transform.GetChild(1).gameObject, Vector3.zero, Quaternion.identity, modeInfoHolder);
-        gamemodeTextObj.transform.localPosition = new Vector3(0.3f, 0, -0.01f);
-        gamemodeTextObj.transform.localScale = new Vector3(2.12f, 2.12f, 1);
-        _gamemodeDescription = gamemodeTextObj.GetComponentInChildren<TextMeshPro>();
-        _gamemodeDescription.fontSizeMin = 0.65f;
-        _gamemodeDescription.fontSizeMax = 0.9f;
-        _gamemodeDescription.alignment = TextAlignmentOptions.Left;
-
-        num -= 1.3f;
-        AdditionalVanillaScrollNum = 0f;
-        foreach (RulesCategory rulesCategory in GameManager.Instance.GameSettingsList.AllCategories)
-        {
-            CategoryHeaderMasked categoryHeaderMasked = Object.Instantiate<CategoryHeaderMasked>(
-                instance.categoryHeaderOrigin,
-                Vector3.zero,
-                Quaternion.identity,
-                container);
-            categoryHeaderMasked.SetHeader(rulesCategory.CategoryName, 20);
-            categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f;
-            categoryHeaderMasked.transform.localPosition = new Vector3(-0.903f, num, -2f);
-            _vanillaHeaders.Add(categoryHeaderMasked);
-            num -= 0.63f;
-            AdditionalVanillaScrollNum -= 0.63f;
-            foreach (BaseGameSetting baseGameSetting in rulesCategory.AllGameSettings)
-            {
-                switch (baseGameSetting.Type)
-                {
-                    case OptionTypes.Checkbox:
-                    {
-                        OptionBehaviour optionBehaviour = Object.Instantiate<ToggleOption>(
-                            instance.checkboxOrigin,
-                            Vector3.zero,
-                            Quaternion.identity,
-                            container);
-                        optionBehaviour.transform.localPosition = new Vector3(0.952f, num, -2f);
-                        optionBehaviour.SetClickMask(instance.ButtonClickMask);
-                        optionBehaviour.SetUpFromData(baseGameSetting, 20);
-                        _vanillaOptions.Add(optionBehaviour);
-                        break;
-                    }
-                    case OptionTypes.String:
-                    {
-                        OptionBehaviour optionBehaviour = Object.Instantiate<StringOption>(
-                            instance.stringOptionOrigin,
-                            Vector3.zero,
-                            Quaternion.identity,
-                            container);
-                        optionBehaviour.transform.localPosition = new Vector3(0.952f, num, -2f);
-                        optionBehaviour.SetClickMask(instance.ButtonClickMask);
-                        optionBehaviour.SetUpFromData(baseGameSetting, 20);
-                        _vanillaOptions.Add(optionBehaviour);
-                        break;
-                    }
-                    case OptionTypes.Float:
-                    case OptionTypes.Int:
-                    {
-                        OptionBehaviour optionBehaviour = Object.Instantiate<NumberOption>(
-                            instance.numberOptionOrigin,
-                            Vector3.zero,
-                            Quaternion.identity,
-                            container);
-                        optionBehaviour.transform.localPosition = new Vector3(0.952f, num, -2f);
-                        optionBehaviour.SetClickMask(instance.ButtonClickMask);
-                        optionBehaviour.SetUpFromData(baseGameSetting, 20);
-                        _vanillaOptions.Add(optionBehaviour);
-                        break;
-                    }
-                    case OptionTypes.Player:
-                    {
-                        OptionBehaviour optionBehaviour = Object.Instantiate<PlayerOption>(
-                            instance.playerOptionOrigin,
-                            Vector3.zero,
-                            Quaternion.identity,
-                            container);
-                        optionBehaviour.transform.localPosition = new Vector3(0.952f, num, -2f);
-                        optionBehaviour.SetClickMask(instance.ButtonClickMask);
-                        optionBehaviour.SetUpFromData(baseGameSetting, 20);
-                        _vanillaOptions.Add(optionBehaviour);
-                        break;
-                    }
-                }
-
-                num -= 0.45f;
-                AdditionalVanillaScrollNum -= 0.45f;
-            }
-        }
-        foreach (var optionBehaviour in _vanillaOptions)
-        {
-            if (AmongUsClient.Instance && !AmongUsClient.Instance.AmHost)
-            {
-                optionBehaviour.SetAsPlayer();
-            }
-            instance.Children.Add(optionBehaviour);
-        }
-
-        foreach (var optionBehaviour in instance.Children)
-        {
-            optionBehaviour.OnValueChanged = new Action<OptionBehaviour>(instance.ValueChanged);
-        }
-
-        foreach (var mode in CustomGameModeManager.IdToModeMap.Values)
-        {
-            var filteredGroups =
-                ModdedOptionsManager.GameModeOptionGroups
-                    .Where(x => x.Key == mode.GetType()).Select(y => y.Value).SelectMany(y => y) ?? [];
-            _gameModeGroups.Add(mode, filteredGroups.ToList());
-
-            var optionBehaviours = new System.Collections.Generic.List<OptionBehaviour>();
-            var categoryHeaders = new System.Collections.Generic.List<CategoryHeaderMasked>();
-            var newNum = mode.ShowNormalGameSettings ? num : num - AdditionalVanillaScrollNum;
-            foreach (var group in filteredGroups)
-            {
-                CreateGroup(instance, group, container, ref newNum, ref optionBehaviours, ref categoryHeaders);
-                group.Ready = true;
-            }
-            _gameModeHeaders.Add(mode, categoryHeaders);
-            _gameModeOptions.Add(mode, optionBehaviours);
-        }
-
-        instance.ControllerSelectable.Clear();
-        foreach (var obj in instance.scrollBar.GetComponentsInChildren<UiElement>())
-        {
-            instance.ControllerSelectable.Add(obj);
-        }
-        instance.scrollBar.SetYBoundsMax(-num - 1.65f);
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(GameOptionsMenu.OnEnable))]
     public static void OpenPatch(GameOptionsMenu __instance)
@@ -404,10 +88,11 @@ internal static class GameOptionsMenuPatch
     // ReSharper disable once InconsistentNaming
     public static void UpdatePatch(GameOptionsMenu __instance)
     {
-        if (MenuState.Instance.CurrentModIdx == 0 && _gameModeGroups.Count <= 0)
+        if (MenuState.Instance.CurrentModIdx == 0)
         {
             return;
         }
+
         var num = 2.1f;
 
         switch (MenuState.Instance.CurrentMenu)
@@ -422,15 +107,9 @@ internal static class GameOptionsMenuPatch
                 CustomMenuTwoUpdate(ref num);
                 break;
             default:
-                if (MenuState.Instance.CurrentModIdx == 0)
-                {
-                    num = -1.217f;
-                    GamemodeOptionsUpdate(ref num);
-                    break;
-                }
                 var filteredGroups =
                     MenuState.Instance.CurrentMod.InternalOptionGroups
-                        .Where(x => (x.OptionableType == null || CustomGameModeManager.ActiveMode!.GetType().IsAssignableTo(x.OptionableType)) &&
+                        .Where(x => x.OptionableType == null &&
                                     x.ParentMenu == MenuCategory.Game) ?? [];
 
                 foreach (var group in filteredGroups)
@@ -443,100 +122,8 @@ internal static class GameOptionsMenuPatch
 
         __instance.scrollBar.SetYBoundsMax(-num - 1.65f);
     }
-    private static void CreateGroup(GameOptionsMenu menu, AbstractOptionGroup group, Transform container, ref float num, ref System.Collections.Generic.List<OptionBehaviour> optionBehaviours, ref System.Collections.Generic.List<CategoryHeaderMasked> categoryHeaders)
-    {
-        var categoryHeaderMasked = Object.Instantiate(
-            menu.categoryHeaderOrigin,
-            Vector3.zero,
-            Quaternion.identity,
-            container);
-        categoryHeaderMasked.transform.localPosition = new Vector3(-0.903f, num + 1, -2f);
-        categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f;
-        categoryHeaders.Add(categoryHeaderMasked);
 
-        num -= 0.58f;
-
-        categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20);
-        categoryHeaderMasked.Background.color = group.GroupColor;
-        categoryHeaderMasked.Divider.color = group.GroupColor;
-        categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
-            ? Color.white
-            : group.GroupColor.FindAlternateColor();
-
-        categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
-        categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
-        categoryHeaderMasked.Background.sprite.texture.wrapMode = TextureWrapMode.Clamp;
-
-        categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.5f, -0.1833f, 0);
-        categoryHeaderMasked.Background.size = new Vector2(
-            categoryHeaderMasked.Background.size.x + 1.5f,
-            categoryHeaderMasked.Background.size.y);
-
-        categoryHeaderMasked.gameObject.SetActive(true);
-        group.Header = categoryHeaderMasked;
-        categoryHeaderMasked.transform.localPosition += Vector3.down;
-
-        var options = group.Options.Select(opt => opt.CreateOption(
-            menu.checkboxOrigin,
-            menu.numberOptionOrigin,
-            menu.stringOptionOrigin,
-            menu.playerOptionOrigin,
-            container));
-
-        foreach (var newOpt in options)
-        {
-            newOpt.SetClickMask(menu.ButtonClickMask);
-            SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren<SpriteRenderer>(true);
-            foreach (var renderer in componentsInChildren)
-            {
-                if (group.GroupColor != MiraApiPlugin.DefaultHeaderColor)
-                {
-                    renderer.color = group.GroupColor.FindAlternateColor();
-                    if (renderer.transform.parent.TryGetComponent<GameOptionButton>(out var btn))
-                    {
-                        btn.interactableColor = group.GroupColor.FindAlternateColor();
-                        btn.interactableHoveredColor = Color.white;
-                    }
-                }
-
-                renderer.material.SetInt(PlayerMaterial.MaskLayer, 20);
-            }
-
-            foreach (var textMeshPro in newOpt.GetComponentsInChildren<TextMeshPro>(true))
-            {
-                if (group.GroupColor != MiraApiPlugin.DefaultHeaderColor)
-                {
-                    textMeshPro.color = group.GroupColor;
-                }
-
-                textMeshPro.fontMaterial.SetFloat(ShaderID.StencilComp, 3f);
-                textMeshPro.fontMaterial.SetFloat(ShaderID.Stencil, 20);
-            }
-
-            if (newOpt is ToggleOption toggle)
-            {
-                toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset();
-                toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
-                    ? group.GroupColor
-                    : MiraAssets.AcceptedTeal;
-                var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite")
-                    .GetComponent<SpriteRenderer>();
-                rend.sprite = MiraAssets.CheckmarkBox.LoadAsset();
-                rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
-                    ? group.GroupColor
-                    : MiraAssets.AcceptedTeal;
-            }
-
-            optionBehaviours.Add(newOpt);
-            newOpt.transform.localPosition = new Vector3(0.952f, num, -2f);
-            num -= 0.45f;
-
-            newOpt.Initialize();
-            newOpt.gameObject.SetActive(true);
-        }
-    }
-
-    internal static void UpdateGroup(AbstractOptionGroup? group, ref float num)
+    private static void UpdateGroup(AbstractOptionGroup? group, ref float num)
     {
         if (group is null || !group.Ready || group.Options.Count == 0 || group.Header is null)
         {
@@ -545,24 +132,18 @@ internal static class GameOptionsMenuPatch
 
         if (!group.GroupVisible.Invoke())
         {
-            if (group.Header != null && group.Header.gameObject != null)
-                group.Header.gameObject.SetActive(false);
+            group.Header.gameObject.SetActive(false);
             foreach (var option in group.Options)
             {
-                if (option.OptionBehaviour != null && option.OptionBehaviour.gameObject != null)
-                    option.OptionBehaviour?.gameObject.SetActive(false);
+                option.OptionBehaviour?.gameObject.SetActive(false);
             }
 
             return;
         }
 
-        if (group.Header != null)
-        {
-            if (group.Header.gameObject != null)
-                group.Header.gameObject.SetActive(true);
-            group.Header.transform.localScale = Vector3.one * 0.63f;
-            group.Header.transform.localPosition = new Vector3(-0.903f, num, -2f);
-        }
+        group.Header.gameObject.SetActive(true);
+        group.Header.transform.localScale = Vector3.one * 0.63f;
+        group.Header.transform.localPosition = new Vector3(-0.903f, num, -2f);
 
         num -= 0.58f;
 
@@ -594,26 +175,6 @@ internal static class GameOptionsMenuPatch
         }
     }
 
-    private static void GamemodeOptionsUpdate(ref float num)
-    {
-        var mode = CustomGameModeManager.ActiveMode;
-        if (mode == null) return;
-
-        if (mode.ShowNormalGameSettings)
-        {
-            num += AdditionalVanillaScrollNum;
-        }
-
-        if (!_gameModeGroups.TryGetValue(mode, out var groups) || groups.Count == 0)
-        {
-            return;
-        }
-
-        foreach (var group in groups)
-        {
-            UpdateGroup(group, ref num);
-        }
-    }
     private static void CustomMenuOneUpdate(ref float num)
     {
         var groups = MenuState.Instance.CurrentMod.InternalOptionGroups

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -1,4 +1,17 @@
-using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using HarmonyLib;
+using MiraAPI.GameOptions;
+using MiraAPI.Modifiers;
+using MiraAPI.PluginLoading;
+using MiraAPI.Presets;
+using MiraAPI.Utilities.Assets;
+using Reactor.Utilities.Extensions;
+using TMPro;
+using UnityEngine;
+using UnityEngine.Events;
+using static UnityEngine.UI.Button;
+using Object = UnityEngine.Object;
 
 namespace MiraAPI.Patches.Options;
 

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using AmongUs.GameOptions;
 using HarmonyLib;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
@@ -24,51 +23,14 @@ public static class LobbyViewPanePatches
 {
     private static int SelectedModIdx { get; set; }
 
-    private static MiraPluginInfo[] Plugins => MiraPluginManager.Instance.RegisteredPluginsWithOptions;
-
     private static MiraPluginInfo? SelectedMod => SelectedModIdx == 0
         ? null
-        : Plugins[SelectedModIdx - 1];
+        : MiraPluginManager.Instance.RegisteredPluginsWithOptions[SelectedModIdx - 1];
 
     private static PassiveButton? ModifiersTabButton { get; set; }
 
     private static StringNames ModifiersTabName { get; } = CustomStringName.CreateAndRegister("ModifiersTab");
 
-    private static AbstractGameMode? GetCustomGamemode()
-    {
-        if (!CustomGameModeManager.IsClassic() && !CustomGameModeManager.IsHideNSeek())
-        {
-            return CustomGameModeManager.ActiveMode;
-        }
-
-        return null;
-    }
-
-    private static IEnumerable<AbstractOptionGroup>? GetCustomGamemodeOptions()
-    {
-        if (CustomGameModeManager.ActiveMode == null)
-        {
-            return null;
-        }
-
-        if (!CustomGameModeManager.IsClassic() && !CustomGameModeManager.IsHideNSeek())
-        {
-            var plugin = CustomGameModeManager.FindParentMod(CustomGameModeManager.ActiveMode);
-
-            return plugin?.InternalOptionGroups
-                .Where(x => x.OptionableType?.IsAssignableTo(typeof(AbstractGameMode)) == true && x.GroupVisible());
-        }
-
-        return null;
-    }
-
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(LobbyViewSettingsPane), nameof(LobbyViewSettingsPane.OnEnable))]
-    public static void OnEnable(LobbyViewSettingsPane __instance)
-    {
-        Refresh(__instance);
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(nameof(LobbyViewSettingsPane.Awake))]
     public static void AwakePatch(LobbyViewSettingsPane __instance)
@@ -113,7 +75,7 @@ public static class LobbyViewPanePatches
             (UnityAction)(() =>
             {
                 SelectedModIdx += 1;
-                if (SelectedModIdx > Plugins.Length)
+                if (SelectedModIdx > MiraPluginManager.Instance.RegisteredPluginsWithOptions.Length)
                 {
                     SelectedModIdx = 0;
                 }
@@ -137,7 +99,7 @@ public static class LobbyViewPanePatches
                 SelectedModIdx -= 1;
                 if (SelectedModIdx < 0)
                 {
-                    SelectedModIdx = Plugins.Length;
+                    SelectedModIdx = MiraPluginManager.Instance.RegisteredPluginsWithOptions.Length;
                 }
 
                 Refresh(__instance);
@@ -146,25 +108,8 @@ public static class LobbyViewPanePatches
 
     private static void Refresh(LobbyViewSettingsPane menu)
     {
-        if (SelectedMod == null)
-        {
-            var cgm = GetCustomGamemode();
-            ModifiersTabButton?.gameObject.SetActive(false);
-            menu.rolesTabButton.gameObject.SetActive(cgm is null or { ShowNormalRoleSettings: true });
-            menu.gameModeText.text = cgm is null ? "Main" : cgm.ColoredName;
-        }
-        else
-        {
-            var showModifierButton = SelectedMod.InternalOptionGroups.Any(m =>
-                m.ParentMenu is MenuCategory.Modifiers || m.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
-            var showRolesButton = SelectedMod.InternalOptionGroups.Any(r =>
-                r.ParentMenu is MenuCategory.Roles || r.OptionableType?.IsAssignableTo(typeof(ICustomRole)) == true);
-
-            ModifiersTabButton?.gameObject.SetActive(showModifierButton);
-            menu.rolesTabButton.gameObject.SetActive(showRolesButton);
-            menu.gameModeText.text = SelectedMod.PluginInfo.Metadata.Name;
-        }
-
+        ModifiersTabButton?.gameObject.SetActive(SelectedModIdx != 0);
+        menu.gameModeText.text = SelectedMod?.PluginInfo.Metadata.Name ?? "Main";
         menu.RefreshTab();
         menu.scrollBar.ScrollToTop();
     }
@@ -196,15 +141,8 @@ public static class LobbyViewPanePatches
     [HarmonyPatch(nameof(LobbyViewSettingsPane.DrawNormalTab))]
     public static bool DrawNormalTabPatch(LobbyViewSettingsPane __instance)
     {
-        if (SelectedMod == null)
+        if (SelectedModIdx == 0 || SelectedMod == null)
         {
-            var gamemodeOpts = GetCustomGamemodeOptions();
-            if (gamemodeOpts != null)
-            {
-                DrawOptions(__instance, gamemodeOpts);
-                return false;
-            }
-
             return true;
         }
 
@@ -411,13 +349,6 @@ public static class LobbyViewPanePatches
                 else
                 {
                     viewSettingsInfoPanel.SetInfo(data.Title, data.GetValueString(option.GetFloatData()), 61);
-
-                    if (viewSettingsInfoPanel.titleText.text.Contains("Game Mode"))
-                    {
-                        viewSettingsInfoPanel.titleText.text = TranslationController.Instance.GetString(
-                            data.Title, CustomGameModeManager.ActiveMode != null ? $"<color=#{CustomGameModeManager.ActiveMode.Color.ToHtmlStringRGBA()}>{CustomGameModeManager.ActiveMode.Name}</color>" : "Classic"
-                        );
-                    }
                 }
 
                 menu.settingsInfo.Add(viewSettingsInfoPanel.gameObject);

MiraAPI/Patches/Options/MenuState.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Presets;
-using MiraAPI.Roles;
 using MiraAPI.Utilities.Assets;
 using Reactor.Utilities.Attributes;
 using Reactor.Utilities.Extensions;
@@ -63,8 +60,6 @@ public class MenuState(IntPtr cppPtr) : MonoBehaviour(cppPtr)
 
     [HideFromIl2Cpp]
     internal Dictionary<int, bool> FinishedRoleMenus { get; } = [];
-    [HideFromIl2Cpp]
-    internal Dictionary<int, bool> QueuedRoleMenuRefresh { get; } = [];
 
     public void Awake()
     {
@@ -409,16 +404,14 @@ public class MenuState(IntPtr cppPtr) : MonoBehaviour(cppPtr)
         if (CurrentModIdx == 0)
         {
             Gsm.GameSettingsButton.gameObject.SetActive(true);
-            Gsm.RoleSettingsButton.gameObject.SetActive(
-                CustomGameModeManager.ActiveMode != null && CustomGameModeManager.ActiveMode.ShowNormalRoleSettings);
+            Gsm.RoleSettingsButton.gameObject.SetActive(true);
         }
         else
         {
             var hasOptions =
                 CurrentMod.InternalOptionGroups.Exists(g =>
                     g.OptionableType == null && g.ParentMenu == MenuCategory.Game);
-            var customRoles = CurrentMod.InternalRoles.Values.OfType<ICustomRole>();
-            var hasRoles = customRoles.Any(x => x.VisibleInSettings.Invoke());
+            var hasRoles = CurrentMod.InternalRoles.Count > 0;
             var hasModifiers = CurrentMod.InternalOptionGroups.Exists(g =>
                 g.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true
                 || g.ParentMenu == MenuCategory.Modifiers);

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -1,10 +1,8 @@
 using HarmonyLib;
 using Il2CppSystem;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
-using Reactor.Utilities.Extensions;
 using UnityEngine;
 using Object = Il2CppSystem.Object;
 
@@ -201,8 +199,8 @@ public static class OptionsPatches
         {
             return true;
         }
-        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title);
 
+        __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
         return false;
     }
 

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using AmongUs.GameOptions;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
 using HarmonyLib;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
@@ -75,24 +74,7 @@ public static class RoleSettingMenuPatches
             dividerImage.gameObject.SetActive(false);
         }
 
-        var queuedRefresh = false;
-        if (MenuState.Instance.QueuedRoleMenuRefresh.TryGetValue(MenuState.Instance.CurrentModIdx, out var queued) && queued)
-        {
-            queuedRefresh = true;
-            var roleOptionSettings = roleMenu.scrollBar.Inner.GetComponentsInChildren<RoleOptionSetting>(true);
-            var headers = roleMenu.scrollBar.Inner.GetComponentsInChildren<CategoryHeaderMasked>(true);
-            foreach (var child in roleOptionSettings)
-            {
-                Object.Destroy(child.gameObject);
-            }
-            foreach (var child in headers)
-            {
-                Object.Destroy(child.gameObject);
-            }
-            yield return new WaitForEndOfFrame();
-            MenuState.Instance.QueuedRoleMenuRefresh[MenuState.Instance.CurrentModIdx] = false;
-        }
-        if (!queuedRefresh && MenuState.Instance.FinishedRoleMenus.TryGetValue(MenuState.Instance.CurrentModIdx, out var finished) && finished)
+        if (MenuState.Instance.FinishedRoleMenus.TryGetValue(MenuState.Instance.CurrentModIdx, out var finished) && finished)
         {
             var roleOptionSettings = roleMenu.scrollBar.Inner.GetComponentsInChildren<RoleOptionSetting>(true);
             foreach (var r in roleOptionSettings)
@@ -171,17 +153,6 @@ public static class RoleSettingMenuPatches
                 ScrollerNum = 0.522f;
 
                 var num4 = 0;
-                var roleOptionSettings = roleMenu.scrollBar.Inner.GetComponentsInChildren<RoleOptionSetting>(false);
-                var headers = roleMenu.scrollBar.Inner.GetComponentsInChildren<CategoryHeaderMasked>(false);
-                foreach (var child in roleOptionSettings)
-                {
-                    Object.Destroy(child.gameObject);
-                }
-                foreach (var child in headers)
-                {
-                    Object.Destroy(child.gameObject);
-                }
-                yield return new WaitForEndOfFrame();
 
                 var roleGroups = MenuState.Instance.CurrentMod.InternalRoles.Values.OfType<ICustomRole>()
                     .ToLookup(x => x.RoleOptionsGroup);
@@ -205,7 +176,7 @@ public static class RoleSettingMenuPatches
                     foreach (var grouping in sortedRoleGroups)
                     {
                         if (!grouping.Any() ||
-                            grouping.All(x=> x.Configuration.HideSettings || !x.VisibleInSettings() || !x.Configuration.AssociatedGameMode.IsInstanceOfType(CustomGameModeManager.ActiveMode)))
+                            grouping.All(x => x.Configuration.HideSettings || !x.VisibleInSettings()))
                         {
                             continue;
                         }
@@ -336,7 +307,6 @@ public static class RoleSettingMenuPatches
                                     RoleGroupHidden[group] = !groupHidden;
                                 }
 
-                                MenuState.Instance.QueuedRoleMenuRefresh[MenuState.Instance.CurrentModIdx] = false;
                                 MenuState.Instance.FinishedRoleMenus[MenuState.Instance.CurrentModIdx] = false;
 
                                 foreach (var child in roleMenu.RoleChancesSettings.transform)
@@ -356,7 +326,6 @@ public static class RoleSettingMenuPatches
                     }
                 }
             }
-            MenuState.Instance.QueuedRoleMenuRefresh[MenuState.Instance.CurrentModIdx] = false;
             MenuState.Instance.FinishedRoleMenus[MenuState.Instance.CurrentModIdx] = true;
         }
 
@@ -547,26 +516,6 @@ public static class RoleSettingMenuPatches
         CurrentRoleOptions = filteredOptions;
     }
 
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(RolesSettingsMenu.ChangeTab))]
-    public static void ChangeTabPatch(RolesSettingsMenu __instance)
-    {
-        var categoryHeaderMasked = __instance.AdvancedRolesSettings.transform.Find("CategoryHeaderMasked").GetComponent<CategoryHeaderMasked>();
-        categoryHeaderMasked.Title.text = TranslationController.Instance.GetString(StringNames.RoleSettingsLabel);
-        var labelBg = __instance.AdvancedRolesSettings.transform.FindChild("InfoLabelBackground");
-        var imgBg = __instance.AdvancedRolesSettings.transform.FindChild("Imagebackground");
-        imgBg.gameObject.SetActive(true);
-        __instance.roleScreenshot.gameObject.SetActive(true);
-        __instance.roleDescriptionText.transform.parent.localPosition = new Vector3(2.5176f, -0.2731f, -1f);
-        __instance.roleDescriptionText.transform.parent.localScale = new Vector3(0.0675f, 0.1494f, 0.5687f);
-        labelBg.transform.localPosition = new Vector3(1.082f, 0.1054f, -2.5f);
-        __instance.roleScreenshot.drawMode = SpriteDrawMode.Simple;
-        foreach (var optBehaviour in __instance.AdvancedRolesSettings.GetComponentsInChildren<OptionBehaviour>())
-        {
-            optBehaviour.gameObject.Destroy();
-        }
-    }
-
     private static void ChangeTab(RoleBehaviour role, RolesSettingsMenu __instance)
     {
         if (role is not ICustomRole customRole)
@@ -596,8 +545,12 @@ public static class RoleSettingMenuPatches
             __instance.roleDescriptionText.transform.parent.localScale = new Vector3(0.0675f, 0.1494f, 0.5687f);
             labelBg.transform.localPosition = new Vector3(1.082f, 0.1054f, -2.5f);
 
-            __instance.roleScreenshot.sprite = role.RoleScreenshot;
-            __instance.roleScreenshot.drawMode = SpriteDrawMode.Simple;
+            __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.OptionsMenuColor;

MiraAPI/Patches/RoleGuidePatches.cs

@@ -1,164 +0,0 @@
-using System.Globalization;
-using System.Linq;
-using HarmonyLib;
-using Innersloth.Assets;
-using MiraAPI.Roles;
-using MiraAPI.Utilities;
-using UnityEngine;
-
-namespace MiraAPI.Patches;
-
-[HarmonyPatch]
-public static class RoleGuidePatches
-{
-    [HarmonyPostfix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.CreateNormalModeSettings))]
-    [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.CreateHnSModeSettings))]
-    public static void CreateNormalModeSettings(MatchInfoGuide __instance)
-    {
-        __instance.MatchInfoRoleMaskArea.transform.localPosition = new Vector3(-0.0184f, 0.15f, -0.1f);
-
-        __instance.matchInfoPlayersMaskArea.transform.localPosition =
-            __instance.matchInfoSettingsMaskArea.transform.localPosition = new Vector3(1.22f, -0.335f, -0.1f);
-
-        __instance.matchInfoPlayersMaskArea.size =
-            __instance.matchInfoSettingsMaskArea.size =
-                __instance.MatchInfoRoleMaskArea.size = new Vector2(-6, 1.8f);
-
-        __instance.matchInfoPlayersMaskArea.transform.parent.GetAllChildren().First(x => x.name.Contains("BG_Gradient"))
-                .GetComponent<SpriteRenderer>()
-                .maskInteraction =
-            __instance.matchInfoSettingsMaskArea.transform.parent.GetAllChildren()
-                    .First(x => x.name.Contains("BG_Gradient")).GetComponent<SpriteRenderer>()
-                    .maskInteraction =
-                __instance.MatchInfoRoleMaskArea.transform.parent.GetAllChildren()
-                    .First(x => x.name.Contains("BG_Gradient")).GetComponent<SpriteRenderer>()
-                    .maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.Awake))]
-    public static void Awake(MatchInfoGuide __instance)
-    {
-        __instance.transitionOpen.targetSize = 1.3f;
-    }
-
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.Open))]
-    public static bool Open(MatchInfoGuide __instance)
-    {
-        if (HudManager.Instance.GameMenu.IsOpen || HudManager.Instance.Chat.IsOpenOrOpening)
-        {
-            return false;
-        }
-
-        if (Minigame.Instance != null)
-        {
-            Minigame.Instance.Close();
-        }
-        if (MapBehaviour.Instance)
-        {
-            MapBehaviour.Instance.Close();
-        }
-        if (HudManager.InstanceExists)
-        {
-            ConsoleJoystick.SetMode_MenuAdditive();
-        }
-        ControllerManager.Instance.OpenOverlayMenu("MatchInfoGuide", __instance.closeButton);
-        bool enabled = ActiveInputManager.currentControlType == ActiveInputManager.InputType.Joystick;
-        __instance.glyphL.enabled = enabled;
-        __instance.glyphR.enabled = enabled;
-        if (GameManager.Instance.TryCast<NormalGameManager>() != null)
-        {
-            if (__instance.NormalModeSettings.Count == 0)
-            {
-                __instance.numOfTabs = 3;
-                __instance.TabButtons[0].SelectButton(true);
-                __instance.CreateNormalModeSettings();
-            }
-        }
-        else if (__instance.HnSModeSettings.Count == 0)
-        {
-            __instance.numOfTabs = 2;
-            __instance.TabButtons[0].SelectButton(true);
-            __instance.CreateHnSModeSettings();
-        }
-        PlayerControl.LocalPlayer.NetTransform.Halt();
-        __instance.MatchInfoParent.SetActive(true);
-        ControllerManager instance = ControllerManager.Instance;
-        ControllerUiElementsState currentUiState = ControllerManager.Instance.CurrentUiState;
-        Il2CppSystem.Collections.Generic.List<UiElement> controllerSelectable = __instance.ControllerSelectable;
-        instance.SetUpSelectables(currentUiState, controllerSelectable[controllerSelectable.Count - 1], __instance.ControllerSelectable);
-        ControllerManager instance2 = ControllerManager.Instance;
-        Il2CppSystem.Collections.Generic.List<UiElement> controllerSelectable2 = __instance.ControllerSelectable;
-        instance2.SetCurrentSelected(controllerSelectable2[controllerSelectable2.Count - 1]);
-        __instance.SetActiveTab(0);
-        return false;
-    }
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.CreatePlayerEntries))]
-    private static bool CreatePlayerEntries(MatchInfoGuide __instance)
-    {
-        __instance.PlayerPool.ReclaimAll();
-        int num = 51;
-        foreach (NetworkedPlayerInfo networkedPlayerInfo in GameData.Instance.AllPlayers)
-        {
-            PlayerIdentifierButton component =
-                __instance.PlayerPool.Get<PoolableBehavior>().GetComponent<PlayerIdentifierButton>();
-            component.transform.localPosition = new Vector3(0f, 0f, -1f);
-            component.Populate(networkedPlayerInfo);
-            __instance.ControllerSelectable.Add(component.Button);
-            component.SetTextStencil(num++);
-            component.PlatformIdentifier.transform.localPosition = new Vector3(0.314f, 0.088f, -2.78f);
-            component.NameText.transform.localPosition = new Vector3(0.3563f, 0, -2.98f);
-            component.NameText.text += $"\n<size=75%>{networkedPlayerInfo.GetPlayerColorString()}</size>";
-            var namePlate = HatManager.Instance.GetNamePlateById(networkedPlayerInfo.DefaultOutfit.NamePlateId);
-            var x = (NamePlateViewData viewdata) =>
-            {
-                component.buttonSprite.sprite = viewdata?.Image;
-                component.buttonSprite.transform.localScale = new Vector3(0.7f, 1.075f, 1);
-                component.buttonSprite.transform.localPosition = new Vector3(-0.395f, 0, 0.1f);
-            };
-            __instance.StartCoroutine(
-                AddressableAssetExtensions.CoLoadAssetAsync<NamePlateViewData>(
-                    __instance,
-                    namePlate.GetAssetReference(),
-                    x));
-        }
-
-        return false;
-    }
-    [HarmonyPrefix]
-    [HarmonyPriority(Priority.First)]
-    [HarmonyPatch(typeof(MatchInfoRolePanel), nameof(MatchInfoRolePanel.SetPanel))]
-    public static bool SetPanel(MatchInfoRolePanel __instance, RoleBehaviour role, int numPerGame, int chancePerGame)
-    {
-        __instance.roleCount.text = string.Format(CultureInfo.InvariantCulture, "{0} at {1}%", numPerGame.ToString(CultureInfo.InvariantCulture), chancePerGame);
-        if (role is ICustomRole customRole)
-        {
-            __instance.roleName.text = customRole.RoleName;
-            __instance.roleDescription.text = $"<size=60%>{customRole.RoleFactionTitle}</size>\n" + customRole.RoleMedDescription;
-            __instance.roleIcon.sprite = customRole.Configuration.Icon?.LoadAsset();
-            __instance.roleCount.text += $" ({customRole.ParentMod.MiraPlugin.GetAbbreviatedModName()})";
-        }
-        else
-        {
-            __instance.roleName.text = role.NiceName;
-            __instance.roleDescription.text = $"<size=60%>{TranslationController.Instance.GetString(role.TeamType is RoleTeamTypes.Crewmate ? StringNames.Crewmate : StringNames.Impostor)}</size>\n" + role.BlurbMed;
-            __instance.roleIcon.sprite = role.RoleIconColor;
-            __instance.roleCount.text += " (AU)";
-        }
-
-        __instance.roleIcon.SetSizeLimit(0.13f);
-        __instance.roleIcon.material.SetInt(PlayerMaterial.MaskLayer, 50);
-        __instance.roleName.fontMaterial.SetFloat(__instance.STENCIL_NAME, 50f);
-        __instance.roleDescription.fontMaterial.SetFloat(__instance.STENCIL_NAME, 50f);
-        __instance.roleCount.fontMaterial.SetFloat(__instance.STENCIL_NAME, 50f);
-        __instance.roleIcon.transform.localScale = new Vector3(4f, 4f, 1f);
-        return false;
-    }
-}

MiraAPI/Patches/Roles/GameStartupPatch.cs

@@ -1,8 +1,6 @@
 using HarmonyLib;
-using MiraAPI.GameModes;
 using MiraAPI.PluginLoading;
 using MiraAPI.Roles;
-using MiraAPI.Utilities.Assets;
 
 namespace MiraAPI.Patches.Roles;
 
@@ -24,13 +22,6 @@ public static class GameStartupPatch
         }
 
         _runOnce = true;
-        foreach (var mode in CustomGameModeManager.IdToModeMap.Values)
-        {
-            if (mode.Icon != null)
-            {
-                mode.TmpIcon = TmpSpriteUtils.CreateSpriteAsset(mode.Icon.LoadAsset(), $"MiraApi.Gamemode.{mode.Name.Replace(" ", string.Empty)}.png", 1.35f);
-            }
-        }
 
         if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0)
         {

MiraAPI/Patches/Roles/LogicRoleSelectionNormalPatch.cs

@@ -0,0 +1,93 @@
+using AmongUs.GameOptions;
+using HarmonyLib;
+using Il2CppSystem.Collections.Generic;
+using System.Linq;
+using MiraAPI.Roles;
+
+namespace MiraAPI.Patches.Roles;
+
+[HarmonyPatch(typeof(LogicRoleSelectionNormal))]
+public static class LogicRoleSelectionNormalPatch
+{
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(LogicRoleSelectionNormal.AssignRolesForTeam))]
+    public static bool AssignRolesForTeam(
+        LogicRoleSelectionNormal __instance,
+        List<NetworkedPlayerInfo> players,
+        IGameOptions opts,
+        RoleTeamTypes team,
+        int teamMax,
+        Il2CppSystem.Nullable<RoleTypes> defaultRole)
+    {
+        int num = 0;
+        var source = RoleManager.Instance.AllRoles.ToArray()
+            .Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
+                           CustomRoleUtils.CanSpawnOnCurrentMode(role));
+        List<RoleTypes> list = new List<RoleTypes>();
+        IRoleOptionsCollection roleOptions = opts.RoleOptions;
+
+        var assignmentData = source.Where(x => !x.IsDead).Select(role =>
+            new RoleManager.RoleAssignmentData(
+                role,
+                roleOptions.GetNumPerGame(role.Role),
+                roleOptions.GetChancePerGame(role.Role))).ToList();
+        var source2 = CustomRoleUtils.GetPossibleRoles(assignmentData, x => x.Chance == 100);
+        var guaranteedRoles = source.Where(x => source2.Contains(((ushort)x.Role, 100)));
+        foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
+                     new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
+        {
+            while (true)
+            {
+                RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
+                int count = roleAssignmentData2.Count;
+                roleAssignmentData2.Count = count - 1;
+                if (count <= 0)
+                {
+                    break;
+                }
+
+                list.Add(roleAssignmentData.Role.Role);
+            }
+        }
+
+        __instance.AssignRolesFromList(players, teamMax, list, ref num);
+
+        var list2 = source.Where(x => !x.IsDead).Select(role =>
+            new RoleManager.RoleAssignmentData(
+                role,
+                roleOptions.GetNumPerGame(role.Role),
+                roleOptions.GetChancePerGame(role.Role))).ToList();
+
+        list.Clear();
+        foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
+        {
+            for (int i = 0; i < roleAssignmentData3.Count; i++)
+            {
+                if (HashRandom.Next(101) < roleAssignmentData3.Chance)
+                {
+                    list.Add(roleAssignmentData3.Role.Role);
+                }
+            }
+        }
+
+        __instance.AssignRolesFromList(players, teamMax, list, ref num);
+        var defaultRole2 = team is RoleTeamTypes.Crewmate ? RoleTypes.Crewmate : RoleTypes.Impostor;
+        try
+        {
+            defaultRole2 = defaultRole.Value;
+        }
+        catch
+        {
+            // Ignored
+        }
+
+        while (list.Count < players.Count && list.Count + num < teamMax)
+        {
+            list.Add(defaultRole2);
+        }
+
+        __instance.AssignRolesFromList(players, teamMax, list, ref num);
+
+        return false;
+    }
+}

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -3,7 +3,6 @@ using AmongUs.GameOptions;
 using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.GameModes;
 using MiraAPI.Modifiers;
 using MiraAPI.Roles;
 using UnityEngine;
@@ -66,20 +65,14 @@ public static class RoleManagerPatches
     [HarmonyPatch(nameof(RoleManager.SelectRoles))]
     public static void ModifierSelectionPatches(RoleManager __instance)
     {
-        if (AmongUsClient.Instance.AmHost && ModifierManager.MiraAssignsModifiers)
-        {
-            ModifierManager.AssignModifiers(
-                PlayerControl.AllPlayerControls.ToArray().Where(plr => !plr.Data.IsDead && !plr.Data.Disconnected)
-                    .ToList());
-        }
-
-        var roleSelection = GameManager.Instance.LogicRoleSelection.Cast<LogicRoleSelectionNormal>();
-        if (CustomGameModeManager.ActiveMode == null || roleSelection == null)
+        if (!AmongUsClient.Instance.AmHost || !ModifierManager.MiraAssignsModifiers)
         {
             return;
         }
 
-        CustomGameModeManager.ActiveMode.PostAssignRoles(roleSelection);
+        ModifierManager.AssignModifiers(
+            PlayerControl.AllPlayerControls.ToArray().Where(plr => !plr.Data.IsDead && !plr.Data.Disconnected)
+                .ToList());
     }
 
     [HarmonyPrefix]

MiraAPI/Patches/Roles/RoleOptionsCollectionPatch.cs

@@ -8,17 +8,17 @@ namespace MiraAPI.Patches.Roles;
 /// <summary>
 /// Patches to return the correct role counts.
 /// </summary>
-[HarmonyPatch(typeof(RoleOptionsCollectionV11))]
+[HarmonyPatch(typeof(RoleOptionsCollectionV10))]
 public static class RoleOptionsCollectionPatch
 {
     /// <summary>
-    /// This patch fixes <see cref="RoleOptionsCollectionV11.GetNumPerGame(RoleTypes)"/> being inlined (2025.9.9) in the original code.
+    /// This patch fixes <see cref="RoleOptionsCollectionV10.GetNumPerGame(RoleTypes)"/> being inlined (2025.9.9) in the original code.
     /// </summary>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV11.AnyRolesEnabled))]
-    public static bool AnyRolesEnabledPrefix(RoleOptionsCollectionV11 __instance, ref bool __result)
+    [HarmonyPatch(nameof(RoleOptionsCollectionV10.AnyRolesEnabled))]
+    public static bool AnyRolesEnabledPrefix(RoleOptionsCollectionV10 __instance, ref bool __result)
     {
-        foreach (KeyValuePair<RoleTypes, RoleDataV11> keyValuePair in __instance.roles)
+        foreach (KeyValuePair<RoleTypes, RoleDataV10> keyValuePair in __instance.roles)
         {
             if (__instance.GetNumPerGame(keyValuePair.Key) > 0)
             {
@@ -33,7 +33,7 @@ public static class RoleOptionsCollectionPatch
     /// </summary>
     /// <returns>Return <see langword="false"/> to skip original method, <see langword="true"/> to not.</returns>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV11.GetChancePerGame))]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV10.GetChancePerGame))]
     public static bool GetChancePrefix(RoleTypes role, ref int __result)
     {
         if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)
@@ -63,7 +63,7 @@ public static class RoleOptionsCollectionPatch
     /// </summary>
     /// <returns>Return <see langword="false"/> to skip original method, <see langword="true"/> to not.</returns>
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleOptionsCollectionV11.GetNumPerGame))]
+    [HarmonyPatch(nameof(RoleOptionsCollectionV10.GetNumPerGame))]
     public static bool GetNumPrefix(RoleTypes role, ref int __result)
     {
         if (!CustomRoleManager.GetCustomRoleBehaviour(role, out var customRole) || customRole == null)

MiraAPI/Patches/Roles/SelectRolesPatch.cs

@@ -1,127 +0,0 @@
-using System.Collections.Generic;
-using AmongUs.GameOptions;
-using HarmonyLib;
-using System.Linq;
-using InnerNet;
-using MiraAPI.GameModes;
-using MiraAPI.Roles;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(RoleManager))]
-public static class SelectRolesPatch
-{
-    public static bool ApiHandlesRoleSelect = true;
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(RoleManager.SelectRoles))]
-    public static bool SelectRoles()
-    {
-        var roleSelection = GameManager.Instance.LogicRoleSelection.Cast<LogicRoleSelectionNormal>();
-        if (!AmongUsClient.Instance.AmHost || roleSelection == null)
-        {
-            return true;
-        }
-
-        if (CustomGameModeManager.ActiveMode != null)
-        {
-            CustomGameModeManager.ActiveMode.AssignRoles(out var runOriginal, roleSelection);
-
-            if (!runOriginal)
-            {
-                return false;
-            }
-        }
-        if (!ApiHandlesRoleSelect)
-        {
-            return true;
-        }
-        Il2CppSystem.Collections.Generic.List<ClientData> list = new();
-        AmongUsClient.Instance.GetAllClients(list);
-        List<NetworkedPlayerInfo> list2 = list.ToArray()
-            .Where(c => c.Character != null && c.Character.Data != null && !c.Character.Data.Disconnected &&
-                        !c.Character.Data.IsDead).OrderBy(c => c.Id).Select(c => c.Character.Data)
-            .ToList();
-
-        foreach (NetworkedPlayerInfo networkedPlayerInfo in GameData.Instance.AllPlayers)
-        {
-            if (networkedPlayerInfo.Object != null && networkedPlayerInfo.Object.isDummy)
-            {
-                list2.Add(networkedPlayerInfo);
-            }
-        }
-        IGameOptions currentGameOptions = GameOptionsManager.Instance.CurrentGameOptions;
-        int adjustedNumImpostors = GameOptionsManager.Instance.CurrentGameOptions.GetAdjustedNumImpostors(list2.Count);
-        AssignRolesForTeam(list2, currentGameOptions, RoleTeamTypes.Impostor, adjustedNumImpostors, RoleTypes.Impostor);
-        AssignRolesForTeam(list2, currentGameOptions, RoleTeamTypes.Crewmate, int.MaxValue, RoleTypes.Crewmate);
-        return false;
-    }
-
-    public static void AssignRolesForTeam(
-        List<NetworkedPlayerInfo> players,
-        IGameOptions opts,
-        RoleTeamTypes team,
-        int teamMax,
-        RoleTypes defaultRole)
-    {
-        int num = 0;
-        var source = RoleManager.Instance.AllRoles.ToArray()
-            .Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
-                           CustomRoleUtils.CanSpawnOnCurrentMode(role));
-        List<RoleTypes> list = new List<RoleTypes>();
-        IRoleOptionsCollection roleOptions = opts.RoleOptions;
-
-        // Assign guaranteed roles first, just like the vanilla selector. This is
-        // important because the list of players is shared by both team passes.
-        foreach (var role in source.Where(x => roleOptions.GetChancePerGame(x.Role) == 100)
-                     .Select(role => role.Role))
-        {
-            for (var i = 0; i < roleOptions.GetNumPerGame(role); i++)
-            {
-                list.Add(role);
-            }
-        }
-
-        AssignRolesFromList(players, teamMax, list, ref num);
-
-        // A 100% role was already assigned above. Including it here can consume
-        // another player and, more importantly, leaves the fallback count wrong.
-        list.Clear();
-        foreach (var role in source.Where(x =>
-                     roleOptions.GetChancePerGame(x.Role) > 0 &&
-                     roleOptions.GetChancePerGame(x.Role) < 100)
-                     .Select(role => role.Role))
-        {
-            for (var i = 0; i < roleOptions.GetNumPerGame(role); i++)
-            {
-                if (HashRandom.Next(101) < roleOptions.GetChancePerGame(role))
-                {
-                    list.Add(role);
-                }
-            }
-        }
-
-        AssignRolesFromList(players, teamMax, list, ref num);
-
-        // Assign the remaining players up to the requested team limit. The
-        // vanilla list has been consumed by AssignRolesFromList at this point,
-        // so checking list.Count can leave players unassigned.
-        while (players.Count > 0 && num < teamMax)
-        {
-            list.Add(defaultRole);
-            AssignRolesFromList(players, teamMax, list, ref num);
-        }
-    }
-    private static void AssignRolesFromList(List<NetworkedPlayerInfo> players, int teamMax, List<RoleTypes> roleList, ref int rolesAssigned)
-    {
-        while (roleList.Count > 0 && players.Count > 0 && rolesAssigned < teamMax)
-        {
-            int index = HashRandom.FastNext(roleList.Count);
-            RoleTypes roleType = roleList[index];
-            roleList.RemoveAt(index);
-            int index2 = HashRandom.FastNext(players.Count);
-            players[index2].Object.RpcSetRole(roleType, false);
-            players.RemoveAt(index2);
-            rolesAssigned++;
-        }
-    }
-}

MiraAPI/Patches/Voting/MeetingHudPatches.cs

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

MiraAPI/PluginLoading/IMiraPlugin.cs

@@ -1,7 +1,5 @@
 using System.Linq;
 using BepInEx.Configuration;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
 
 namespace MiraAPI.PluginLoading;
 
@@ -19,7 +17,7 @@ public interface IMiraPlugin
     /// Gets the name to display on the options menu.
     /// </summary>
     string OptionsTitleText { get; }
-    
+
     /// <summary>
     /// Gets the abbreviated name to display for other mods to pick up.
     /// </summary>

MiraAPI/PluginLoading/MiraPluginInfo.cs

@@ -44,15 +44,6 @@ public class MiraPluginInfo
     /// </summary>
     public ReadOnlyDictionary<ushort, RoleBehaviour> Roles { get; private set; } = null!;
 
-    /// <summary>
-    /// Gets a read only dictionary of Game Mode IDs and the AbstractGameMode object they are associated with.
-    /// </summary>
-    /// <returns>Read only dictionary of IDs and Game Modes.</returns>
-    public ReadOnlyDictionary<uint, AbstractGameMode> GetModes()
-    {
-        return new ReadOnlyDictionary<uint, AbstractGameMode>(GameModes);
-    }
-
     /// <summary>
     /// Gets a <see cref="IReadOnlyCollection{T}"/> of this <see cref="IMiraPlugin"/>'s <see cref="CustomActionButton"/>.
     /// </summary>
@@ -81,9 +72,10 @@ public class MiraPluginInfo
 
     internal List<BaseModifier> InternalModifiers { get; } = [];
 
-    internal Dictionary<uint, AbstractGameMode> GameModes { get; } = [];
     internal Dictionary<ushort, RoleBehaviour> InternalRoles { get; } = [];
 
+    internal Dictionary<int, CustomGameMode> InternalGameModes { get; } = [];
+
     internal List<CustomActionButton> InternalButtons { get; } = [];
 
     /// <summary>

MiraAPI/PluginLoading/MiraPluginManager.cs

@@ -7,11 +7,9 @@ using System.Reflection;
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
-using Il2CppInterop.Runtime.Injection;
 using MiraAPI.Colors;
 using MiraAPI.Events;
 using MiraAPI.GameEnd;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.GameOptions.Attributes;
 using MiraAPI.Hud;
@@ -23,7 +21,6 @@ using MiraAPI.Patches.Options;
 using MiraAPI.Presets;
 using MiraAPI.Roles;
 using MiraAPI.Utilities;
-using Reactor.Localization.Utilities;
 using Reactor.Networking;
 using Reactor.Utilities;
 
@@ -36,117 +33,15 @@ public sealed class MiraPluginManager
 {
     private readonly Dictionary<Assembly, MiraPluginInfo> _registeredPlugins = [];
 
-    internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = [];
-    internal MiraPluginInfo[] RegisteredPluginsWithOptions { get; private set; } = [];
-    internal MiraPluginInfo[] PluginsWithOptionsOrGameModes { get; private set; } = [];
+    internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = null!;
+    internal MiraPluginInfo[] RegisteredPluginsWithOptions { get; private set; } = null!;
 
     internal Dictionary<MiraPluginInfo, List<Type>> QueuedRoleRegistrations { get; } = [];
     internal static MiraPluginManager Instance { get; private set; } = new();
-    public static ConfigFile MiraApiConfig { get; private set; } = null!;
-    public static MiraPluginInfo MiraApiPluginInfo { get; private set; } = null!;
 
-    internal void Initialize(BasePlugin miraApiPlugin, IMiraPlugin apiPlugin)
+    internal void Initialize()
     {
         Instance = this;
-        CustomGameModeManager.RegisterDefaultMode();
-        CustomGameModeManager.GetAndSetGameMode();
-        if (IL2CPPChainloader.Instance.Plugins.TryGetValue(MiraApiPlugin.Id, out var newPlugin))
-        {
-            var assembly = Assembly.GetCallingAssembly();
-            var info = new MiraPluginInfo(apiPlugin, newPlugin);
-            var roles = new List<Type>();
-
-            var oldConfigSetting = info.PluginConfig.SaveOnConfigSet;
-            info.PluginConfig.SaveOnConfigSet = false;
-
-            foreach (var type in assembly.GetTypes())
-            {
-                if (type.IsAbstract || type.GetCustomAttribute<MiraIgnoreAttribute>() != null)
-                {
-                    continue;
-                }
-
-                foreach (var method in AccessTools.GetDeclaredMethods(type))
-                {
-                    var eventAttribute = method.GetCustomAttribute<RegisterEventAttribute>();
-                    if (eventAttribute == null)
-                    {
-                        continue;
-                    }
-
-                    if (!method.IsStatic)
-                    {
-                        Error($"Event method {method.Name} in {type.Name} must be static.");
-                        continue;
-                    }
-
-                    var parameters = method.GetParameters();
-                    if (parameters.Length != 1 || !parameters[0].ParameterType.IsSubclassOf(typeof(MiraEvent)))
-                    {
-                        Error($"Invalid event registration method {method.Name} in {type.Name}");
-                        continue;
-                    }
-
-                    var paramType = parameters[0].ParameterType;
-                    MiraEventManager.RegisterEventHandler(paramType, method, eventAttribute.Priority);
-                }
-
-                if (RegisterModifier(type, info))
-                {
-                    continue;
-                }
-
-                if (RegisterOptions(type, info))
-                {
-                    continue;
-                }
-
-                if (RegisterLocalTabs(type, miraApiPlugin))
-                {
-                    continue;
-                }
-
-                if (RegisterRole(type, info, out var role))
-                {
-                    roles.Add(role);
-                    continue;
-                }
-
-                if (RegisterButton(type, info))
-                {
-                    continue;
-                }
-
-                if (RegisterGameOver(type))
-                {
-                    continue;
-                }
-
-                if (RegisterGameModeAttribute(type, info))
-                {
-                    continue;
-                }
-
-                RegisterColorClasses(type);
-                RegisterKeybinds(type, miraApiPlugin);
-            }
-
-            info.PluginConfig.Save();
-            info.PluginConfig.SaveOnConfigSet = oldConfigSetting;
-            MiraApiConfig = info.PluginConfig;
-
-            info.InternalOptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority));
-            QueuedRoleRegistrations.Add(info, roles);
-
-            _registeredPlugins.Add(assembly, info);
-            MiraApiPluginInfo = info;
-
-            info.SavePublicCollections();
-            PresetManager.CreateDefaultPreset(info);
-            PresetManager.LoadPresets(info);
-            Info($"Registering Mira API as mod.");
-        }
-
         IL2CPPChainloader.Instance.PluginLoad += (pluginInfo, assembly, plugin) =>
         {
             if (plugin is not IMiraPlugin miraPlugin)
@@ -223,11 +118,6 @@ public sealed class MiraPluginManager
                     continue;
                 }
 
-                if (RegisterGameModeAttribute(type, info))
-                {
-                    continue;
-                }
-
                 RegisterColorClasses(type);
                 RegisterKeybinds(type, plugin);
             }
@@ -250,30 +140,12 @@ public sealed class MiraPluginManager
         {
             // Save all buttons into a read-only collection for easy access
             CustomButtonManager.Buttons = new ReadOnlyCollection<CustomActionButton>(CustomButtonManager.CustomButtons);
-            CustomButtonManager.EventTypes = new ReadOnlyDictionary<Type, Type>(CustomButtonManager.ButtonEventTypes);
-            CustomButtonManager.CancelledEventTypes = new ReadOnlyDictionary<Type, Type>(CustomButtonManager.ButtonCancelledEventTypes);
 
             // Cache all the registered plugins into an array for easy access
             RegisteredPlugins = [.. _registeredPlugins.Values];
             RegisteredPluginsWithOptions = [.. RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu)];
-            PluginsWithOptionsOrGameModes = [..RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu || m.GameModes.Count > 0)];
 
             ModifierManager.Modifiers = new ReadOnlyCollection<BaseModifier>(ModifierManager.InternalModifiers);
-
-            var dict = new Dictionary<string, object>();
-            foreach (var (key, value) in CustomGameModeManager.IdToModeMap)
-            {
-                if (value is ClassicMode)
-                {
-                    continue;
-                }
-                dict.Add(value.Name, key);
-                if (((AmongUs.GameOptions.GameModes) key) == AmongUs.GameOptions.GameModes.Normal)
-                    return;
-                // 'Default' was still being registered twice and idk why
-                GameModesHelpers.ModeToName.Add((AmongUs.GameOptions.GameModes)key, CustomStringName.CreateAndRegister(value.Name));
-            }
-            EnumInjector.InjectEnumValues<AmongUs.GameOptions.GameModes>(dict);
         };
 
         RegisterKeybinds(typeof(MiraGlobalKeybinds), PluginSingleton<MiraApiPlugin>.Instance);
@@ -449,20 +321,6 @@ public sealed class MiraPluginManager
         return false;
     }
 
-    private static bool RegisterGameModeAttribute(Type type, MiraPluginInfo pluginInfo)
-    {
-        try
-        {
-            if (typeof(AbstractGameMode).IsAssignableFrom(type))
-                return CustomGameModeManager.RegisterGameMode(type, pluginInfo);
-        }
-        catch (Exception e)
-        {
-            Error($"Failed to register gamemode {type.Name}: {e}");
-        }
-        return false;
-    }
-
     private static bool RegisterLocalTabs(Type type, BasePlugin pluginInfo)
     {
         try

MiraAPI/Roles/CustomRoleConfiguration.cs

@@ -1,7 +1,6 @@
-using System;
 using AmongUs.GameOptions;
+using System;
 using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.GameModes;
 using MiraAPI.Patches.Freeplay;
 using MiraAPI.Utilities.Assets;
 using TMPro;
@@ -101,11 +100,6 @@ public record struct CustomRoleConfiguration
     [HideFromIl2Cpp]
     public LoadableAsset<AudioClip>? IntroSound { get; set; } = null;
 
-    /// <summary>
-    /// Gets or sets the associated game mode for this role. This is used to determine if the role should be available in a specific game mode.
-    /// </summary>
-    public Type AssociatedGameMode { get; set; } = typeof(ClassicMode);
-
     /// <summary>
     /// Gets or sets a value indicating whether the role is affected by light affectors on Airship.
     /// </summary>

MiraAPI/Roles/CustomRoleManager.cs

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

MiraAPI/Roles/CustomRoleUtils.cs

@@ -4,8 +4,6 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using AmongUs.GameOptions;
-using MiraAPI.GameModes;
-using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
 
@@ -25,14 +23,14 @@ public static class CustomRoleUtils
     {
         if (role is ICustomRole custom)
         {
-            return custom.CanSpawnOnCurrentMode() && custom.Configuration.AssociatedGameMode.IsInstanceOfType(CustomGameModeManager.ActiveMode);
+            return custom.CanSpawnOnCurrentMode();
         }
 
-        if (CustomGameModeManager.ActiveMode is HideAndSeekMode)
+        if (GameManager.Instance.IsHideAndSeek())
         {
             return role.Role is RoleTypes.Engineer || role.Role is RoleTypes.Impostor;
         }
-        return !Helpers.IsRoleBlacklisted(role);
+        return true;
     }
 
     public static List<(ushort RoleType, int Chance)> GetPossibleRoles(

MiraAPI/Roles/ICustomRole.cs

@@ -23,27 +23,11 @@ public interface ICustomRole : IOptionable
     /// </summary>
     string RoleDescription { get; }
 
-    /// <summary>
-    /// Gets the medium description of the role. Used in the role guide.
-    /// </summary>
-    string RoleMedDescription => RoleDescription;
-
     /// <summary>
     /// Gets the long description of the role. Used in the Role Tab and Role Options.
     /// </summary>
     string RoleLongDescription { get; }
 
-    /// <summary>
-    /// Gets the faction / alignment of the role. Used in the role guide.
-    /// </summary>
-    string RoleFactionTitle => Team switch
-    {
-        ModdedRoleTeams.Crewmate => TranslationController.Instance.GetString(StringNames.Crewmate),
-        ModdedRoleTeams.Impostor => TranslationController.Instance.GetString(StringNames.Impostor),
-        ModdedRoleTeams.Custom => "Neutral",
-        _ => "Other",
-    };
-
     /// <summary>
     /// Gets the <see cref="Color"/> of the role.
     /// </summary>

MiraAPI/Utilities/Assets/LoadableBundleSubAsset.cs

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

MiraAPI/Utilities/Assets/LoadableBundleSubAssetHolder.cs

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

MiraAPI/Utilities/Assets/MiraAssets.cs

@@ -130,35 +130,10 @@ public static class MiraAssets
     /// </summary>
     public static LoadableResourceAsset ModifierFile { get; } = new("MiraAPI.Resources.ModifierFile.png");
 
-    /// <summary>
-    /// Gets the sprite used for the Classic gamemode.
-    /// </summary>
-    public static LoadableResourceAsset ClassicGamemodeIcon { get; } = new("MiraAPI.Resources.ClassicGamemodeIcon.png");
-
-    /// <summary>
-    /// Gets the sprite used for the Hide n Seek gamemode.
-    /// </summary>
-    public static LoadableResourceAsset HnSGamemodeIcon { get; } = new("MiraAPI.Resources.HnSGamemodeIcon.png");
-
     /// <summary>
     /// Gets the sprite used for timed modifier file in TaskAdderGame.
     /// </summary>
     public static LoadableResourceAsset TimedModifierFile { get; } = new("MiraAPI.Resources.TimedModifierFile.png");
 
-    /// <summary>
-    /// Gets the sprite used for the new chat button while hovering.
-    /// </summary>
-    public static LoadableResourceAsset ChatHoverSprite { get; } = new("MiraAPI.Resources.NormalChatHover.png");
-
-    /// <summary>
-    /// Gets the sprite used for the new chat button while hovering.
-    /// </summary>
-    public static LoadableResourceAsset ChatIdleSprite { get; } = new("MiraAPI.Resources.NormalChatIdle.png");
-
-    /// <summary>
-    /// Gets the sprite used for the new chat button while hovering.
-    /// </summary>
-    public static LoadableResourceAsset ChatOpenSprite { get; } = new("MiraAPI.Resources.NormalChatOpen.png");
-
     internal static LoadableResourceAsset BlankSprite { get; } = new("MiraAPI.Resources.BlankSprite.png");
 }

MiraAPI/Utilities/Assets/TmpSpriteUtils.cs

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

MiraAPI/Utilities/Extensions.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using HarmonyLib;
-using MiraAPI.GameModes;
 using MiraAPI.GameOptions;
 using MiraAPI.Networking;
 using MiraAPI.Roles;
@@ -165,7 +164,7 @@ public static class Extensions
     /// </summary>
     /// <param name="state">The <see cref="PlayerVoteArea"/>.</param>
     /// <returns>The player's <see cref="PlayerControl"/>.</returns>
-    public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.PlayerId)?.Object;
+    public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.TargetPlayerId)?.Object;
 
     /// <summary>
     /// Gets an <see langword="int"/> representing the amount of tasks a player has left.
@@ -367,71 +366,6 @@ public static class Extensions
         GC.Collect();
     }
 
-    /// <summary>
-    /// Gets all child objects in a parent object.
-    /// </summary>
-    /// <returns>An <see cref="IEnumerable"/> that contains <see cref="GameObject"/>s.</returns>
-    public static IEnumerable<GameObject> GetAllChildren(this GameObject go)
-    {
-        for (var i = 0; i < go.transform.childCount; i++)
-        {
-            yield return go.transform.GetChild(i).gameObject;
-        }
-    }
-
-    /// <summary>
-    /// Gets all child objects in a parent Transform.
-    /// </summary>
-    /// <returns>An <see cref="IEnumerable"/> that contains <see cref="GameObject"/>s.</returns>
-    public static IEnumerable<GameObject> GetAllChildren(this Transform go)
-    {
-        for (var i = 0; i < go.transform.childCount; i++)
-        {
-            yield return go.transform.GetChild(i).gameObject;
-        }
-    }
-
-    /// <summary>
-    /// Resizes a <see cref="SpriteRenderer"/> appropriate to the maximum pixel size without messing up ratios.
-    /// </summary>
-    /// <param name="sprite">The <see cref="SpriteRenderer"/> to adjust.</param>
-    /// <param name="pixelSize">The scale for the sprite to be adjusted to.</param>
-    public static void SetSizeLimit(this SpriteRenderer sprite, float pixelSize)
-    {
-        sprite.drawMode = SpriteDrawMode.Sliced;
-        if (!sprite.sprite)
-        {
-            return;
-        }
-
-        float spriteWidth = sprite.sprite.rect.width;
-        float spriteHeight = sprite.sprite.rect.height;
-
-        if (spriteWidth < spriteHeight)
-        {
-            sprite.size = new Vector2(pixelSize * spriteWidth / spriteHeight, pixelSize);
-        }
-        else
-        {
-            sprite.size = new Vector2(pixelSize, pixelSize * spriteHeight / spriteWidth);
-        }
-    }
-
-    /// <summary>
-    /// Resizes a <see cref="SpriteRenderer"/> appropriate to the maximum pixel size without messing up ratios.
-    /// </summary>
-    /// <param name="spriteObj">The <see cref="GameObject"/> to adjust.</param>
-    /// <param name="pixelSize">The scale for the sprite to be adjusted to.</param>
-    public static void SetSizeLimit(this GameObject spriteObj, float pixelSize)
-    {
-        if (!spriteObj.TryGetComponent<SpriteRenderer>(out var sprite))
-        {
-            return;
-        }
-
-        sprite.SetSizeLimit(pixelSize);
-    }
-
     /// <summary>
     /// Gets a cache of <see cref="PlayerControl"/>'s <see cref="PlayerVoteData"/> to improve performance.
     /// </summary>
@@ -677,8 +611,7 @@ public static class Extensions
     public static bool IsCustom(this OptionBehaviour optionBehaviour)
     {
         return ModdedOptionsManager.ModdedOptions.Values.Any(
-            opt => opt.OptionBehaviour && opt.OptionBehaviour == optionBehaviour)
-            || optionBehaviour.Equals(GameModeOption.OptionBehaviour);
+            opt => opt.OptionBehaviour && opt.OptionBehaviour == optionBehaviour);
     }
 
     /// <summary>

MiraAPI/Utilities/ShaderID.cs

@@ -24,80 +24,80 @@ public static class ShaderID
     }
 
     // For player shader
-    public static readonly int BodyColor = Get("_BodyColor");
-    public static readonly int BackColor = Get("_BackColor");
-    public static readonly int VisorColor = Get("_VisorColor");
+    public static readonly int BodyColor = Shader.PropertyToID("_BodyColor");
+    public static readonly int BackColor = Shader.PropertyToID("_BackColor");
+    public static readonly int VisorColor = Shader.PropertyToID("_VisorColor");
 
     // Main texture, very obviously used in any shader with a texture
-    public static readonly int MainTex = Get("_MainTex");
+    public static readonly int MainTex = Shader.PropertyToID("_MainTex");
 
     // Any masking stuff, like MeetingHud bubbles
-    public static readonly int Mask = Get("_Mask");
-    public static readonly int MaskComp = Get("_MaskComp");
-    public static readonly int MaskLayer = Get("_MaskLayer");
-    public static readonly int Stencil = Get("_Stencil");
-    public static readonly int StencilComp = Get("_StencilComp");
+    public static readonly int Mask = Shader.PropertyToID("_Mask");
+    public static readonly int MaskComp = Shader.PropertyToID("_MaskComp");
+    public static readonly int MaskLayer = Shader.PropertyToID("_MaskLayer");
+    public static readonly int Stencil = Shader.PropertyToID("_Stencil");
+    public static readonly int StencilComp = Shader.PropertyToID("_StencilComp");
 
     // Used in many tasks
-    public static readonly int Color = Get("_Color");
+    public static readonly int Color = Shader.PropertyToID("_Color");
 
     // Has 2 uses in the game, provided for convenience
-    public static readonly int Opacity = Get("_Opacity");
+    public static readonly int Opacity = Shader.PropertyToID("_Opacity");
 
     // Used once in CooldownHelpers, once in PowerBarMining
-    public static readonly int NormalizedUvs = Get("_NormalizedUvs");
+    public static readonly int NormalizedUvs = Shader.PropertyToID("_NormalizedUvs");
 
     // Used in many consoles
-    public static readonly int Outline = Get("_Outline");
-    public static readonly int OutlineColor = Get("_OutlineColor");
+    public static readonly int Outline = Shader.PropertyToID("_Outline");
+    public static readonly int OutlineColor = Shader.PropertyToID("_OutlineColor");
 
     // Used in some consoles
-    public static readonly int AddColor = Get("_AddColor");
+    public static readonly int AddColor = Shader.PropertyToID("_AddColor");
 
     // Has some uses in various locations
-    public static readonly int Percent = Get("_Percent");
-    public static readonly int PercentY = Get("_PercentY");
-    public static readonly int Desat = Get("_Desat");
+    public static readonly int Percent = Shader.PropertyToID("_Percent");
+    public static readonly int PercentY = Shader.PropertyToID("_PercentY");
+    public static readonly int Desat = Shader.PropertyToID("_Desat");
 
     // Used in LightSource
-    public static readonly int PlayerRadius = Get("_PlayerRadius");
-    public static readonly int LightRadius = Get("_LightRadius");
-    public static readonly int LightOffset = Get("_LightOffset");
-    public static readonly int FlashlightSize = Get("_FlashlightSize");
-    public static readonly int FlashlightAngle = Get("_FlashlightAngle");
+    public static readonly int PlayerRadius = Shader.PropertyToID("_PlayerRadius");
+    public static readonly int LightRadius = Shader.PropertyToID("_LightRadius");
+    public static readonly int LightOffset = Shader.PropertyToID("_LightOffset");
+    public static readonly int FlashlightSize = Shader.PropertyToID("_FlashlightSize");
+    public static readonly int FlashlightAngle = Shader.PropertyToID("_FlashlightAngle");
 
     // Used once for LightSourceGpuRenderer
-    public static readonly int DepthCompressionValue = Get("_DepthCompressionValue");
+    public static readonly int DepthCompressionValue = Shader.PropertyToID("_DepthCompressionValue");
 
     // Used in ProgressTracker
-    public static readonly int Buckets = Get("_Buckets");
-    public static readonly int FullBuckets = Get("_FullBuckets");
+    public static readonly int Buckets = Shader.PropertyToID("_Buckets");
+    public static readonly int FullBuckets = Shader.PropertyToID("_FullBuckets");
 
     // Used once in IntroCutscene and EndGameManager
-    public static readonly int Rad = Get("_Rad");
+    public static readonly int Rad = Shader.PropertyToID("_Rad");
 
     // Used only once for Quick Chat
-    public static readonly int FaceColor = Get("_FaceColor");
+    public static readonly int FaceColor = Shader.PropertyToID("_FaceColor");
 
     // Used for NavigationMinigame
-    public static readonly int CrossHair = Get("_CrossHair");
-    public static readonly int CrossColor = Get("_CrossColor");
+    public static readonly int CrossHair = Shader.PropertyToID("_CrossHair");
+    public static readonly int CrossColor = Shader.PropertyToID("_CrossColor");
 
     // Used for both SurveillanceMinigame (Planet and Normal)
-    public static readonly int Center = Get("_Center");
-    public static readonly int Color2 = Get("_Color2");
+    public static readonly int Center = Shader.PropertyToID("_Center");
+    public static readonly int Color2 = Shader.PropertyToID("_Color2");
 
     // Used in ReactorShipRoom
-    public static readonly int Speed = Get("_Speed");
+    public static readonly int Speed = Shader.PropertyToID("_Speed");
 
     // Used only once in CourseMinigame
-    public static readonly int AltTex = Get("_AltTex");
-    public static readonly int Perc = Get("_Perc");
+    public static readonly int AltTex = Shader.PropertyToID("_AltTex");
+    public static readonly int Perc = Shader.PropertyToID("_Perc");
 
     // Used once in TextMarquee
-    public static readonly int VertexOffsetX = Get("_VertexOffsetX");
-    public static readonly int VertexOffsetY = Get("_VertexOffsetY");
+    public static readonly int VertexOffsetX = Shader.PropertyToID("_VertexOffsetX");
+    public static readonly int VertexOffsetY = Shader.PropertyToID("_VertexOffsetY");
 
     // Used in VertLineBehaviour
-    public static readonly int Fade = Get("_Fade");
+    public static readonly int Fade = Shader.PropertyToID("_Fade");
 }

MiraAPI/VanillaEvents/JudgeEvents.cs

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

MiraAPI/Voting/VotingUtils.cs

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