From c10bb1ef871a91639a61c197ccb2934f4585b640 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Sun, 15 Nov 2026 13:16:56 -0500 Subject: [PATCH] remove useless setting of option names --- MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs | 3 --- MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs | 6 +----- MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs | 4 +--- MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs | 1 + MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs | 4 +--- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs index ea6e9771..84d67cd1 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs @@ -1,5 +1,4 @@ using System; -using AmongUs.GameOptions; using UnityEngine; using Object = UnityEngine.Object; @@ -47,7 +46,6 @@ public abstract class ModdedBaseStringOption(string groupPrefix, string title data.Type = global::OptionTypes.String; data.Values = StringNameValues; data.Index = defaultIndex; - data.OptionName = Int32OptionNames.Invalid; Data = data; } @@ -79,7 +77,6 @@ public abstract class ModdedBaseStringOption(string groupPrefix, string title 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 diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs index 883387f6..e3d22578 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs @@ -1,6 +1,5 @@ using System; using System.Text.RegularExpressions; -using AmongUs.GameOptions; using BepInEx.Configuration; using MiraAPI.Networking; using MiraAPI.Utilities; @@ -123,7 +122,6 @@ public class ModdedNumberOption : ModdedOption data.FormatString = FormatString; data.ZeroIsInfinity = ZeroInfinity; data.SuffixType = (NumberSuffixes)SuffixType; - data.OptionName = Int32OptionNames.Invalid; Data = data; } @@ -138,7 +136,6 @@ public class ModdedNumberOption : ModdedOption data.FormatString = FormatString; data.ZeroIsInfinity = ZeroInfinity; data.SuffixType = (NumberSuffixes)SuffixType; - data.OptionName = FloatOptionNames.Invalid; Data = data; } @@ -241,6 +238,7 @@ public class ModdedNumberOption : ModdedOption numberOption.SetUpFromData(Data, 20); + // SetUpFromData method doesn't work correctly so we must set the values manually numberOption.Title = StringName; numberOption.Value = Value; numberOption.Increment = Increment; @@ -248,8 +246,6 @@ public class ModdedNumberOption : ModdedOption numberOption.FormatString = FormatString; numberOption.ZeroIsInfinity = ZeroInfinity; numberOption.SuffixType = (NumberSuffixes)SuffixType; - numberOption.intOptionName = Int32OptionNames.Invalid; - numberOption.floatOptionName = FloatOptionNames.Invalid; numberOption.OnValueChanged = (Action)ValueChanged; var optionComponent = numberOption.gameObject.AddComponent(); diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs index 6818ad23..c6526ec0 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using AmongUs.GameOptions; using MiraAPI.Networking; using MiraAPI.Utilities; using UnityEngine; @@ -46,7 +45,6 @@ public class ModdedPlayerOption : ModdedOption var data = ScriptableObject.CreateInstance(); data.Title = StringName; data.Type = global::OptionTypes.Player; - data.OptionName = Int32OptionNames.Invalid; Data = data; } @@ -76,11 +74,11 @@ public class ModdedPlayerOption : ModdedOption playerOption.SetUpFromData(Data, 20); + // SetUpFromData method doesn't work correctly so we must set the values manually playerOption.Title = StringName; playerOption.Values = Values.ToIl2CppList(); playerOption.Value = Value; playerOption.playerIndex = Values.FindIndex(p => p.PlayerId == Value); - playerOption.optionName = Int32OptionNames.Invalid; playerOption.OnValueChanged = (Action)ValueChanged; playerOption.SetValueText(); diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs index 3e3f66ba..0095ca9d 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs @@ -51,6 +51,7 @@ public class ModdedStringOption : ModdedBaseStringOption /// /// The option's string value. /// The additional value's index on the list. + [Obsolete("Use the Setter feature of modded options to simulate conditional values. This wil be removed in a future version.")] public void RegisterExtraValue(string value, int index = -1) { if (!Values.Contains(value)) diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs index b23d3af7..c1089f8f 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs @@ -1,5 +1,4 @@ using System; -using AmongUs.GameOptions; using MiraAPI.Networking; using MiraAPI.Translation; using UnityEngine; @@ -40,7 +39,6 @@ public class ModdedToggleOption : ModdedOption var data = ScriptableObject.CreateInstance(); data.Title = StringName; data.Type = global::OptionTypes.Checkbox; - data.OptionName = BoolOptionNames.Invalid; Data = data; } @@ -89,9 +87,9 @@ public class ModdedToggleOption : ModdedOption toggleOption.SetUpFromData(Data, 20); + // SetUpFromData method doesn't work correctly so we must set the values manually toggleOption.Title = StringName; toggleOption.CheckMark.enabled = Value; - toggleOption.boolOptionName = BoolOptionNames.Invalid; toggleOption.OnValueChanged = (Action)ValueChanged; OptionBehaviour = toggleOption;