Add shift-intervals for options

MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs

@@ -21,7 +21,15 @@ 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/MiraNumberOptionComponent.cs

@@ -0,0 +1,28 @@
+using System;
+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>
+    public ModdedNumberOption NumberOption { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default increment.
+    /// </summary>
+    public float DefaultIncrement { get; set; }
+
+    /// <summary>
+    /// Gets or sets the value of whether or not holding shift will split the increment in half.
+    /// </summary>
+    public bool ShiftIncrementToggle { get; set; }
+}

MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs

@@ -47,6 +47,8 @@ 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;
@@ -138,6 +140,8 @@ 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

@@ -37,6 +37,11 @@ public class ModdedNumberOption : ModdedOption<float>
     /// </summary>
     public bool ZeroInfinity { get; }
 
+    /// <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>
@@ -49,6 +54,7 @@ public class ModdedNumberOption : ModdedOption<float>
     /// <param name="formatString">Optional format string for the option screen.</param>
     /// <param name="zeroInfinity">Whether zero is infinity or not.</param>
     /// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
+    /// <param name="shiftIncrement">Whether holding shift will divide the increment or not.</param>
     public ModdedNumberOption(
         string title,
         float defaultValue,
@@ -65,6 +71,7 @@ public class ModdedNumberOption : ModdedOption<float>
         Increment = increment;
         SuffixType = suffixType;
         ZeroInfinity = zeroInfinity;
+        ShiftIncrement = increment != 1f;
 
         Value = Mathf.Clamp(defaultValue, min, max);
 
@@ -97,6 +104,12 @@ 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;
 
         numberOption.SetUpFromData(Data, 20);
         numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;

MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs

@@ -55,6 +55,8 @@ 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,6 +29,8 @@ 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

@@ -494,7 +494,7 @@ public abstract class CustomActionButton
         if (Keybind != null && KeybindText != null)
         {
             KeybindText.text = Keybind.CurrentKey.ToString();
-            KeybindIcon?.SetActive(ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
+            KeybindIcon?.SetActive(ActiveInputManager.currentControlType is ActiveInputManager.InputType.Keyboard &&
                                    LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value &&
                                    Keybind.CurrentKey != KeyboardKeyCode.None);
         }

MiraAPI/Patches/Options/GameSettingMenuPatches.cs

@@ -38,6 +38,8 @@ internal static class GameSettingMenuPatches
     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; } = [];
@@ -178,16 +180,16 @@ internal static class GameSettingMenuPatches
 
         _text.alignment = TextAlignmentOptions.Center;
 
-        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 =
+        _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 =
             MiraAssets.NextButton.LoadAsset();
-        nextButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
+        _nextModButton.transform.FindChild("Active").gameObject.GetComponent<SpriteRenderer>().sprite =
             MiraAssets.NextButtonActive.LoadAsset();
-        nextButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
+        _nextModButton.gameObject.GetComponent<CloseButtonConsoleBehaviour>().DestroyImmediate();
 
-        var passiveButton = nextButton.gameObject.GetComponent<PassiveButton>();
+        var passiveButton = _nextModButton.gameObject.GetComponent<PassiveButton>();
         passiveButton.OnClick = new ButtonClickedEvent();
         passiveButton.OnClick.AddListener(
             (UnityAction)(() =>
@@ -202,13 +204,13 @@ internal static class GameSettingMenuPatches
                 UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab);
             }));
 
-        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(
+        _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(
             (UnityAction)(() =>
             {
                 SaveScrollPositions(__instance);

MiraAPI/Patches/Options/OptionsPatches.cs

@@ -14,6 +14,25 @@ namespace MiraAPI.Patches.Options;
 [HarmonyPatch]
 public static class OptionsPatches
 {
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Increment), MethodType.Getter)]
+    public static bool FloatIncrementPatch(NumberOption __instance, ref float __result)
+    {
+        if (!__instance.TryGetComponent<MiraNumberOptionComponent>(out var miraNumber) || !miraNumber.ShiftIncrementToggle)
+        {
+            return true;
+        }
+
+        var increment = miraNumber.DefaultIncrement;
+
+        if (Input.GetKey(KeyCode.LeftShift))
+        {
+            increment /= 2;
+        }
+
+        __result = increment;
+        return false;
+    }
     [HarmonyPrefix]
     [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseChance))]
     public static bool RoleIncreaseChancePrefix(RoleOptionSetting __instance)