Reimplement vanilla kill animations in mira

Directory.Build.props

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

MiraAPI.Example/ExampleEventHandlers.cs

@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Linq;
+using System.Linq;
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
 using MiraAPI.Events.Vanilla.Gameplay;
@@ -18,7 +17,7 @@ public static class ExampleEventHandlers
 {
     public static void Initialize()
     {
-        // You can register event handlers with the MiraEventManager class
+        // You can register event handlers with the MiraEventManager class.
         var handle = MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
         {
             Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
@@ -38,21 +37,6 @@ public static class ExampleEventHandlers
         MiraEventManager.UnregisterEventHandler(handle);
     }
 
-    // If you want to check vanilla buttons, use something like this!
-    [RegisterEvent]
-    public static void VanillaButtonClickHandler(VanillaButtonClickEvent @event)
-    {
-        Logger<ExamplePlugin>.Info($"{@event.Button.buttonLabelText.text} is being used!");
-        if (@event.PlayerTarget != null)
-        {
-            Logger<ExamplePlugin>.Info($"{@event.PlayerTarget.Data.PlayerName} is being targeted!");
-        }
-        else if (@event.VentTarget != null)
-        {
-            Logger<ExamplePlugin>.Info($"Vent with id {@event.VentTarget.Id.ToString(CultureInfo.InvariantCulture)} is being targeted!");
-        }
-    }
-
     // If you want to add extra votes to a player, do something like this.
     [RegisterEvent]
     public static void StartMeetingEvent(StartMeetingEvent _)

MiraAPI/Events/Vanilla/Gameplay/VanillaButtonCancelledEvent.cs

@@ -1,44 +0,0 @@
-using MiraAPI.Hud;
-
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Invoked when a Vanilla Button click is cancelled. Do not use for custom buttons.
-/// </summary>
-/// <typeparam name="T">The Vanilla Button type.</typeparam>
-public sealed class VanillaButtonCancelledEvent<T> : MiraEvent where T : AbilityButton
-{
-    /// <summary>
-    /// Gets Vanilla Button whose click was cancelled.
-    /// </summary>
-    public T Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaButtonCancelledEvent{T}"/> class.
-    /// </summary>
-    /// <param name="button">The Mira Button whose click was cancelled.</param>
-    public VanillaButtonCancelledEvent(T button)
-    {
-        Button = button;
-    }
-}
-
-/// <summary>
-/// Invoked when a Vanilla Button click is cancelled. Do not use for custom buttons.
-/// </summary>
-public sealed class VanillaButtonCancelledEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets Vanilla Button whose click was cancelled.
-    /// </summary>
-    public AbilityButton Button { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaButtonCancelledEvent"/> class.
-    /// </summary>
-    /// <param name="button">The Vanilla Button whose click was cancelled.</param>
-    public VanillaButtonCancelledEvent(AbilityButton button)
-    {
-        Button = button;
-    }
-}

MiraAPI/Events/Vanilla/Gameplay/VanillaButtonClickEvent.cs

@@ -1,65 +0,0 @@
-using MiraAPI.Hud;
-
-namespace MiraAPI.Events.Vanilla.Gameplay;
-
-/// <summary>
-/// Button click event for Vanilla Buttons only. Do not use for custom buttons.
-/// </summary>
-/// <typeparam name="T">The Vanilla Button type.</typeparam>
-public sealed class VanillaButtonClickEvent<T> : MiraCancelableEvent where T : AbilityButton
-{
-    /// <summary>
-    /// Gets Vanilla Button that was clicked.
-    /// </summary>
-    public T Button { get; }
-
-    /// <summary>
-    /// Gets the generic click event that is invoked before this button-specific event.
-    /// </summary>
-    public VanillaButtonClickEvent GenericClickEvent { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaButtonClickEvent{T}"/> class.
-    /// </summary>
-    /// <param name="button">The Mira Button that was clicked.</param>
-    /// <param name="genericClickEvent">The generic click event invoked before button-specific events.</param>
-    public VanillaButtonClickEvent(T button, VanillaButtonClickEvent genericClickEvent)
-    {
-        GenericClickEvent = genericClickEvent;
-        Button = button;
-    }
-}
-
-/// <summary>
-/// Button click event for Vanilla Buttons only. Do not use for custom buttons.
-/// </summary>
-public sealed class VanillaButtonClickEvent : MiraCancelableEvent
-{
-    /// <summary>
-    /// Gets Vanilla Button that was clicked.
-    /// </summary>
-    public AbilityButton Button { get; }
-
-    /// <summary>
-    /// Gets the target player, if any, of the Vanilla Button that was clicked.
-    /// </summary>
-    public PlayerControl? PlayerTarget { get; }
-
-    /// <summary>
-    /// Gets the target vent, if any, of the Vanilla Button that was clicked.
-    /// </summary>
-    public Vent? VentTarget { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VanillaButtonClickEvent"/> class.
-    /// </summary>
-    /// <param name="button">The Vanilla Button that was clicked.</param>
-    /// <param name="playerTarget">The Player target, if any.</param>
-    /// <param name="ventTarget">The Vent target, if any.</param>
-    public VanillaButtonClickEvent(AbilityButton button, PlayerControl? playerTarget = null, Vent? ventTarget = null)
-    {
-        Button = button;
-        PlayerTarget = playerTarget;
-        VentTarget = ventTarget;
-    }
-}

MiraAPI/Events/Vanilla/Player/CompleteHnsTaskEvent.cs

@@ -1,35 +0,0 @@
-namespace MiraAPI.Events.Vanilla.Player;
-
-/// <summary>
-/// The event that is invoked when a player completes a task within Hide and Seek. Non-cancelable.
-/// </summary>
-public class CompleteHnsTaskEvent : MiraEvent
-{
-    /// <summary>
-    /// Gets the instance of the <see cref="PlayerControl"/>.
-    /// </summary>
-    public PlayerControl Player { get; }
-
-    /// <summary>
-    /// Gets the instance of the <see cref="PlayerTask"/> that the player completed.
-    /// </summary>
-    public PlayerTask Task { get; }
-
-    /// <summary>
-    /// Gets the instance of the <see cref="HnsManager"/> attached to the game.
-    /// </summary>
-    public HideAndSeekManager HnsManager { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CompleteHnsTaskEvent"/> class.
-    /// </summary>
-    /// <param name="hnsManager">The Hide and Seek Manager currently active.</param>
-    /// <param name="player">The player who completed the task.</param>
-    /// <param name="task">The task that the player completed.</param>
-    public CompleteHnsTaskEvent(HideAndSeekManager hnsManager, PlayerControl player, PlayerTask task)
-    {
-        HnsManager = hnsManager;
-        Player = player;
-        Task = task;
-    }
-}

MiraAPI/GameOptions/AbstractOptionGroup.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using MiraAPI.Modifiers;
 using UnityEngine;
 
 namespace MiraAPI.GameOptions;
@@ -29,16 +28,11 @@ public abstract class AbstractOptionGroup
     public virtual Type? OptionableType => null;
 
     /// <summary>
-    /// Gets a value indicating whether the group should be shown in the modifiers menu. This is deprecated, please use ParentMenu!
+    /// Gets a value indicating whether the group should be shown in the modifiers menu.
     /// </summary>
     // TODO: make this not a boolean
     public virtual bool ShowInModifiersMenu => false;
 
-    /// <summary>
-    /// Gets a value indicating which menu the group is in.
-    /// </summary>
-    public virtual MenuCategory ParentMenu => MenuCategory.Roles;
-
     /// <summary>
     /// Gets the function that determines whether the group should be visible or not.
     /// </summary>
@@ -68,33 +62,4 @@ public abstract class AbstractOptionGroup<T> : AbstractOptionGroup where T : IOp
 {
     /// <inheritdoc />
     public override Type OptionableType => typeof(T);
-
-    /// <summary>
-    /// Gets a value indicating which menu the group is in.
-    /// </summary>
-    public override MenuCategory ParentMenu
-    {
-        get
-        {
-            var type = typeof(T);
-            if (type == typeof(BaseModifier))
-            {
-                return MenuCategory.Modifiers;
-            }
-            else if (type == typeof(RoleBehaviour))
-            {
-                return MenuCategory.Roles;
-            }
-            return MenuCategory.Game;
-        }
-    }
-}
-
-public enum MenuCategory
-{
-    Game,
-    Roles,
-    Modifiers,
-    CustomOne,
-    CustomTwo
 }

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -21,15 +21,7 @@ public class ModdedNumberOptionAttribute(
 {
     internal override IModdedOption CreateOption(object? value, PropertyInfo property)
     {
-        return new ModdedNumberOption(
-            Title,
-            (float)(value ?? min + increment),
-            min,
-            max,
-            increment,
-            suffixType,
-            formatString,
-            zeroInfinity);
+        return new ModdedNumberOption(Title, (float)(value ?? min+increment), min, max, increment, suffixType, formatString, zeroInfinity);
     }
 
     /// <inheritdoc />

MiraAPI/GameOptions/IModdedOption.cs

@@ -17,9 +17,9 @@ public interface IModdedOption
     uint Id { get; }
 
     /// <summary>
-    /// Gets or sets the title of the option.
+    /// Gets the title of the option.
     /// </summary>
-    string Title { get; set; }
+    string Title { get; }
 
     /// <summary>
     /// Gets the StringName for the option, used for localization.

MiraAPI/GameOptions/MiraNumberOptionComponent.cs

@@ -1,40 +0,0 @@
-using System;
-using Il2CppInterop.Runtime.Attributes;
-using MiraAPI.GameOptions.OptionTypes;
-using Reactor.Utilities.Attributes;
-using UnityEngine;
-
-namespace MiraAPI.GameOptions;
-
-/// <summary>
-/// Component added onto options generated via MiraAPI. This allows developers to hook patches onto options in general, without using a list.
-/// </summary>
-[RegisterInIl2Cpp]
-public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
-{
-    /// <summary>
-    /// Gets or sets the modded option associated with the object.
-    /// </summary>
-    [HideFromIl2Cpp]
-    public ModdedNumberOption NumberOption { get; set; }
-
-    /// <summary>
-    /// Gets or sets the default increment.
-    /// </summary>
-    public float DefaultIncrement { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether holding shift will split the increment in half.
-    /// </summary>
-    public bool ShiftIncrementToggle { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating what Zero displays.
-    /// </summary>
-    public string ZeroValue { get; set; } = "#";
-
-    /// <summary>
-    /// Gets or sets a value indicating what Negative One displays.
-    /// </summary>
-    public string NegativeValue { get; set; } = "#";
-}

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -47,8 +47,6 @@ public class ModdedEnumOption : ModdedOption<int>
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
-        stringOption.name =
-            $"{ParentMod!.OptionsTitleText}.EnumOption.{TranslationController.Instance.GetString(StringName)}";
 
         stringOption.SetUpFromData(Data, 20);
         stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
@@ -140,8 +138,6 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var stringOption = Object.Instantiate(stringOpt, container);
-        stringOption.name =
-            $"{ParentMod!.OptionsTitleText}.EnumOption.{TranslationController.Instance.GetString(StringName)}";
 
         stringOption.SetUpFromData(Data, 20);
         stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;

MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs

@@ -32,82 +32,10 @@ public class ModdedNumberOption : ModdedOption<float>
     /// </summary>
     public MiraNumberSuffixes SuffixType { get; }
 
-    /// <summary>
-    /// Gets a value indicating what zero appears as.
-    /// </summary>
-    public string ZeroWordValue { get; }
-
-    /// <summary>
-    /// Gets a value indicating what a negative one appears as.
-    /// </summary>
-    public string NegativeWordValue { get; }
-
     /// <summary>
     /// Gets a value indicating whether zero is infinity.
     /// </summary>
-    public bool ZeroInfinity => ZeroWordValue == "∞";
-
-    /// <summary>
-    /// Gets a value indicating whether holding shift will divide the increment.
-    /// </summary>
-    public bool ShiftIncrement { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
-    /// </summary>
-    /// <param name="title">The title of the option.</param>
-    /// <param name="defaultValue">The default value as a float.</param>
-    /// <param name="min">The minimum value.</param>
-    /// <param name="max">The maximum value.</param>
-    /// <param name="increment">The increment.</param>
-    /// <param name="suffixType">The suffix type.</param>
-    /// <param name="formatString">Optional format string for the option screen.</param>
-    /// <param name="zeroBehavior">Determines what is shown for zero. Options: ∞, #, or a word value (such as Off).</param>
-    /// <param name="negativeBehavior">Determines what is shown for negative 1. Options: ∞, #, or a word value (such as Off).</param>
-    /// <param name="halfIncrements">Whether increments can be split in half.</param>
-    /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
-    public ModdedNumberOption(
-        string title,
-        float defaultValue,
-        float min,
-        float max,
-        float increment,
-        string zeroBehavior,
-        string negativeBehavior,
-        MiraNumberSuffixes suffixType,
-        string? formatString = null,
-        bool halfIncrements = false,
-        bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
-    {
-        Min = min;
-        Max = max;
-        Increment = increment;
-        SuffixType = suffixType;
-        ZeroWordValue = zeroBehavior;
-        NegativeWordValue = negativeBehavior;
-        ShiftIncrement = halfIncrements;
-
-        Value = Mathf.Clamp(defaultValue, min, max);
-
-        Data = ScriptableObject.CreateInstance<FloatGameSetting>();
-
-        var data = (FloatGameSetting)Data;
-        data.Type = global::OptionTypes.Float;
-        data.Title = StringName;
-        data.Value = Value;
-        data.Increment = Increment;
-        data.ValidRange = new FloatRange(Min, Max);
-        data.FormatString = formatString ??
-                            (defaultValue.IsInteger() &&
-                             Increment.IsInteger() &&
-                             Value.IsInteger() &&
-                             Min.IsInteger() &&
-                             Max.IsInteger() ? "0" : "0.0");
-
-        data.ZeroIsInfinity = ZeroInfinity;
-        data.SuffixType = (NumberSuffixes)SuffixType;
-        data.OptionName = FloatOptionNames.Invalid;
-    }
+    public bool ZeroInfinity { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
@@ -136,9 +64,7 @@ public class ModdedNumberOption : ModdedOption<float>
         Max = max;
         Increment = increment;
         SuffixType = suffixType;
-        ZeroWordValue = zeroInfinity ? "∞" : "#";
-        NegativeWordValue = "#";
-        ShiftIncrement = increment != 1f;
+        ZeroInfinity = zeroInfinity;
 
         Value = Mathf.Clamp(defaultValue, min, max);
 
@@ -171,14 +97,6 @@ public class ModdedNumberOption : ModdedOption<float>
         Transform container)
     {
         var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);
-        numberOption.name =
-            $"{ParentMod!.OptionsTitleText}.NumberOption.{TranslationController.Instance.GetString(StringName)}";
-        var optionComponent = numberOption.gameObject.AddComponent<MiraNumberOptionComponent>();
-        optionComponent.NumberOption = this;
-        optionComponent.DefaultIncrement = Increment;
-        optionComponent.ShiftIncrementToggle = ShiftIncrement;
-        optionComponent.NegativeValue = NegativeWordValue;
-        optionComponent.ZeroValue = ZeroWordValue;
 
         numberOption.SetUpFromData(Data, 20);
         numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;

MiraAPI/GameOptions/OptionTypes/ModdedOption.cs

@@ -21,7 +21,7 @@ public abstract class ModdedOption<T> : IModdedOption
     public uint Id { get; }
 
     /// <inheritdoc />
-    public string Title { get; set; }
+    public string Title { get; }
 
     /// <inheritdoc />
     public StringNames StringName { get; }

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

@@ -55,8 +55,6 @@ public class ModdedPlayerOption : ModdedOption<int>
         Transform container)
     {
         var playerOption = Object.Instantiate(playerOpt, container);
-        playerOption.name =
-            $"{ParentMod!.OptionsTitleText}.PlayerOption.{TranslationController.Instance.GetString(StringName)}";
 
         var filteredList = GetFilteredPlayers();
         Values = filteredList.ToIl2CppList();

MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs

@@ -29,8 +29,6 @@ public class ModdedToggleOption : ModdedOption<bool>
     public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
     {
         var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container);
-        toggleOption.name =
-            $"{ParentMod!.OptionsTitleText}.ToggleOption.{TranslationController.Instance.GetString(StringName)}";
 
         toggleOption.SetUpFromData(Data, 20);
 

MiraAPI/Hud/CustomActionButton.cs

@@ -64,14 +64,9 @@ public abstract class CustomActionButton
     public virtual float EffectDuration => 0;
 
     /// <summary>
-    /// Gets a value indicating whether the button has limited uses.
+    /// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
     /// </summary>
-    public bool LimitedUses => ZeroIsInfinite ? MaxUses > 0 : MaxUses >= 0;
-
-    /// <summary>
-    /// Gets the maximum number of uses the button has. If the button has infinite uses, set to 0 or -1 based on what value that ZeroIsInfinite is set to.
-    /// </summary>
-    public virtual int MaxUses => ZeroIsInfinite ? 0 : -1;
+    public virtual int MaxUses => 0;
 
     /// <summary>
     /// Gets the value indicating uses mode.
@@ -94,9 +89,9 @@ public abstract class CustomActionButton
     public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
 
     /// <summary>
-    /// Gets or sets a value indicating whether limited uses are determined via zero or a negative number of uses.
+    /// Gets a value indicating whether the button has limited uses.
     /// </summary>
-    public virtual bool ZeroIsInfinite { get; set; } = true;
+    public bool LimitedUses => MaxUses > 0;
 
     /// <summary>
     /// Gets or sets a value indicating whether the effect is currently active, if there is one.
@@ -211,39 +206,7 @@ public abstract class CustomActionButton
             {
                 if (Enabled(PlayerControl.LocalPlayer.Data.Role))
                 {
-                    // Invoke the generic button click event.
-                    var genericEvent = new MiraButtonClickEvent(this);
-                    MiraEventManager.InvokeEvent(genericEvent);
-                    if (genericEvent.IsCancelled)
-                    {
-                        MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this));
-                    }
-
-                    // Invoke the button click event for specific button.
-                    var eventType = CustomButtonManager.ButtonEventTypes[GetType()];
-                    var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, this, genericEvent)!;
-                    var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType);
-                    if (@event.IsCancelled)
-                    {
-                        var cancelEventType = CustomButtonManager.ButtonCancelledEventTypes[GetType()];
-                        var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, this)!;
-                        MiraEventManager.InvokeEvent(cancelEvent, cancelEventType);
-                    }
-
-                    if (specificInvoked)
-                    {
-                        if (!@event.IsCancelled)
-                        {
-                            ClickHandler();
-                        }
-                    }
-                    else
-                    {
-                        if (!genericEvent.IsCancelled)
-                        {
-                            ClickHandler();
-                        }
-                    }
+                    ClickHandler();
                 }
             });
 
@@ -251,10 +214,9 @@ public abstract class CustomActionButton
                 Helpers.CreateKeybindIcon(
                     Button.gameObject,
                     Keybind.CurrentKey,
-                    new Vector3(0.4f, 0.45f, -9f)
+                    new Vector3(MaxUses <= 0 ? -0.4f : 0.4f, 0.45f, -9f)
                 );
             KeybindText = KeybindIcon.transform.GetChild(0).GetComponent<TextMeshPro>();
-            HudManagerPatches.ModdedKeybindIcons.Add(KeybindText);
             Button.usesRemainingSprite.transform.localPosition = new(-0.341f, 0.45f, -0.1f);
         }
     }
@@ -532,7 +494,7 @@ public abstract class CustomActionButton
         if (Keybind != null && KeybindText != null)
         {
             KeybindText.text = Keybind.CurrentKey.ToString();
-            KeybindIcon?.SetActive(ActiveInputManager.currentControlType is ActiveInputManager.InputType.Keyboard &&
+            KeybindIcon?.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
                                    LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value &&
                                    Keybind.CurrentKey != KeyboardKeyCode.None);
         }

MiraAPI/Keybinds/BaseKeybind.cs

@@ -69,4 +69,4 @@ public class BaseKeybind
     {
         Handler -= action;
     }
-}
+}

MiraAPI/Keybinds/MiraKeybind.cs

@@ -9,7 +9,7 @@ namespace MiraAPI.Keybinds;
 public class MiraKeybind : BaseKeybind
 {
     /// <summary>
-    /// Gets name of the keybind.
+    /// Gets name of the keybind
     /// </summary>
     public string Name { get; }
 

MiraAPI/Keybinds/VanillaKeybind.cs

@@ -19,6 +19,6 @@ public class VanillaKeybind : BaseKeybind
     public VanillaKeybind(int id)
     {
         RewiredInputAction = KeybindUtils.GetInputActionById(id);
-        Id = RewiredInputAction != null ? RewiredInputAction.name : id.ToString();
+        Id = RewiredInputAction?.name;
     }
 }

MiraAPI/MiraApiSettings.cs

@@ -1,14 +1,12 @@
 using BepInEx.Configuration;
 using MiraAPI.LocalSettings;
 using MiraAPI.LocalSettings.Attributes;
-using MiraAPI.Patches;
-using MiraAPI.Utilities;
 using MiraAPI.Utilities.Assets;
 
 namespace MiraAPI;
 
 /// <summary>
-/// Mira API Config File Handler.
+/// Mira API Config File Handler
 /// </summary>
 public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
 {
@@ -23,67 +21,20 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
         HideIconOnHover = false,
     };
 
-    /// <summary>
-    /// Gets or sets the value stored for scaling buttons properly.
-    /// </summary>
-    public static float OldButtonScaleFactor { get; set; }
-
-    /// <inheritdoc />
-    public override void Open()
-    {
-        base.Open();
-        OldButtonScaleFactor = ButtonUIFactorSlider.Value;
-    }
-
-    /// <inheritdoc />
-    public override void OnOptionChanged(ConfigEntryBase configEntry)
-    {
-        base.OnOptionChanged(configEntry);
-        if (configEntry == ButtonUIFactorSlider)
-        {
-            if (HudManager.InstanceExists)
-            {
-                HudManagerPatches.ResizeUI(1f / OldButtonScaleFactor);
-                HudManagerPatches.ResizeUI(ButtonUIFactorSlider.Value);
-            }
-            OldButtonScaleFactor = ButtonUIFactorSlider.Value;
-        }
-    }
-
     /// <summary>
     /// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
     /// </summary>
     [LocalToggleSetting]
-    public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Visuals/UI", "Show Modifiers HUD on Left Side", false);
+    public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Displays", "Show Modifiers HUD on Left Side", false);
 
     /// <summary>
-    /// Gets whether to show keybinds on buttons.
+    /// Gets whether to show keybinds in the control mapper.
     /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> ShowKeybinds { get; private set; } = config.Bind("Visuals/UI", "Show Keybinds on Buttons", true);
-
-    /// <summary>
-    /// 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);
+    public ConfigEntry<bool> ShowKeybinds { get; private set; } = config.Bind("Keybinds", "Show Keybinds in Control Mapper", true);
 
     /// <summary>
     /// Gets whether to apply cosmetic changes to the TaskAdder.
     /// </summary>
     [LocalToggleSetting]
     public ConfigEntry<bool> PrettyTaskAdder { get; private set; } = config.Bind("Freeplay", "Pretty Task Laptop", true);
-
-    /// <summary>
-    /// Gets whether to show the red flash from sabotages.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> EnableSabotageFlashes { get; private set; } = config.Bind("Accessibility", "Enable Sabotage Flashes", true);
-
-    /// <summary>
-    /// Gets whether to enable the sabotage sound effects or not.
-    /// </summary>
-    [LocalToggleSetting]
-    public ConfigEntry<bool> EnableSabotageBlares { get; private set; } = config.Bind("Accessibility", "Enable Sabotage Blare", true);
 }

MiraAPI/Modifiers/ModifierManager.cs

@@ -179,7 +179,6 @@ public static class ModifierManager
     private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
     {
         return (player.Data.Role is not ICustomRole role || role.IsModifierApplicable(modifier)) &&
-               modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId) &&
-               modifier.CanSpawnOnCurrentMode();
+               modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId);
     }
 }

MiraAPI/Modifiers/Types/GameModifier.cs

@@ -39,10 +39,4 @@ public abstract class GameModifier : BaseModifier
     /// <param name="reason">The reason why the game ended.</param>
     /// <returns>True if the player won, false if they lost. Return null to use the player's default win condition.</returns>
     public virtual bool? DidWin(GameOverReason reason) => null;
-
-    /// <summary>
-    /// Determines whether the modifier can spawn in general, accounting for gamemodes and everything else.
-    /// </summary>
-    /// <returns>True if the modifier is able to spawn, otherwise false.</returns>
-    public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
 }

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using AmongUs.Data;
 using AmongUs.GameOptions;
@@ -87,11 +88,11 @@ public static class CustomMurderRpc
         bool playKillSound = true)
     {
         source.isKilling = false;
+        var data = target.Data;
         if (resultFlags.HasFlag(MurderResultFlags.FailedError))
         {
             return;
         }
-        var data = target.Data;
 
         if (resultFlags.HasFlag(MurderResultFlags.FailedProtected) ||
             (resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.protectedByGuardianId > -1))
@@ -174,7 +175,7 @@ public static class CustomMurderRpc
             {
                 try
                 {
-                    HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
+                    HudManager.Instance.KillOverlay.ShowMiraKillAnimation(source.Data, data);
                 }
                 catch (Exception e)
                 {
@@ -297,4 +298,68 @@ public static class CustomMurderRpc
         PlayerControl.LocalPlayer.isKilling = false;
         source.isKilling = false;
     }
+
+    /// <summary>
+    /// Reimplementation of vanilla's kill animation screen.
+    /// </summary>
+    /// <param name="killOverlay">The kill overlay from the Hud Manager.</param>
+    /// <param name="killer">The murderer's network information.</param>
+    /// <param name="victim">The murdered player's network information.</param>
+    public static void ShowMiraKillAnimation(this KillOverlay killOverlay, NetworkedPlayerInfo killer, NetworkedPlayerInfo victim)
+    {
+        List<OverlayKillAnimation> self = killOverlay.KillAnims.ToList();
+        OverlayKillAnimation killAnimation;
+        if (killer.Object)
+        {
+            OverlayKillAnimation[] killAnimations = killer.Object.MyPhysics.Animations.GetKillAnimations();
+            if (GameOptionsManager.Instance.CurrentGameOptions.GameMode == AmongUs.GameOptions.GameModes.HideNSeek && AprilFoolsMode.ShouldHorseAround())
+            {
+                self = killOverlay.HorseWrangleAnims.ToList();
+            }
+            else if (killAnimations.Length != 0)
+            {
+                self = killAnimations.ToList();
+            }
+            else
+            {
+                SkinViewData skin = ShipStatus.Instance.CosmeticsCache.GetSkin(killer.Object.CurrentOutfit.SkinId);
+                if (skin && skin.CustomKillAnimID > 0)
+                {
+                    if (!string.IsNullOrEmpty(skin.HatID_KillAnim) && skin.HatID_KillAnim != killer.Object.CurrentOutfit.HatId)
+                    {
+                        if (killer.Role.CustomKillAnimations.Length != 0)
+                        {
+                            self = killer.Role.CustomKillAnimations.ToList();
+                        }
+                        killAnimation = self.Random();
+                        killOverlay.ShowKillAnimation(killAnimation, killer, victim);
+                        return;
+                    }
+                    if (!string.IsNullOrEmpty(skin.VisorID_KillAnim) && skin.VisorID_KillAnim != killer.Object.CurrentOutfit.VisorId)
+                    {
+                        if (killer.Role.CustomKillAnimations.Length != 0)
+                        {
+                            self = killer.Role.CustomKillAnimations.ToList();
+                        }
+                        killAnimation = self.Random();
+                        killOverlay.ShowKillAnimation(killAnimation, killer, victim);
+                        return;
+                    }
+                    self = new List<OverlayKillAnimation>
+                    {
+                        killOverlay.CustomKillAnimations[skin.CustomKillAnimID - 1],
+                    };
+                    killAnimation = self.Random();
+                    killOverlay.ShowKillAnimation(killAnimation, killer, victim);
+                    return;
+                }
+                else if (killer.Role.CustomKillAnimations.Length != 0)
+                {
+                    self = killer.Role.CustomKillAnimations.ToList();
+                }
+            }
+        }
+        killAnimation = self.Random();
+        killOverlay.ShowKillAnimation(killAnimation, killer, victim);
+    }
 }

MiraAPI/Patches/Accessibility/HudManagerFlashPatches.cs

@@ -1,63 +0,0 @@
-using System.Collections;
-using BepInEx.Unity.IL2CPP.Utils.Collections;
-using HarmonyLib;
-using MiraAPI.LocalSettings;
-using UnityEngine;
-
-namespace MiraAPI.Patches.Accessibility;
-[HarmonyPatch]
-public static class HudManagerFlashPatches
-{
-    [HarmonyPatch(typeof(HudManager), nameof(HudManager.StartReactorFlash))]
-    [HarmonyPrefix]
-    public static bool ReactorFlashPrefix(HudManager __instance)
-    {
-        if (__instance.ReactorFlash == null)
-        {
-            __instance.ReactorFlash = __instance.StartCoroutine(CoReactorFlash().WrapToIl2Cpp());
-        }
-
-        return false;
-    }
-    [HarmonyPatch(typeof(HudManager), nameof(HudManager.StartOxyFlash))]
-    [HarmonyPrefix]
-    public static bool OxygenFlashPrefix(HudManager __instance)
-    {
-        if (__instance.OxyFlash == null)
-        {
-            __instance.OxyFlash = __instance.StartCoroutine(CoReactorFlash().WrapToIl2Cpp());
-        }
-
-        return false;
-    }
-    public static IEnumerator CoReactorFlash()
-    {
-        if (!HudManager.InstanceExists)
-        {
-            yield break;
-        }
-        var hudManager = HudManager.Instance;
-        WaitForSeconds wait = new WaitForSeconds(1f);
-        bool light = false;
-
-        hudManager.FullScreen.color = new Color(1f, 0f, 0f, 0.37254903f);
-        while (true)
-        {
-            var settins = LocalSettingsTabSingleton<MiraApiSettings>.Instance;
-            hudManager.FullScreen.gameObject.SetActive(settins.EnableSabotageFlashes.Value && !hudManager.FullScreen.gameObject.activeSelf);
-            if (settins.EnableSabotageBlares.Value)
-            {
-                SoundManager.Instance.PlaySound(ShipStatus.Instance.SabotageSound, false, 1f, null);
-            }
-            if (hudManager.lightFlashHandle == null)
-            {
-                hudManager.lightFlashHandle = DestroyableSingleton<DualshockLightManager>.Instance.AllocateLight();
-                hudManager.lightFlashHandle.color = new Color(1f, 0f, 0f, 1f);
-                hudManager.lightFlashHandle.intensity = 1f;
-            }
-            light = !light;
-            hudManager.lightFlashHandle.color.SetAlpha(light ? 1f : 0f);
-            yield return wait;
-        }
-    }
-}

MiraAPI/Patches/Events/HnsFinishTaskPatch.cs

@@ -1,17 +0,0 @@
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Player;
-
-namespace MiraAPI.Patches.Events;
-
-[HarmonyPatch(typeof(HideAndSeekManager))]
-public static class HnsFinishTaskPatch
-{
-    [HarmonyPostfix]
-    [HarmonyPatch(nameof(HideAndSeekManager.FinishTask))]
-    public static void FinishTaskPostfix(HideAndSeekManager __instance, PlayerTask task)
-    {
-        var completeTaskEvent = new CompleteHnsTaskEvent(__instance, task.Owner, task);
-        MiraEventManager.InvokeEvent(completeTaskEvent);
-    }
-}

MiraAPI/Patches/Events/SpawnInMinigamePatch.cs

@@ -1,5 +1,4 @@
-/*
-using HarmonyLib;
+using HarmonyLib;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 
@@ -19,4 +18,3 @@ internal static class SpawnInMinigamePatch
         MiraEventManager.InvokeEvent(@event2);
     }
 }
-*/

MiraAPI/Patches/Events/SubmergedSpawnGamePatch.cs

@@ -1,5 +1,4 @@
-/*
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
 using HarmonyLib;
 using MiraAPI.Events;
@@ -35,4 +34,3 @@ internal static class SubmergedSpawnGamePatch
         MiraEventManager.InvokeEvent(@event2);
     }
 }
-*/

MiraAPI/Patches/Events/VanillaButtonPatches.cs

@@ -1,75 +0,0 @@
-using System.Linq;
-using AmongUs.GameOptions;
-using HarmonyLib;
-using MiraAPI.Events;
-using MiraAPI.Events.Vanilla.Gameplay;
-using MiraAPI.Events.Vanilla.Usables;
-
-namespace MiraAPI.Patches.Events;
-
-/// <summary>
-/// Patches to invoke vent related MiraEvents.
-/// </summary>
-[HarmonyPatch]
-public static class VanillaButtonPatches
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(AbilityButton), nameof(AbilityButton.DoClick))]
-    public static bool DoClickPrefix(AbilityButton __instance)
-    {
-        // Invoke the generic button click event.
-        PlayerControl? playerTarget = null;
-        Vent? ventTarget = null;
-        var role = PlayerControl.LocalPlayer.Data.Role;
-        if (role.Role is RoleTypes.Tracker)
-        {
-            playerTarget = role.Cast<TrackerRole>().currentTarget;
-        }
-        else if (role.Role is RoleTypes.GuardianAngel)
-        {
-            playerTarget = role.Cast<GuardianAngelRole>().currentTarget;
-        }
-        else if (role.Role is RoleTypes.Engineer)
-        {
-            ventTarget = role.Cast<EngineerRole>().currentTarget;
-        }
-        var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget, ventTarget);
-        MiraEventManager.InvokeEvent(genericEvent);
-        if (genericEvent.IsCancelled)
-        {
-            MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance));
-        }
-
-        if (!genericEvent.IsCancelled)
-        {
-            return true;
-        }
-
-        return false;
-    }
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(SecondaryAbilityButton), nameof(SecondaryAbilityButton.DoClick))]
-    public static bool SecondaryDoClickPrefix(AbilityButton __instance)
-    {
-        // Invoke the generic button click event.
-        PlayerControl? playerTarget = null;
-        var role = PlayerControl.LocalPlayer.Data.Role;
-        if (role.Role is RoleTypes.Detective)
-        {
-            playerTarget = role.Cast<DetectiveRole>().currentTarget;
-        }
-        var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget);
-        MiraEventManager.InvokeEvent(genericEvent);
-        if (genericEvent.IsCancelled)
-        {
-            MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance));
-        }
-
-        if (!genericEvent.IsCancelled)
-        {
-            return true;
-        }
-
-        return false;
-    }
-}

MiraAPI/Patches/Freeplay/TaskAdderPatches.cs

@@ -21,14 +21,10 @@ using Object = UnityEngine.Object;
 namespace MiraAPI.Patches.Freeplay;
 
 [HarmonyPatch(typeof(TaskAdderGame))]
-public static class TaskAdderPatches
+internal static class TaskAdderPatches
 {
     private static Scroller _scroller = null!;
     private static Dictionary<string, TaskFolder> folders = new();
-    public static string CrewmateName => TranslationController.Instance.GetString(StringNames.Crewmate);
-    public static string ImpostorName => TranslationController.Instance.GetString(StringNames.Impostor);
-    public static string NeutralName => "Neutral";
-    public static string ModifiersName => "Modifiers";
 
     [HarmonyPostfix]
     [HarmonyPatch(nameof(TaskAdderGame.Begin))]
@@ -70,16 +66,19 @@ public static class TaskAdderPatches
         __instance.RootFolderPrefab.GetComponent<PassiveButton>().ClickMask = collider;
         __instance.RootFolderPrefab.gameObject.SetActive(false);
         __instance.TaskParent = inner.transform;
-        var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == CrewmateName)!;
-        var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == ImpostorName)!;
+        var crewLocale = TranslationController.Instance.GetString(StringNames.Crewmate);
+        var impLocale = TranslationController.Instance.GetString(StringNames.Impostor);
+
+        var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == crewLocale)!;
+        var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == impLocale)!;
         //var neutralFolder = __instance.CreateFolder("Neutral", __instance.Root, 2, Color.gray);
-        var modifiersFolder = __instance.CreateFolder(ModifiersName, __instance.Root, 0, Color.blue);
+        var modifiersFolder = __instance.CreateFolder("Modifiers", __instance.Root, 0, Color.blue);
 
         folders.Clear();
         folders.Add(crewmateFolder.FolderName, crewmateFolder);
         folders.Add(impostorFolder.FolderName, impostorFolder);
         //folders.Add("Neutrals", neutralFolder);
-        folders.Add(ModifiersName, modifiersFolder);
+        folders.Add("Modifiers", modifiersFolder);
 
         int folderIdx = 2;
         foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
@@ -138,8 +137,8 @@ public static class TaskAdderPatches
                 Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
             impFolder.gameObject.SetActive(false);
             impFolder.SetFolderColor(TaskFolder.FolderColor.Red);
-            crewFolder.FolderName = CrewmateName;
-            impFolder.FolderName = ImpostorName;
+            crewFolder.FolderName = TranslationController.Instance.GetString(StringNames.Crewmate);
+            impFolder.FolderName = TranslationController.Instance.GetString(StringNames.Impostor);
             rootFolder.SubFolders.Insert(0, crewFolder);
             rootFolder.SubFolders.Insert(0, impFolder);
             Il2CppSystem.Collections.Generic.List<RoleBehaviour> impRoles = new();
@@ -441,7 +440,7 @@ public static class TaskAdderPatches
             }
         }
 
-        if (folders.TryGetValue(ModifiersName, out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
+        if (folders.TryGetValue("Modifiers", out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
         {
             var plugin = MiraPluginManager.GetPluginByGuid(taskFolder.name.Replace("(Clone)", string.Empty));
             if (plugin != null)

MiraAPI/Patches/Hud/ButtonResetPatches.cs

@@ -9,11 +9,6 @@ namespace MiraAPI.Patches.Hud;
 public static class ButtonResetPatches
 {
     public static void Postfix()
-    {
-        ResetCooldowns();
-    }
-
-    public static void ResetCooldowns()
     {
         foreach (var customActionButton in CustomButtonManager.CustomButtons)
         {

MiraAPI/Patches/HudManagerPatches.cs

@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
 using MiraAPI.Hud;
@@ -28,86 +27,6 @@ public static class HudManagerPatches
 
     private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = new();
 
-    internal static List<TextMeshPro> ModdedKeybindIcons = new();
-
-    public static IEnumerator CoResizeUI()
-    {
-        while (!HudManager.Instance)
-        {
-            yield return null;
-        }
-
-        yield return new WaitForSeconds(0.01f);
-        ResizeUI(LocalSettingsTabSingleton<MiraApiSettings>.Instance.ButtonUIFactorSlider.Value);
-    }
-
-    public static void ResizeUI(float scaleFactor)
-    {
-        var baseButtons = HudManager.Instance.transform.FindChild("Buttons");
-        if (baseButtons != null)
-        {
-            foreach (var aspect in baseButtons.GetComponentsInChildren<AspectPosition>(true))
-            {
-                if (aspect.gameObject == null)
-                {
-                    continue;
-                }
-
-                if (aspect.gameObject.transform.parent.name == "TopRight")
-                {
-                    continue;
-                }
-
-                if (aspect.gameObject.transform.parent.transform.parent.name == "TopRight")
-                {
-                    continue;
-                }
-
-                aspect.gameObject.SetActive(!aspect.isActiveAndEnabled);
-                aspect.DistanceFromEdge *= new Vector2(scaleFactor, scaleFactor);
-                aspect.gameObject.SetActive(!aspect.isActiveAndEnabled);
-            }
-        }
-
-        foreach (var button in HudManager.Instance.GetComponentsInChildren<ActionButton>(true))
-        {
-            if (button.gameObject == null)
-            {
-                continue;
-            }
-
-            button.gameObject.SetActive(!button.isActiveAndEnabled);
-            button.gameObject.transform.localScale *= scaleFactor;
-            button.gameObject.SetActive(!button.isActiveAndEnabled);
-        }
-
-        if (baseButtons != null)
-        {
-            foreach (var arrange in baseButtons.GetComponentsInChildren<GridArrange>(true))
-            {
-                if (!arrange.gameObject || !arrange.transform)
-                {
-                    continue;
-                }
-
-                arrange.gameObject.SetActive(!arrange.isActiveAndEnabled);
-                arrange.CellSize = new Vector2(scaleFactor, scaleFactor);
-                arrange.gameObject.SetActive(!arrange.isActiveAndEnabled);
-                if (arrange.isActiveAndEnabled && arrange.gameObject.transform.childCount != 0)
-                {
-                    try
-                    {
-                        arrange.ArrangeChilds();
-                    }
-                    catch
-                    {
-                        // Error($"Error arranging child objects in GridArrange: {e}");
-                    }
-                }
-            }
-        }
-    }
-
     /*
     /// <summary>
     /// Trigger hudstart on current custom gamemode
@@ -169,7 +88,6 @@ public static class HudManagerPatches
             fakeButton.ToggleVisible(true);
             fakeButton.Destroy();
         }
-        ModdedKeybindIcons = [];
 
         foreach (var button in CustomButtonManager.CustomButtons)
         {
@@ -194,15 +112,13 @@ public static class HudManagerPatches
                 Error($"Failed to create custom button {button.GetType().Name}: {e}");
             }
         }
-        __instance.ImpostorVentButton.transform.SetParent(null);
-        __instance.ImpostorVentButton.transform.SetParent(BottomRight.transform);
 
         gridArrange.Start();
         gridArrange.ArrangeChilds();
         aspectPosition.AdjustPosition();
 
         vanillaKeybindIcons = [];
-        var keybindIconPos = new Vector3(0.4f, 0.4f, -9.5f);
+        var keybindIconPos = new Vector3(-0.4f, 0.4f, -9.5f);
         var vanillaButtons = new Dictionary<GameObject, int>
         {
             { __instance.KillButton.gameObject, 8 },
@@ -228,7 +144,6 @@ public static class HudManagerPatches
             var comp = buttonObj.GetComponent<ActionButton>();
             KeybindManager.VanillaKeybinds[comp.GetType()].Button = comp;
         }
-        Coroutines.Start(CoResizeUI());
     }
 
     /// <summary>
@@ -265,16 +180,11 @@ public static class HudManagerPatches
     [HarmonyPostfix]
     public static void UpdatePostfix()
     {
-        var canSeeBinds = ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
-                          LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value;
         foreach (var btnIcon in vanillaKeybindIcons)
         {
             btnIcon.Key.text = KeybindUtils.GetKeycodeByActionId(btnIcon.Value).ToString();
-            btnIcon.Key.transform.parent.gameObject.SetActive(canSeeBinds);
-        }
-        foreach (var btnIcon in ModdedKeybindIcons)
-        {
-            btnIcon.transform.parent.gameObject.SetActive(canSeeBinds);
+            btnIcon.Key.transform.parent.gameObject.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
+                                                              LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value);
         }
 
         var player = ReInput.players.GetPlayer(0);

MiraAPI/Patches/Keybinds/ControlMapperPatches.cs

@@ -15,8 +15,7 @@ namespace MiraAPI.Patches.Keybinds;
 [HarmonyPatch(typeof(ControlMapper))]
 public static class ControlMapperPatches
 {
-    // Patching this crashes for Epic Games users
-    /*[HarmonyPrefix]
+    [HarmonyPrefix]
     [HarmonyPatch(nameof(ControlMapper.Start))]
     private static void StartPrefix(ControlMapper __instance)
     {
@@ -38,7 +37,7 @@ public static class ControlMapperPatches
             entry.Value = !entry.Value;
             text.text = $"Show Keybinds: {(entry.Value ? "On" : "Off")}";
         }));
-    }*/
+    }
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(ControlMapper.Update))]

MiraAPI/Patches/Options/GameOptionsMenuPatch.cs

@@ -32,20 +32,11 @@ internal static class GameOptionsMenuPatch
         {
             ModifiersUpdate(ref num);
         }
-        else if (__instance.name == "CUSTOM TAB 1")
-        {
-            CustomMenuOneUpdate(ref num);
-        }
-        else if (__instance.name == "CUSTOM TAB 2")
-        {
-            CustomMenuTwoUpdate(ref num);
-        }
         else
         {
             var filteredGroups =
                 GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-                    .Where(x => x.OptionableType == null &&
-                                !x.ShowInModifiersMenu && x.ParentMenu == MenuCategory.Roles) ?? [];
+                    .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
             foreach (var group in filteredGroups)
             {
@@ -108,48 +99,6 @@ internal static class GameOptionsMenuPatch
         }
     }
 
-    private static void CustomMenuOneUpdate(ref float num)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomOne) ?? [];
-
-        foreach (var modGroup in groups)
-        {
-            UpdateGroup(modGroup, ref num);
-        }
-    }
-
-    private static void CustomMenuOneCreate(GameOptionsMenu menu)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomOne) ?? [];
-        foreach (var group in groups)
-        {
-            CreateGroup(menu, group);
-        }
-    }
-
-    private static void CustomMenuTwoUpdate(ref float num)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomTwo) ?? [];
-
-        foreach (var modGroup in groups)
-        {
-            UpdateGroup(modGroup, ref num);
-        }
-    }
-
-    private static void CustomMenuTwoCreate(GameOptionsMenu menu)
-    {
-        var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.ParentMenu == MenuCategory.CustomTwo) ?? [];
-        foreach (var group in groups)
-        {
-            CreateGroup(menu, group);
-        }
-    }
-
     private static void ModifiersUpdate(ref float num)
     {
         var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
@@ -188,19 +137,9 @@ internal static class GameOptionsMenuPatch
             ModifiersCreate(__instance);
             return false;
         }
-        else if (__instance.name == "CUSTOM TAB 1")
-        {
-            CustomMenuOneCreate(__instance);
-            return false;
-        }
-        else if (__instance.name == "CUSTOM TAB 2")
-        {
-            CustomMenuTwoCreate(__instance);
-            return false;
-        }
 
         var filteredGroups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
-            .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu && x.ParentMenu == MenuCategory.Roles) ?? [];
+            .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? [];
 
         foreach (var group in filteredGroups)
         {

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
-using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
 using MiraAPI.PluginLoading;
 using MiraAPI.Presets;
@@ -28,23 +27,13 @@ internal static class GameSettingMenuPatches
     private static Vector3 _roleBtnOgPos;
     private static Vector3 _smallRoleBtnOgPos;
     private static Vector3 _modifierBtnOgPos;
-    private static Vector3 _customOneBtnOgPos;
-    private static Vector3 _customTwoBtnOgPos;
 
     private static GameOptionsMenu? _modifiersTab;
     private static PassiveButton? _modifiersButton;
     private static PassiveButton? _smallRolesButton;
-    private static GameOptionsMenu? _customOneTab;
-    private static PassiveButton? _customOneButton;
-    private static GameOptionsMenu? _customTwoTab;
-    private static PassiveButton? _customTwoButton;
-    private static GameObject? _nextModButton;
-    private static GameObject? _previousModButton;
 
     private static Dictionary<int, Vector3> OptionsPositions { get; } = [];
     private static Dictionary<int, Vector3> ModifiersPositions { get; } = [];
-    private static Dictionary<int, Vector3> CustomOnePositions { get; } = [];
-    private static Dictionary<int, Vector3> CustomTwoPositions { get; } = [];
 
     private static void SaveScrollPositions(GameSettingMenu gameSettingMenu)
     {
@@ -52,14 +41,6 @@ internal static class GameSettingMenuPatches
         {
             ModifiersPositions[SelectedModIdx] = _modifiersTab!.scrollBar.Inner.localPosition;
         }
-        else if (_customOneTab)
-        {
-            CustomOnePositions[SelectedModIdx] = _customOneTab!.scrollBar.Inner.localPosition;
-        }
-        else if (_customTwoTab)
-        {
-            CustomTwoPositions[SelectedModIdx] = _customTwoTab!.scrollBar.Inner.localPosition;
-        }
 
         RoleSettingMenuPatches.RolePositions[SelectedModIdx] = gameSettingMenu.RoleSettingsTab.scrollBar.Inner.localPosition;
         OptionsPositions[SelectedModIdx] = gameSettingMenu.GameSettingsTab.scrollBar.Inner.localPosition;
@@ -84,21 +65,9 @@ internal static class GameSettingMenuPatches
                 _modifiersTab!.gameObject.SetActive(tabNum == 3);
             }
 
-            if (_customOneTab)
-            {
-                _customOneTab!.gameObject.SetActive(tabNum == 4);
-            }
-
-            if (_customTwoTab)
-            {
-                _customTwoTab!.gameObject.SetActive(tabNum == 5);
-            }
-
             _modifiersButton?.SelectButton(tabNum == 3);
             _smallRolesButton?.SelectButton(tabNum == 2);
-            _customOneButton?.SelectButton(tabNum == 4);
-            _customTwoButton?.SelectButton(tabNum == 5);
-            if (tabNum >= 3 && tabNum <= 5)
+            if (tabNum == 3)
             {
                 if (__instance.RoleSettingsButton.gameObject.active)
                 {
@@ -106,21 +75,7 @@ internal static class GameSettingMenuPatches
                 }
                 else
                 {
-                    switch (tabNum)
-                    {
-                        case 3:
-                            _modifiersButton?.SelectButton(true);
-                            __instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.ModifierMenuDescription : "Configure modifiers and their settings here!";
-                            break;
-                        case 4:
-                            _customOneButton?.SelectButton(true);
-                            __instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuOneDescription : "Apply game settings for this mod!";
-                            break;
-                        case 5:
-                            _customTwoButton?.SelectButton(true);
-                            __instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuTwoDescription : "Apply game settings for this mod!";
-                            break;
-                    }
+                    _modifiersButton?.SelectButton(true);
                 }
             }
         }
@@ -132,30 +87,19 @@ internal static class GameSettingMenuPatches
 
         _modifiersButton?.SelectButton(tabNum == 3);
         _smallRolesButton?.SelectButton(tabNum == 2);
-        _customOneButton?.SelectButton(tabNum == 4);
-        _customTwoButton?.SelectButton(tabNum == 5);
 
-        if (tabNum >= 3 && tabNum <= 5)
+        if (tabNum != 3)
         {
-            if (__instance.RoleSettingsButton.gameObject.active)
-            {
-                __instance.RoleSettingsButton.SelectButton(true);
-            }
-            else
-            {
-                switch (tabNum)
-                {
-                    case 3:
-                        _modifiersButton?.SelectButton(true);
-                        break;
-                    case 4:
-                        _customOneButton?.SelectButton(true);
-                        break;
-                    case 5:
-                        _customTwoButton?.SelectButton(true);
-                        break;
-                }
-            }
+            return;
+        }
+
+        if (__instance.RoleSettingsButton.gameObject.active)
+        {
+            __instance.RoleSettingsButton.SelectButton(true);
+        }
+        else
+        {
+            _modifiersButton?.SelectButton(true);
         }
     }
 
@@ -183,16 +127,16 @@ internal static class GameSettingMenuPatches
 
         _text.alignment = TextAlignmentOptions.Center;
 
-        _nextModButton = Object.Instantiate(__instance.BackButton, __instance.BackButton.transform.parent).gameObject;
-        _nextModButton.transform.localPosition = new Vector3(-2.2663f, 1.5272f, -25f);
-        _nextModButton.name = "RightArrowButton";
-        _nextModButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().sprite =
+        var nextButton = Object.Instantiate(__instance.BackButton, __instance.BackButton.transform.parent).gameObject;
+        nextButton.transform.localPosition = new Vector3(-2.2663f, 1.5272f, -25f);
+        nextButton.name = "RightArrowButton";
+        nextButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().sprite =
             MiraAssets.NextButton.LoadAsset();
-        _nextModButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
+        nextButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
             MiraAssets.NextButtonActive.LoadAsset();
-        _nextModButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
+        nextButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
 
-        var passiveButton = _nextModButton.gameObject.GetComponent<PassiveButton>();
+        var passiveButton = nextButton.gameObject.GetComponent<PassiveButton>();
         passiveButton.OnClick = new ButtonClickedEvent();
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
@@ -207,13 +151,13 @@ internal static class GameSettingMenuPatches
                 UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
             }));
 
-        _previousModButton = Object.Instantiate(_nextModButton, __instance.BackButton.transform.parent).gameObject;
-        _previousModButton.transform.localPosition = new Vector3(-4.4209f, 1.5272f, -25f);
-        _previousModButton.name = "LeftArrowButton";
-        _previousModButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().Destroy();
-        _previousModButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().flipX =
-            _previousModButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().flipX = true;
-        _previousModButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
+        var backButton = Object.Instantiate(nextButton, __instance.BackButton.transform.parent).gameObject;
+        backButton.transform.localPosition = new Vector3(-4.4209f, 1.5272f, -25f);
+        backButton.name = "LeftArrowButton";
+        backButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().Destroy();
+        backButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().flipX =
+            backButton.transform.FindChild("Inactive").gameObject.GetComponent<SpriteRenderer>().flipX = true;
+        backButton.gameObject.GetComponent<PassiveButton>().OnClick.AddListener(
             (UnityAction)(() =>
             {
                 SaveScrollPositions(__instance);
@@ -230,61 +174,6 @@ internal static class GameSettingMenuPatches
         _modifiersTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
         _modifiersTab.name = "MODIFIERS TAB";
 
-        // clone game settings tab for both custom tabs
-        _customOneTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
-        _customOneTab.name = "CUSTOM TAB 1";
-        _customTwoTab = Object.Instantiate(__instance.GameSettingsTab, __instance.GameSettingsTab.transform.parent);
-        _customTwoTab.name = "CUSTOM TAB 2";
-
-        // create button for the first custom category
-        var customPos = new Vector3(
-            __instance.RoleSettingsButton.transform.localPosition.x,
-            __instance.RoleSettingsButton.transform.localPosition.y,
-            __instance.RoleSettingsButton.transform.localPosition.z);
-        _customOneButton = Object.Instantiate(__instance.RoleSettingsButton, __instance.RoleSettingsButton.transform.parent);
-        _customOneButton.buttonText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
-        _customOneButton.OnClick = new ButtonClickedEvent();
-        _customOneButton.OnClick.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(4, false);
-            }));
-        _customOneButton.OnMouseOver = new UnityEvent();
-        _customOneButton.OnMouseOver.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(4, true);
-            }));
-
-        _customOneButton.buttonText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuNameOne : "Custom Category 1";
-        customPos.y -= 0.637f;
-        _customOneButton.transform.localPosition = customPos;
-        _customOneButton.name = "CustomOneButton";
-
-        _customOneBtnOgPos = _customOneButton.transform.localPosition;
-
-        // create button for the first custom category
-        _customTwoButton = Object.Instantiate(_customOneButton, _customOneButton.transform.parent);
-        _customTwoButton.OnClick = new ButtonClickedEvent();
-        _customTwoButton.OnClick.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(5, false);
-            }));
-        _customTwoButton.OnMouseOver = new UnityEvent();
-        _customTwoButton.OnMouseOver.AddListener(
-            (UnityAction)(() =>
-            {
-                __instance.ChangeTab(5, true);
-            }));
-
-        _customTwoButton.buttonText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuNameTwo : "Custom Category 2";
-        customPos.y -= 0.637f;
-        _customTwoButton.transform.localPosition = customPos;
-        _customTwoButton.name = "CustomTwoButton";
-
-        _customTwoBtnOgPos = _customTwoButton.transform.localPosition;
-
         // create button for modifiers
         __instance.RoleSettingsButton.buttonText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
         __instance.RoleSettingsButton.gameObject.SetActive(false);
@@ -415,32 +304,20 @@ internal static class GameSettingMenuPatches
         bool replaceWithModifiers = true;
         _smallRolesButton!.transform.localPosition = _smallRoleBtnOgPos;
         _modifiersButton!.transform.localPosition = _modifierBtnOgPos;
-        _customOneButton!.transform.localPosition = _customOneBtnOgPos;
-        _customTwoButton!.transform.localPosition = _customTwoBtnOgPos;
         menu.RoleSettingsButton.transform.localPosition = _roleBtnOgPos;
 
         if (SelectedModIdx != 0)
         {
-            _customOneButton.buttonText.text = SelectedMod!.MiraPlugin.CustomOptionMenuNameOne;
-            _customTwoButton.buttonText.text = SelectedMod!.MiraPlugin.CustomOptionMenuNameTwo;
             var modHasRoles = SelectedMod!.InternalRoles.Count != 0;
-            var modHasCustomOne = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ParentMenu == MenuCategory.CustomOne);
-            var modHasCustomTwo = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ParentMenu == MenuCategory.CustomTwo);
             var modHasModifiers = SelectedMod.InternalOptionGroups.Exists(
-                x => x.ShowInModifiersMenu || x.ParentMenu == MenuCategory.Modifiers || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
+                x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true);
             var modHasOptions =
-                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && (!x.ShowInModifiersMenu ||
-                    (x.ParentMenu != MenuCategory.Modifiers && x.ParentMenu != MenuCategory.Roles)));
+                SelectedMod.InternalOptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu);
 
             _modifiersButton.gameObject.SetActive(true);
             _smallRolesButton.gameObject.SetActive(true);
-            _customOneButton.gameObject.SetActive(true);
-            _customTwoButton.gameObject.SetActive(true);
             menu.GameSettingsButton.gameObject.SetActive(true);
             menu.RoleSettingsButton.gameObject.SetActive(false);
-            var defaultButton = menu.RoleSettingsButton;
 
             // If there are no registered custom roles in the selected mod, hide the button.
             if (!modHasRoles)
@@ -457,7 +334,6 @@ internal static class GameSettingMenuPatches
                 {
                     _modifiersButton.gameObject.SetActive(false);
                     menu.RoleSettingsButton.gameObject.SetActive(true);
-                    defaultButton = _modifiersButton;
 
                     if (_modifiersTab!.gameObject.active)
                     {
@@ -480,7 +356,6 @@ internal static class GameSettingMenuPatches
                 // If the mod has roles, we can enable the bigger role button and disable the small one.
                 if (modHasRoles)
                 {
-                    defaultButton = menu.RoleSettingsButton;
                     menu.RoleSettingsButton.gameObject.SetActive(true);
                     _smallRolesButton.gameObject.SetActive(false);
                 }
@@ -495,7 +370,6 @@ internal static class GameSettingMenuPatches
                 {
                     menu.ChangeTab(0, false);
                 }
-                defaultButton = menu.RoleSettingsButton;
 
                 // If the mod has roles and modifiers, we can move their buttons to the game settings button position, since nothing is there.
                 if (menu.RoleSettingsButton.gameObject.active)
@@ -515,37 +389,16 @@ internal static class GameSettingMenuPatches
                         _smallRolesButton.transform.localPosition.z);
                 }
             }
-
-            // If the mod has no primary custom tab, we can go ahead and hide the button.
-            if (!modHasCustomOne)
-            {
-                _customOneButton.gameObject.SetActive(false);
-                if (_customOneTab!.gameObject.active)
-                {
-                    defaultButton.SelectButton(true);
-                }
-            }
-            // If the mod has no secondary custom tab, we can go ahead and hide the button.
-            if (!modHasCustomTwo)
-            {
-                _customTwoButton.gameObject.SetActive(false);
-                if (_customTwoTab!.gameObject.active)
-                {
-                    defaultButton.SelectButton(true);
-                }
-            }
         }
         else
         {
             _modifiersButton.gameObject.SetActive(false);
             _smallRolesButton.gameObject.SetActive(false);
-            _customOneButton.gameObject.SetActive(false);
-            _customTwoButton.gameObject.SetActive(false);
             menu.RoleSettingsButton.gameObject.SetActive(true);
             menu.GameSettingsButton.gameObject.SetActive(true);
             replaceWithModifiers = false;
 
-            if (_modifiersTab!.gameObject.active || _customOneTab!.gameObject.active || _customTwoTab!.gameObject.active)
+            if (_modifiersTab!.gameObject.active)
             {
                 menu.ChangeTab(0, false);
             }
@@ -593,17 +446,7 @@ internal static class GameSettingMenuPatches
 
         if (_modifiersTab?.Children?.Count > 0)
         {
-            CleanupSettings(_modifiersTab, MenuCategory.Modifiers);
-        }
-
-        if (_customOneTab?.Children?.Count > 0)
-        {
-            CleanupSettings(_customOneTab, MenuCategory.CustomOne);
-        }
-
-        if (_customTwoTab?.Children?.Count > 0)
-        {
-            CleanupSettings(_customTwoTab, MenuCategory.CustomTwo);
+            CleanupSettings(_modifiersTab, true);
         }
 
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
@@ -641,7 +484,7 @@ internal static class GameSettingMenuPatches
             }
         }
 
-        void CleanupSettings(GameOptionsMenu gameOptMenu, MenuCategory menuCategory = MenuCategory.Roles)
+        void CleanupSettings(GameOptionsMenu gameOptMenu, bool modifiers = false)
         {
             ClearOptions(gameOptMenu.Children);
             gameOptMenu.Children = null;
@@ -652,19 +495,7 @@ internal static class GameSettingMenuPatches
                 .ForEach(header => header.gameObject.DestroyImmediate());
 
             gameOptMenu.Initialize();
-            var positions = OptionsPositions;
-            switch (menuCategory)
-            {
-                case MenuCategory.Modifiers:
-                    positions = ModifiersPositions;
-                    break;
-                case MenuCategory.CustomOne:
-                    positions = CustomOnePositions;
-                    break;
-                case MenuCategory.CustomTwo:
-                    positions = CustomTwoPositions;
-                    break;
-            }
+            var positions = modifiers ? ModifiersPositions : OptionsPositions;
             if (positions.TryGetValue(SelectedModIdx, out var pos))
             {
                 gameOptMenu.scrollBar.Inner.localPosition = pos;

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AmongUs.GameOptions;
 using HarmonyLib;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
@@ -164,110 +163,7 @@ public static class LobbyViewPanePatches
     {
         if (SelectedModIdx == 0)
         {
-            float num = 0.95f;
-            float num2 = -6.53f;
-            CategoryHeaderMasked categoryHeaderMasked =
-                Object.Instantiate(__instance.categoryHeaderOrigin, __instance.settingsContainer);
-            categoryHeaderMasked.SetHeader(StringNames.RoleQuotaLabel, 61);
-            categoryHeaderMasked.transform.localScale = Vector3.one;
-            categoryHeaderMasked.transform.localPosition = new Vector3(-9.77f, 1.26f, -2f);
-            __instance.settingsInfo.Add(categoryHeaderMasked.gameObject);
-            var list = new List<RoleBehaviour>();
-            for (int i = 0; i < 2; i++)
-            {
-                var categoryHeaderRoleVariant =
-                    Object.Instantiate(__instance.categoryHeaderRoleOrigin, __instance.settingsContainer);
-                categoryHeaderRoleVariant.SetHeader(
-                    (i == 0) ? StringNames.CrewmateRolesHeader : StringNames.ImpostorRolesHeader,
-                    61);
-                categoryHeaderRoleVariant.transform.localScale = Vector3.one;
-                categoryHeaderRoleVariant.transform.localPosition = new Vector3(0.09f, num, -2f);
-                __instance.settingsInfo.Add(categoryHeaderRoleVariant.gameObject);
-                num -= 0.696f;
-                var roles = RoleManager.Instance.AllRoles.ToArray().Where(x =>
-                    x is not ICustomRole && !x.IsRoleBlacklisted() && x.Role != RoleTypes.Crewmate &&
-                    x.Role != RoleTypes.Impostor && ((i == 0 && x.TeamType is RoleTeamTypes.Crewmate) ||
-                                                     (i == 1 && x.TeamType is RoleTeamTypes.Impostor)) &&
-                    x.Role != RoleTypes.CrewmateGhost && x.Role != RoleTypes.ImpostorGhost).ToList();
-                for (int j = 0; j < roles.Count; j++)
-                {
-                    var roleBehaviour = roles[j];
-                    int chancePerGame =
-                        GameOptionsManager.Instance.CurrentGameOptions.RoleOptions.GetChancePerGame(
-                            roleBehaviour.Role);
-                    int numPerGame =
-                        GameOptionsManager.Instance.CurrentGameOptions.RoleOptions
-                            .GetNumPerGame(roleBehaviour.Role);
-                    bool flag = numPerGame == 0;
-                    var viewSettingsInfoPanelRoleVariant =
-                        Object.Instantiate(
-                            __instance.infoPanelRoleOrigin,
-                            __instance.settingsContainer);
-                    viewSettingsInfoPanelRoleVariant.transform.localScale = Vector3.one;
-                    viewSettingsInfoPanelRoleVariant.transform.localPosition = new Vector3(num2, num, -2f);
-                    if (!flag)
-                    {
-                        list.Add(roleBehaviour);
-                    }
-
-                    viewSettingsInfoPanelRoleVariant.SetInfo(
-                        roleBehaviour.NiceName,
-                        numPerGame,
-                        chancePerGame,
-                        61,
-                        (i == 0) ? Palette.CrewmateRoleBlue : Palette.ImpostorRoleRed,
-                        roleBehaviour.RoleIconSolid,
-                        i == 0,
-                        flag);
-                    __instance.settingsInfo.Add(viewSettingsInfoPanelRoleVariant.gameObject);
-                    num -= 0.664f;
-                }
-            }
-
-            if (list.Count > 0)
-            {
-                var categoryHeaderMasked2 =
-                    Object.Instantiate(__instance.categoryHeaderOrigin, __instance.settingsContainer);
-                categoryHeaderMasked2.SetHeader(StringNames.RoleSettingsLabel, 61);
-                categoryHeaderMasked2.transform.localScale = Vector3.one;
-                categoryHeaderMasked2.transform.localPosition = new Vector3(-9.77f, num, -2f);
-                __instance.settingsInfo.Add(categoryHeaderMasked2.gameObject);
-                num -= 2.1f;
-                float num3 = 0f;
-                for (int k = 0; k < list.Count; k++)
-                {
-                    float num4;
-                    if (k % 2 == 0)
-                    {
-                        num4 = -5.8f;
-                        if (k > 0)
-                        {
-                            num -= num3 + 0.85f;
-                            num3 = 0f;
-                        }
-                    }
-                    else
-                    {
-                        num4 = 0.14999962f;
-                    }
-
-                    var advancedRoleViewPanel =
-                        Object.Instantiate(__instance.advancedRolePanelOrigin, __instance.settingsContainer);
-                    advancedRoleViewPanel.transform.localScale = Vector3.one;
-                    advancedRoleViewPanel.transform.localPosition = new Vector3(num4, num, -2f);
-                    float num5 = advancedRoleViewPanel.SetUp(list[k], 0.85f, 61);
-                    if (num5 > num3)
-                    {
-                        num3 = num5;
-                    }
-
-                    __instance.settingsInfo.Add(advancedRoleViewPanel.gameObject);
-                }
-            }
-
-            __instance.scrollBar.SetYBoundsMax(-num);
-
-            return false;
+            return true;
         }
 
         if (__instance.currentTab == ModifiersTabName)
@@ -382,7 +278,7 @@ public static class LobbyViewPanePatches
 
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings || !x.VisibleInSettings()))
+            if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings))
             {
                 continue;
             }
@@ -413,7 +309,7 @@ public static class LobbyViewPanePatches
 
             foreach (var customRole in grouping)
             {
-                if (customRole.Configuration.HideSettings || !customRole.VisibleInSettings())
+                if (customRole.Configuration.HideSettings)
                 {
                     continue;
                 }

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -216,16 +216,7 @@ public static class OptionsPatches
             return true;
         }
 
-        var increment = __instance.Increment;
-
-        if (Input.GetKey(KeyCode.LeftShift) &&
-            __instance.TryGetComponent<MiraNumberOptionComponent>(out var miraNumber) &&
-            miraNumber.ShiftIncrementToggle)
-        {
-            increment /= 2;
-        }
-
-        __instance.Value += increment;
+        __instance.Value += __instance.Increment;
         if (__instance.Value > __instance.ValidRange.max)
         {
             __instance.Value = __instance.ValidRange.min;
@@ -244,16 +235,7 @@ public static class OptionsPatches
             return true;
         }
 
-        var increment = __instance.Increment;
-
-        if (Input.GetKey(KeyCode.LeftShift) &&
-            __instance.TryGetComponent<MiraNumberOptionComponent>(out var miraNumber) &&
-            miraNumber.ShiftIncrementToggle)
-        {
-            increment /= 2;
-        }
-
-        __instance.Value -= increment;
+        __instance.Value -= __instance.Increment;
         if (__instance.Value < __instance.ValidRange.min)
         {
             __instance.Value = __instance.ValidRange.max;

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -74,10 +74,10 @@ public static class RoleSettingMenuPatches
             var num = 0.662f;
 
             var list = CustomRoleManager.AllRoles.Where(
-                r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
+                r => !r.IsCustomRole() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
                      r.Role != RoleTypes.CrewmateGhost).ToList();
             var list2 = CustomRoleManager.AllRoles.Where(
-                r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
+                r => !r.IsCustomRole() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
                      r.Role != RoleTypes.ImpostorGhost).ToList();
 
             if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
@@ -160,7 +160,7 @@ public static class RoleSettingMenuPatches
 
         foreach (var grouping in sortedRoleGroups)
         {
-            if (!grouping.Any() || grouping.All(x=> x.Configuration.HideSettings || !x.VisibleInSettings()))
+            if (!grouping.Any() || grouping.All(x=>x.Configuration.HideSettings))
             {
                 continue;
             }

MiraAPI/Patches/Options/SettingPatches.cs

@@ -1,8 +1,5 @@
 using System.Globalization;
-using System.Linq;
 using HarmonyLib;
-using MiraAPI.GameOptions;
-using MiraAPI.GameOptions.OptionTypes;
 using MiraAPI.Utilities;
 using UnityEngine;
 
@@ -31,33 +28,7 @@ public static class SettingPatches
         string result;
         var suffix = (MiraNumberSuffixes)__instance.SuffixType;
 
-        var custom =
-            ModdedOptionsManager.ModdedOptions.Values.FirstOrDefault(opt =>
-                opt.OptionBehaviour != null && opt.OptionBehaviour.Data == __instance);
-        if (custom is ModdedNumberOption moddedNumberOption)
-        {
-            if (moddedNumberOption.NegativeWordValue != "#" && (int)value == -1)
-            {
-                result = $"<b>{moddedNumberOption.NegativeWordValue}</b>";
-            }
-            else if (moddedNumberOption.ZeroWordValue != "#" && Mathf.Abs(value) < 0.0001f)
-            {
-                result = $"<b>{moddedNumberOption.ZeroWordValue}</b>";
-            }
-            else
-            {
-                result = suffix switch
-                {
-                    MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
-                    MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
-                    MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
-                    _ => TranslationController.Instance.GetString(
-                        StringNames.GameSecondsAbbrev,
-                        (Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
-                };
-            }
-        }
-        else if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
+        if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
         {
             result = "<b>∞</b>";
         }

MiraAPI/Patches/PlayerControlPatches.cs

@@ -127,19 +127,17 @@ internal static class PlayerControlPatches
             return;
         }
 
-        var role = __instance.Data?.Role;
         foreach (var button in CustomButtonManager.CustomButtons)
         {
-            if (role == null)
+            if (__instance.Data?.Role == null)
             {
                 continue;
             }
 
             try
             {
-                if (!button.Enabled(role))
+                if (!button.Enabled(__instance.Data?.Role))
                 {
-                    button.SetActive(false, role);
                     continue;
                 }
 

MiraAPI/Patches/Roles/KillButtonPatches.cs

@@ -46,7 +46,7 @@ public static class KillButtonPatches
     }
 
     /// <summary>
-    /// Use Custom Murder instead of Murder Player from vanilla.
+    /// Use Custom Murder if player is custom role.
     /// </summary>
     [HarmonyPrefix]
     [HarmonyPatch(nameof(KillButton.DoClick))]
@@ -58,6 +58,11 @@ public static class KillButtonPatches
             return false;
         }
 
+        if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole)
+        {
+            return true;
+        }
+
         PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget);
         __instance.SetTarget(null);
 

MiraAPI/Patches/Roles/LogicRoleSelectionHnsPatch.cs

@@ -1,183 +0,0 @@
-using AmongUs.GameOptions;
-using HarmonyLib;
-using Il2CppSystem.Collections.Generic;
-using System.Linq;
-using MiraAPI.Roles;
-
-namespace MiraAPI.Patches.Roles;
-
-[HarmonyPatch(typeof(LogicRoleSelectionHnS))]
-public static class LogicRoleSelectionHnsPatch
-{
-    [HarmonyPrefix]
-    [HarmonyPatch(nameof(LogicRoleSelectionHnS.AssignRolesForTeam))]
-    public static bool AssignRolesForTeam(
-        LogicRoleSelectionHnS __instance,
-        List<NetworkedPlayerInfo> players,
-        IGameOptions opts,
-        RoleTeamTypes team,
-        int teamMax,
-        Il2CppSystem.Nullable<RoleTypes> defaultRole)
-    {
-        Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - 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 (__instance.hnsManager.LogicOptionsHnS.HasImpostorPlayerID() &&
-                __instance.hnsManager.LogicOptionsHnS.ValidateImpostorPlayerID(players) &&
-                !AmongUsClient.Instance.IsGamePublic)
-            {
-                NetworkedPlayerInfo networkedPlayerInfo = players.ToArray()
-                    .First(p => p.PlayerId == __instance.hnsManager.LogicOptionsHnS.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._items.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);
-        }
-        return false;
-    }
-
-    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++;
-        }
-    }
-}

MiraAPI/Patches/Roles/LogicRoleSelectionNormalPatch.cs

@@ -1,93 +0,0 @@
-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/NameTagPatch.cs

@@ -20,7 +20,7 @@ public static class NameTagPatch
             return false;
         }
 
-        if (PlayerControl.LocalPlayer.Data?.Role?.IsImpostor == true && otherPlayerRole.IsImpostor)
+        if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && otherPlayerRole.IsImpostor)
         {
             return true;
         }
@@ -30,7 +30,7 @@ public static class NameTagPatch
             return true;
         }
 
-        if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data?.Role || !otherPlayerRole)
+        if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data.Role || !otherPlayerRole)
         {
             __result = Color.white;
         }

MiraAPI/Patches/Roles/RoleManagerPatches.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using AmongUs.GameOptions;
 using HarmonyLib;
-using InnerNet;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using MiraAPI.Modifiers;

MiraAPI/PluginLoading/IMiraPlugin.cs

@@ -12,31 +12,6 @@ public interface IMiraPlugin
     /// </summary>
     string OptionsTitleText { get; }
 
-    /// <summary>
-    /// Gets the name for the first custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuNameOne => "Custom Category 1";
-
-    /// <summary>
-    /// Gets the name for the second custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuNameTwo => "Custom Category 2";
-
-    /// <summary>
-    /// Gets the description for the second custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string ModifierMenuDescription => "Configure modifiers and their settings here!";
-
-    /// <summary>
-    /// Gets the description for the first custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuOneDescription => "Apply game settings for this mod!";
-
-    /// <summary>
-    /// Gets the description for the second custom category in the game options menu, if any.
-    /// </summary>
-    public virtual string CustomOptionMenuTwoDescription => "Apply game settings for this mod!";
-
     /// <summary>
     /// Gets the BepInEx configuration file for the plugin.
     /// </summary>

MiraAPI/PluginLoading/MiraPluginInfo.cs

@@ -51,7 +51,7 @@ public class MiraPluginInfo
     public IReadOnlyCollection<CustomActionButton> Buttons { get; private set; } = null!;
 
     /// <summary>
-    /// Gets a read only dictionary of this plugin's custom presets.
+    /// Gets a read only dictionary of this plugin's custom game modes.
     /// </summary>
     public IReadOnlyCollection<OptionPreset> Presets { get; internal set; } = null!;
 

MiraAPI/Presets/PresetManager.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
 using BepInEx.Configuration;
 using MiraAPI.PluginLoading;
@@ -19,13 +18,6 @@ public static class PresetManager
     /// </summary>
     public static string PresetDirectory { get; } = Path.GetFullPath("mira_presets", Application.persistentDataPath);
 
-    internal static List<OptionPreset> InternalMasterPresets { get; } = [];
-
-    /// <summary>
-    /// Gets a read only dictionary of this plugin's custom presets.
-    /// </summary>
-    public static IReadOnlyCollection<OptionPreset> MasterPresets { get; internal set; } = null!;
-
     internal static void CreateDefaultPreset(MiraPluginInfo plugin)
     {
         var presetPath = Path.Combine(PresetDirectory, plugin.PluginId);
@@ -101,58 +93,4 @@ public static class PresetManager
         }
         plugin.Presets = [..plugin.InternalPresets];
     }
-
-    /// <summary>
-    /// Loads the master presets by reading the configuration files from the preset directory.
-    /// </summary>
-    public static void LoadMasterPreset()
-    {
-        /*foreach (var btn in plugin.InternalPresets.Select(x=>x.PresetButton))
-        {
-            if (btn != null)
-            {
-                Object.DestroyImmediate(btn);
-            }
-        }
-
-        plugin.InternalPresets.Clear();*/
-        if (!Directory.Exists(PresetDirectory))
-        {
-            Directory.CreateDirectory(PresetDirectory);
-        }
-
-        var pluginPresetPath = Path.Combine(PresetDirectory, "MasterPresets");
-        if (!Directory.Exists(pluginPresetPath))
-        {
-            Directory.CreateDirectory(pluginPresetPath);
-        }
-
-        foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
-        {
-            var fileName = Path.GetFileName(file);
-            Info($"Loading preset file {fileName}");
-            var presetName = Path.GetFileNameWithoutExtension(file);
-            var presetConfig = new ConfigFile(file, false)
-            {
-                SaveOnConfigSet = false,
-            };
-            foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
-            {
-                foreach (var option in plugin.InternalOptions.Where(x=>x.IncludeInPreset))
-                {
-                    option.Bind(presetConfig);
-                }
-
-                foreach (var role in plugin.InternalRoles.Values.OfType<ICustomRole>().Where(x=>!x.Configuration.HideSettings))
-                {
-                    role.BindConfig(presetConfig);
-                }
-            }
-
-            presetConfig.Save();
-
-            // InternalMasterPresets.Add(new OptionPreset(presetName, plugin, presetConfig));
-        }
-        MasterPresets = [..InternalMasterPresets];
-    }
 }

MiraAPI/Roles/CustomRoleConfiguration.cs

@@ -1,8 +1,7 @@
-using AmongUs.GameOptions;
-using System;
-using MiraAPI.Patches.Freeplay;
+using AmongUs.GameOptions;
 using MiraAPI.Utilities.Assets;
 using UnityEngine;
+
 namespace MiraAPI.Roles;
 
 /// <summary>
@@ -10,16 +9,6 @@ namespace MiraAPI.Roles;
 /// </summary>
 public record struct CustomRoleConfiguration
 {
-#pragma warning disable S1133
-    [Obsolete("Default constructor is not supported. Please use the constructor that takes an ICustomRole parameter.")]
-#pragma warning restore S1133
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-    public CustomRoleConfiguration()
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-    {
-        throw new NotImplementedException("Default constructor is not supported. Please use the constructor that takes an ICustomRole parameter.");
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="CustomRoleConfiguration"/> struct.
     /// </summary>
@@ -47,7 +36,7 @@ public record struct CustomRoleConfiguration
         {
             ModdedRoleTeams.Crewmate => TranslationController.Instance.GetString(StringNames.Crewmate),
             ModdedRoleTeams.Impostor => TranslationController.Instance.GetString(StringNames.Impostor),
-            _ => TaskAdderPatches.NeutralName,
+            _ => "Neutral",
         };
         IntroSound = role.Team is ModdedRoleTeams.Crewmate
             ? CustomRoleManager.CrewmateIntroSound

MiraAPI/Roles/CustomRoleUtils.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -14,62 +13,6 @@ namespace MiraAPI.Roles;
 /// </summary>
 public static class CustomRoleUtils
 {
-    /// <summary>
-    /// Determines whether the specified role can spawn in general, accounting for gamemodes and everything else.
-    /// </summary>
-    /// <param name="role">The role you would like to check for.</param>
-    /// <returns>True if the role is able to spawn, otherwise false.</returns>
-    public static bool CanSpawnOnCurrentMode(RoleBehaviour role)
-    {
-        if (role is ICustomRole custom)
-        {
-            return custom.CanSpawnOnCurrentMode();
-        }
-
-        if (GameManager.Instance.IsHideAndSeek())
-        {
-            return role.Role is RoleTypes.Engineer || role.Role is RoleTypes.Impostor;
-        }
-        return true;
-    }
-
-    public static List<(ushort RoleType, int Chance)> GetPossibleRoles(
-        List<RoleManager.RoleAssignmentData> assignmentData,
-        Func<RoleManager.RoleAssignmentData, bool>? predicate = null)
-    {
-        var roles = new List<(ushort, int)>();
-
-        assignmentData.Where(x => predicate == null || predicate(x)).ToList().ForEach(x =>
-        {
-            for (var i = 0; i < x.Count; i++)
-            {
-                roles.Add(((ushort)x.Role.Role, x.Chance));
-            }
-        });
-
-        return roles;
-    }
-
-    public static RoleManager.RoleAssignmentData GetAssignData(RoleTypes roleType)
-    {
-        var currentGameOptions = GameOptionsManager.Instance.CurrentGameOptions;
-        var roleOptions = currentGameOptions.RoleOptions;
-
-        var role = GetRegisteredRole(roleType);
-        var assignmentData = new RoleManager.RoleAssignmentData(role, roleOptions.GetNumPerGame(role!.Role),
-            roleOptions.GetChancePerGame(role.Role));
-
-        return assignmentData;
-    }
-
-    public static RoleBehaviour? GetRegisteredRole(RoleTypes roleType)
-    {
-        // we want to prioritize the custom roles because the role has the right RoleColour/TeamColor
-        var role = CustomRoleManager.AllRoles.FirstOrDefault(x => x.Role == roleType);
-
-        return role;
-    }
-
     /// <summary>
     /// Gets all active in-game roles.
     /// </summary>

MiraAPI/Roles/ICustomRole.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 using BepInEx.Configuration;
 using MiraAPI.GameOptions;
 using MiraAPI.Modifiers;
@@ -240,15 +239,4 @@ public interface ICustomRole : IOptionable
     {
         return true;
     }
-
-    /// <summary>
-    /// Determines whether the role can spawn in general, accounting for gamemodes and everything else.
-    /// </summary>
-    /// <returns>True if the role is able to spawn, otherwise false.</returns>
-    public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
-
-    /// <summary>
-    /// Gets the function that determines whether the role should be toggled on or off in the game settings.
-    /// </summary>
-    public virtual Func<bool> VisibleInSettings => () => true;
 }

MiraAPI/Utilities/Helpers.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using AmongUs.GameOptions;
 using HarmonyLib;
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Roles;
@@ -537,19 +536,4 @@ public static class Helpers
         }
         return role.NiceName;
     }
-
-    /// <summary>
-    /// Returns whether the role is blacklisted from appearing and spawning. (Only applicable to vanilla roles)
-    /// </summary>
-    /// <param name="role">The role to check.</param>
-    /// <returns>The role's blacklist status.</returns>
-    public static bool IsRoleBlacklisted(this RoleBehaviour role)
-    {
-        // This should be patchable by mods when a vanilla role is meant to be replaced by a custom role.
-        if (role.Role is RoleTypes.Engineer)
-        {
-            return true;
-        }
-        return false;
-    }
 }