diff --git a/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs
index 5c5d7bcf..8ab42588 100644
--- a/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs
+++ b/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs
@@ -172,6 +172,6 @@ public class ModdedNumberOptionAttribute(
///
int ITypedOption.GetValueUnboxed()
{
- return (int)Math.Round(GetValueUnboxed());
+ return (int)MathF.Round(GetValueUnboxed());
}
}
diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs
index 4f403994..e491ece9 100644
--- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs
+++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs
@@ -174,6 +174,6 @@ public class ModdedNumberOptionListAttribute(
///
int ITypedOptionList.GetValueUnboxed(int idx)
{
- return (int)Math.Round(GetValueUnboxed(idx));
+ return (int)MathF.Round(GetValueUnboxed(idx));
}
}
diff --git a/MiraAPI/GameOptions/MiraPlayerOptionComponent.cs b/MiraAPI/GameOptions/MiraPlayerOptionComponent.cs
new file mode 100644
index 00000000..84011310
--- /dev/null
+++ b/MiraAPI/GameOptions/MiraPlayerOptionComponent.cs
@@ -0,0 +1,21 @@
+using System;
+using Il2CppInterop.Runtime.Attributes;
+using MiraAPI.GameOptions.OptionTypes;
+using Reactor.Utilities.Attributes;
+using UnityEngine;
+
+namespace MiraAPI.GameOptions;
+
+///
+/// Component added onto options generated via MiraAPI. This allows developers to hook patches onto options in general, without using a list.
+///
+/// The pointer to the C++ object.
+[RegisterInIl2Cpp]
+public class MiraPlayerOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
+{
+ ///
+ /// Gets or sets the associated with the object.
+ ///
+ [HideFromIl2Cpp]
+ public ModdedPlayerOption PlayerOption { get; set; }
+}
diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs
index 125f9c70..691b492f 100644
--- a/MiraAPI/GameOptions/ModdedOptionsManager.cs
+++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs
@@ -8,7 +8,6 @@ using BepInEx.Configuration;
using HarmonyLib;
using MiraAPI.GameModes;
using MiraAPI.GameOptions.Attributes;
-using MiraAPI.GameOptions.OptionTypes;
using MiraAPI.Networking;
using MiraAPI.PluginLoading;
using MiraAPI.Utilities;
@@ -41,7 +40,6 @@ public static class ModdedOptionsManager
private static readonly Type OptionType = typeof(IModdedOption);
private static readonly Type OptionListType = typeof(IModdedOptionList);
- internal static readonly Dictionary CreatedPlayerOptions = [];
internal static readonly Dictionary> GameModeOptionGroups = [];
internal static readonly Dictionary ModdedOptions = [];
internal static readonly List Groups = [];
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs
index df08cafc..066ccde1 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs
@@ -1,4 +1,5 @@
using System;
+using AmongUs.GameOptions;
using UnityEngine;
using Object = UnityEngine.Object;
@@ -72,17 +73,18 @@ public abstract class ModdedBaseStringOption(string groupPrefix, string title
stringOption.name = $"{ParentMod!.OptionsTitleText}.{OptionTypeName}.{Title}";
stringOption.SetUpFromData(Data, 20);
+
+ // SetUpFromData method doesn't work correctly so we must set the values manually
+ stringOption.Title = StringName;
+ stringOption.Value = GetIndex(Value);
+ stringOption.Values = StringNameValues;
+ stringOption.stringOptionName = Int32OptionNames.Invalid;
stringOption.OnValueChanged = (Action)ValueChanged;
// Changing the button text to make them more distinct from number options
stringOption.MinusBtn.ChangeButtonText("<");
stringOption.PlusBtn.ChangeButtonText(">");
- // SetUpFromData method doesn't work correctly so we must set the values manually
- stringOption.Title = StringName;
- stringOption.Values = StringNameValues;
- stringOption.Value = GetIndex(Value);
-
OptionBehaviour = stringOption;
return stringOption;
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
index 3bcd55d7..428d96cf 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
@@ -113,7 +113,6 @@ public class ModdedNumberOption : ModdedOption
data.Increment = Increment;
data.ValidRange = new FloatRange(Min, Max);
data.FormatString = FormatString;
-
data.ZeroIsInfinity = ZeroInfinity;
data.SuffixType = (NumberSuffixes)SuffixType;
data.OptionName = FloatOptionNames.Invalid;
@@ -213,17 +212,10 @@ public class ModdedNumberOption : ModdedOption
PlayerOption playerOpt,
Transform container)
{
- var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container);
+ var numberOption = Object.Instantiate(numberOpt, container);
numberOption.name = $"{ParentMod!.OptionsTitleText}.NumberOption.{Title}";
- var optionComponent = numberOption.gameObject.AddComponent();
- optionComponent.NumberOption = this;
- optionComponent.DefaultIncrement = Increment;
- optionComponent.ShiftIncrementToggle = ShiftIncrement;
- optionComponent.NegativeValue = NegativeWordValue;
- optionComponent.ZeroValue = ZeroWordValue;
numberOption.SetUpFromData(Data, 20);
- numberOption.OnValueChanged = (Action)ValueChanged;
numberOption.Title = StringName;
numberOption.Value = Value;
@@ -233,6 +225,14 @@ public class ModdedNumberOption : ModdedOption
numberOption.ZeroIsInfinity = ZeroInfinity;
numberOption.SuffixType = (NumberSuffixes)SuffixType;
numberOption.floatOptionName = FloatOptionNames.Invalid;
+ numberOption.OnValueChanged = (Action)ValueChanged;
+
+ var optionComponent = numberOption.gameObject.AddComponent();
+ optionComponent.NumberOption = this;
+ optionComponent.DefaultIncrement = Increment;
+ optionComponent.ShiftIncrementToggle = ShiftIncrement;
+ optionComponent.NegativeValue = NegativeWordValue;
+ optionComponent.ZeroValue = ZeroWordValue;
OptionBehaviour = numberOption;
@@ -301,6 +301,6 @@ public class ModdedNumberOption : ModdedOption
/// Integer value.
public static implicit operator int(ModdedNumberOption option)
{
- return (int)Math.Round(option.Value);
+ return (int)MathF.Round(option.Value);
}
}
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs
index 267c8844..5e7ef15d 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using AmongUs.GameOptions;
using MiraAPI.Networking;
using MiraAPI.Utilities;
using UnityEngine;
@@ -33,7 +34,7 @@ public class ModdedPlayerOption : ModdedOption
///
/// The translation ID prefix of the group containing this option.
/// The title of the option.
- /// Whether the option includes a none option. If None is selected, value will return -1.
+ /// Whether the option includes a none option. If None is selected, value can return -1.
public ModdedPlayerOption(string groupPrefix, string title, bool allowNone = true)
: base(groupPrefix, title, allowNone ? -1 : 0, false)
{
@@ -53,7 +54,7 @@ public class ModdedPlayerOption : ModdedOption
/// Initializes a new instance of the class.
///
/// The title of the option.
- /// Whether the option includes a none option. If None is selected, value will return -1.
+ /// Whether the option includes a none option. If None is selected, value can return -1.
public ModdedPlayerOption(string title, bool allowNone = true)
: this(string.Empty, title, allowNone)
{
@@ -67,25 +68,27 @@ public class ModdedPlayerOption : ModdedOption
PlayerOption playerOpt,
Transform container)
{
+ Values = GetFilteredPlayers();
+
var playerOption = Object.Instantiate(playerOpt, container);
playerOption.name = $"{ParentMod!.OptionsTitleText}.PlayerOption.{Title}";
- Values = GetFilteredPlayers();
-
playerOption.SetUpFromData(Data, 20);
- playerOption.OnValueChanged = (Action)ValueChanged;
playerOption.Title = StringName;
playerOption.Values = Values.ToIl2CppList();
playerOption.Value = Value;
playerOption.playerIndex = Values.FindIndex(p => p.PlayerId == Value);
-
- OptionBehaviour = playerOption;
- ModdedOptionsManager.CreatedPlayerOptions.TryAdd(playerOption, this);
+ playerOption.optionName = Int32OptionNames.Invalid;
+ playerOption.OnValueChanged = (Action)ValueChanged;
playerOption.SetValueText();
playerOption.AdjustButtonsActiveState();
+ playerOpt.gameObject.AddComponent().PlayerOption = this;
+
+ OptionBehaviour = playerOption;
+
return playerOption;
}
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
index 1e92d19d..24aad9ac 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
@@ -1,4 +1,5 @@
using System;
+using AmongUs.GameOptions;
using MiraAPI.Networking;
using MiraAPI.Translation;
using UnityEngine;
@@ -82,13 +83,14 @@ public class ModdedToggleOption : ModdedOption
///
public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, PlayerOption playerOpt, Transform container)
{
- var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container);
+ var toggleOption = Object.Instantiate(toggleOpt, container);
toggleOption.name = $"{ParentMod!.OptionsTitleText}.ToggleOption.{Title}";
toggleOption.SetUpFromData(Data, 20);
toggleOption.Title = StringName;
toggleOption.CheckMark.enabled = Value;
+ toggleOption.boolOptionName = BoolOptionNames.Invalid;
toggleOption.OnValueChanged = (Action)ValueChanged;
OptionBehaviour = toggleOption;
diff --git a/MiraAPI/Patches/Options/OptionsPatches.cs b/MiraAPI/Patches/Options/OptionsPatches.cs
index 670a782f..7aad70e9 100644
--- a/MiraAPI/Patches/Options/OptionsPatches.cs
+++ b/MiraAPI/Patches/Options/OptionsPatches.cs
@@ -1,7 +1,6 @@
using HarmonyLib;
using MiraAPI.GameOptions;
using MiraAPI.Roles;
-using MiraAPI.Translation;
using MiraAPI.Utilities;
using UnityEngine;
@@ -10,125 +9,125 @@ namespace MiraAPI.Patches.Options;
[HarmonyPatch]
public static class OptionsPatches
{
- [HarmonyPrefix]
- [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseChance))]
- public static bool RoleIncreaseChancePrefix(RoleOptionSetting __instance)
+ private static bool HandleRoleChance(RoleOptionSetting instance, int direction)
{
- if (!__instance.Role.IsCustomRole())
- {
+ if (!instance.Role.IsCustomRole())
return true;
- }
- if (__instance.roleChance == 0)
- {
- __instance.roleMaxCount = 1;
- }
+ if (instance.roleChance == 0)
+ instance.roleMaxCount = 1;
- var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
- __instance.roleChance += increment;
+ var increment = (Input.GetKey(KeyCode.LeftShift) ? 5 : 10) * direction;
+ instance.roleChance += increment;
- if (__instance.roleChance > 100)
- {
- __instance.roleChance = 0;
- }
+ if (instance.roleChance > 100)
+ instance.roleChance = 0;
+ else if (instance.roleChance < 0)
+ instance.roleChance = 100;
- if (__instance.roleChance == 0)
- {
- __instance.roleMaxCount = 0;
- }
+ if (instance.roleChance == 0)
+ instance.roleMaxCount = 0;
- __instance.OnValueChanged.Invoke(__instance);
+ instance.OnValueChanged.Invoke(instance);
return false;
}
+ private static bool HandleRoleCount(RoleOptionSetting instance, int direction)
+ {
+ if (!instance.Role.IsCustomRole())
+ return true;
+
+ if (instance.roleMaxCount == 0)
+ instance.roleChance = 50;
+
+ instance.roleMaxCount += direction;
+
+ if (instance.roleMaxCount > instance.role.MaxCount)
+ instance.roleMaxCount = 0;
+ else if (instance.roleMaxCount < 0)
+ instance.roleMaxCount = instance.role.MaxCount;
+
+ if (instance.roleMaxCount == 0)
+ instance.roleChance = 0;
+
+ instance.OnValueChanged.Invoke(instance);
+ return false;
+ }
+
+ private static bool HandleNumberOption(NumberOption instance, int direction)
+ {
+ if (!instance.IsCustom())
+ return true;
+
+ var increment = instance.Increment;
+
+ if (Input.GetKey(KeyCode.LeftShift) &&
+ instance.TryGetComponent(out var miraNumber) &&
+ miraNumber.ShiftIncrementToggle)
+ {
+ increment /= 2;
+ }
+
+ instance.Value += increment * direction;
+
+ if (instance.Value > instance.ValidRange.max)
+ instance.Value = instance.ValidRange.min;
+ else if (instance.Value < instance.ValidRange.min)
+ instance.Value = instance.ValidRange.max;
+
+ instance.OnValueChanged.Invoke(instance);
+ instance.AdjustButtonsActiveState();
+ return false;
+ }
+
+ private static bool HandleStringOption(StringOption instance, int direction)
+ {
+ if (!instance.IsCustom())
+ return true;
+
+ instance.Value += direction;
+
+ if (instance.Value >= instance.Values.Length)
+ instance.Value = 0;
+ else if (instance.Value < 0)
+ instance.Value = instance.Values.Length - 1;
+
+ instance.OnValueChanged.Invoke(instance);
+ instance.AdjustButtonsActiveState();
+ return false;
+ }
+
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseChance))]
+ public static bool RoleIncreaseChancePrefix(RoleOptionSetting __instance) => HandleRoleChance(__instance, 1);
+
[HarmonyPrefix]
[HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseChance))]
- public static bool RoleDecreaseChancePrefix(RoleOptionSetting __instance)
- {
- if (!__instance.Role.IsCustomRole())
- {
- return true;
- }
-
- if (__instance.roleChance == 0)
- {
- __instance.roleMaxCount = 1;
- }
-
- var increment = Input.GetKey(KeyCode.LeftShift) ? 5 : 10;
- __instance.roleChance -= increment;
-
- if (__instance.roleChance < 0)
- {
- __instance.roleChance = 100;
- }
-
- if (__instance.roleChance == 0)
- {
- __instance.roleMaxCount = 0;
- }
-
- __instance.OnValueChanged.Invoke(__instance);
- return false;
- }
+ public static bool RoleDecreaseChancePrefix(RoleOptionSetting __instance) => HandleRoleChance(__instance, -1);
[HarmonyPrefix]
[HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.IncreaseCount))]
- public static bool RoleIncreaseCountPrefix(RoleOptionSetting __instance)
- {
- if (!__instance.Role.IsCustomRole())
- {
- return true;
- }
-
- if (__instance.roleMaxCount == 0)
- {
- __instance.roleChance = 50;
- }
-
- __instance.roleMaxCount += 1;
- if (__instance.roleMaxCount > __instance.role.MaxCount)
- {
- __instance.roleMaxCount = 0;
- }
-
- if (__instance.roleMaxCount == 0)
- {
- __instance.roleChance = 0;
- }
-
- __instance.OnValueChanged.Invoke(__instance);
- return false;
- }
+ public static bool RoleIncreaseCountPrefix(RoleOptionSetting __instance) => HandleRoleCount(__instance, 1);
[HarmonyPrefix]
[HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.DecreaseCount))]
- public static bool RoleDecreaseCountPrefix(RoleOptionSetting __instance)
- {
- if (!__instance.Role.IsCustomRole())
- {
- return true;
- }
+ public static bool RoleDecreaseCountPrefix(RoleOptionSetting __instance) => HandleRoleCount(__instance, -1);
- if (__instance.roleMaxCount == 0)
- {
- __instance.roleChance = 50;
- }
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Increase))]
+ public static bool NumberIncrease(NumberOption __instance) => HandleNumberOption(__instance, 1);
- __instance.roleMaxCount -= 1;
- if (__instance.roleMaxCount < 0)
- {
- __instance.roleMaxCount = __instance.role.MaxCount;
- }
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Decrease))]
+ public static bool NumberDecrease(NumberOption __instance) => HandleNumberOption(__instance, -1);
- if (__instance.roleMaxCount == 0)
- {
- __instance.roleChance = 0;
- }
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(StringOption), nameof(StringOption.Increase))]
+ public static bool StringOptionIncrease(StringOption __instance) => HandleStringOption(__instance, 1);
- __instance.OnValueChanged.Invoke(__instance);
- return false;
- }
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(StringOption), nameof(StringOption.Decrease))]
+ public static bool StringOptionDecrease(StringOption __instance) => HandleStringOption(__instance, -1);
[HarmonyPrefix]
[HarmonyPatch(typeof(NumberOption), nameof(NumberOption.AdjustButtonsActiveState))]
@@ -138,65 +137,43 @@ public static class OptionsPatches
[HarmonyPatch(typeof(RoleOptionSetting), nameof(RoleOptionSetting.AdjustCountButtonsActiveState))]
public static bool AdjustButtonsPrefix(OptionBehaviour __instance)
{
- if (__instance.IsCustom())
+ if (!__instance.IsCustom())
{
- if (__instance.TryCast() is { } numberOption)
- {
- numberOption.MinusBtn.SetInteractable(true);
- numberOption.PlusBtn.SetInteractable(true);
- }
+ if (!__instance.TryCast(out var roleOptionSetting) || !roleOptionSetting.Role.IsCustomRole())
+ return true;
- if (__instance.TryCast() is { } stringOption)
- {
- stringOption.MinusBtn.SetInteractable(true);
- stringOption.PlusBtn.SetInteractable(true);
- }
-
- if (__instance.TryCast() is { } playerOption)
- {
- playerOption.MinusBtn.SetInteractable(true);
- playerOption.PlusBtn.SetInteractable(true);
- }
-
- return false;
- }
-
- if (__instance.TryCast() is { } roleOptionSetting && roleOptionSetting.Role.IsCustomRole())
- {
roleOptionSetting.CountMinusBtn.SetInteractable(true);
roleOptionSetting.CountPlusBtn.SetInteractable(true);
roleOptionSetting.ChanceMinusBtn.SetInteractable(true);
roleOptionSetting.ChancePlusBtn.SetInteractable(true);
-
return false;
}
- return true;
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Initialize))]
- public static bool ToggleInit(ToggleOption __instance)
- {
- if (!__instance.IsCustom())
+ if (__instance.TryCast(out var numberOption))
{
- return true;
+ numberOption.MinusBtn.SetInteractable(true);
+ numberOption.PlusBtn.SetInteractable(true);
+ }
+ else if (__instance.TryCast(out var stringOption))
+ {
+ stringOption.MinusBtn.SetInteractable(true);
+ stringOption.PlusBtn.SetInteractable(true);
+ }
+ else if (__instance.TryCast(out var playerOption))
+ {
+ playerOption.MinusBtn.SetInteractable(true);
+ playerOption.PlusBtn.SetInteractable(true);
}
-
- __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
return false;
}
- // UpdateValue was inlined.
[HarmonyPrefix]
[HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Toggle))]
public static bool ToggleUpdate(ToggleOption __instance)
{
if (!__instance.IsCustom())
- {
return true;
- }
__instance.CheckMark.enabled = !__instance.CheckMark.enabled;
__instance.OnValueChanged.Invoke(__instance);
@@ -207,134 +184,5 @@ public static class OptionsPatches
[HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
[HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
[HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.UpdateValue))]
- public static bool UpdateValuePrefix(OptionBehaviour __instance)
- {
- return !__instance.IsCustom();
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Initialize))]
- public static bool NumberInit(NumberOption __instance)
- {
- if (!__instance.IsCustom())
- {
- return true;
- }
-
- __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
- return false;
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Increase))]
- public static bool NumberIncrease(NumberOption __instance)
- {
- if (!__instance.IsCustom())
- {
- return true;
- }
-
- var increment = __instance.Increment;
-
- if (Input.GetKey(KeyCode.LeftShift) &&
- __instance.TryGetComponent(out var miraNumber) &&
- miraNumber.ShiftIncrementToggle)
- {
- increment /= 2;
- }
-
- __instance.Value += increment;
- if (__instance.Value > __instance.ValidRange.max)
- {
- __instance.Value = __instance.ValidRange.min;
- }
-
- __instance.OnValueChanged.Invoke(__instance);
- __instance.AdjustButtonsActiveState();
- return false;
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(NumberOption), nameof(NumberOption.Decrease))]
- public static bool NumberDecrease(NumberOption __instance)
- {
- if (!__instance.IsCustom())
- {
- return true;
- }
-
- var increment = __instance.Increment;
-
- if (Input.GetKey(KeyCode.LeftShift) &&
- __instance.TryGetComponent(out var miraNumber) &&
- miraNumber.ShiftIncrementToggle)
- {
- increment /= 2;
- }
-
- __instance.Value -= increment;
- if (__instance.Value < __instance.ValidRange.min)
- {
- __instance.Value = __instance.ValidRange.max;
- }
-
- __instance.OnValueChanged.Invoke(__instance);
- __instance.AdjustButtonsActiveState();
- return false;
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(StringOption), nameof(StringOption.Increase))]
- public static bool StringOptionIncrease(StringOption __instance)
- {
- if (!__instance.IsCustom())
- {
- return true;
- }
-
- __instance.Value += 1;
- if (__instance.Value >= __instance.Values.Length)
- {
- __instance.Value = 0;
- }
-
- __instance.OnValueChanged.Invoke(__instance);
- __instance.AdjustButtonsActiveState();
- return false;
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(StringOption), nameof(StringOption.Decrease))]
- public static bool StringOptionDecrease(StringOption __instance)
- {
- if (!__instance.IsCustom())
- {
- return true;
- }
-
- __instance.Value -= 1;
- if (__instance.Value < 0)
- {
- __instance.Value = __instance.Values.Length - 1;
- }
-
- __instance.OnValueChanged.Invoke(__instance);
- __instance.AdjustButtonsActiveState();
- return false;
- }
-
- [HarmonyPrefix]
- [HarmonyPatch(typeof(StringOption), nameof(StringOption.Initialize))]
- public static bool StringInit(StringOption __instance)
- {
- if (!__instance.IsCustom())
- {
- return true;
- }
-
- __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
- __instance.ValueText.text = TranslationController.Instance.GetString(__instance.Values[__instance.Value]);
-
- return false;
- }
+ public static bool UpdateValuePrefix(OptionBehaviour __instance) => !__instance.IsCustom();
}
diff --git a/MiraAPI/Patches/Options/PlayerOptionPatches.cs b/MiraAPI/Patches/Options/PlayerOptionPatches.cs
index ab19fced..3131c684 100644
--- a/MiraAPI/Patches/Options/PlayerOptionPatches.cs
+++ b/MiraAPI/Patches/Options/PlayerOptionPatches.cs
@@ -19,7 +19,9 @@ public static class PlayerOptionPatches
return true;
}
- if (!ModdedOptionsManager.CreatedPlayerOptions.TryGetValue(__instance, out var moddedPlrOpt)) return false;
+ if (!__instance.TryGetComponent(out var component)) return false;
+
+ var moddedPlrOpt = component.PlayerOption;
var filteredPlayers = moddedPlrOpt.GetFilteredPlayers();
if (filteredPlayers.Count != __instance.Values.Count)
@@ -42,7 +44,7 @@ public static class PlayerOptionPatches
[HarmonyPatch(nameof(PlayerOption.UpdatePlayerIndex))]
public static bool UpdatePlayerIndexPatch(PlayerOption __instance, int index)
{
- if (!__instance.IsCustom() || ModdedOptionsManager.CreatedPlayerOptions[__instance].AllowNone)
+ if (!__instance.IsCustom() || !__instance.TryGetComponent(out var component) || component.PlayerOption.AllowNone)
{
return true;
}
diff --git a/MiraAPI/Utilities/Extensions.cs b/MiraAPI/Utilities/Extensions.cs
index d3a0fbae..1df8dbf9 100644
--- a/MiraAPI/Utilities/Extensions.cs
+++ b/MiraAPI/Utilities/Extensions.cs
@@ -8,6 +8,7 @@ using System.Linq;
using System.Reflection;
using System.Text.RegularExpressions;
using HarmonyLib;
+using Il2CppInterop.Runtime.InteropTypes;
using MiraAPI.GameModes;
using MiraAPI.GameOptions;
using MiraAPI.Networking;
@@ -202,7 +203,7 @@ public static class Extensions
/// if the is an integer, otherwise.
public static bool IsInteger(this float number)
{
- return Mathf.Approximately(number, Mathf.Round(number));
+ return Mathf.Approximately(number, MathF.Round(number));
}
///
@@ -887,4 +888,24 @@ public static class Extensions
attribute = member.GetCustomAttribute();
return attribute != null;
}
+
+ ///
+ /// Attempts to cast an IL2CPP object to .
+ ///
+ /// The type of the value to cast to.
+ /// The object to cast.
+ /// When the method returns, the casted object if true; null if false.
+ /// true if the cast was successful; false otherwise.
+ public static bool TryCast(this Il2CppObjectBase? obj, [NotNullWhen(true)] out T? result)
+ where T : Il2CppObjectBase
+ {
+ if (obj == null)
+ {
+ result = null;
+ return false;
+ }
+
+ result = obj.TryCast();
+ return result != null;
+ }
}