diff --git a/MiraAPI/GameOptions/IModdedOption.cs b/MiraAPI/GameOptions/IModdedOption.cs index 5768576f..a7acaa8e 100644 --- a/MiraAPI/GameOptions/IModdedOption.cs +++ b/MiraAPI/GameOptions/IModdedOption.cs @@ -8,6 +8,7 @@ namespace MiraAPI.GameOptions public interface IModdedOption { public uint Id { get; } + public BaseGameSetting Data { get; } public ModdedOptionGroup Group { get; set; } public IMiraPlugin ParentMod { get; set; } public Type AdvancedRole { get; } diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs index e6b2b9ff..d654b1ac 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs @@ -7,34 +7,36 @@ using Object = UnityEngine.Object; namespace MiraAPI.GameOptions.OptionTypes { - public class ModdedEnumOption(string title, int defaultValue, Type enumType, Type roleType) : ModdedOption(title, defaultValue, roleType) + public class ModdedEnumOption : ModdedOption { - public string[] Values { get; set; } = Enum.GetNames(enumType); + public ModdedEnumOption(string title, int defaultValue, Type enumType, Type roleType) : base(title, defaultValue, roleType) + { + Values = Enum.GetNames(enumType); + Data = ScriptableObject.CreateInstance(); + var data = (StringGameSetting)Data; + + data.Title = StringName; + data.Type = global::OptionTypes.String; + data.Values = Values.Select(CustomStringName.CreateAndRegister).ToArray(); + data.Index = Value; + } + + public string[] Values { get; set; } public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container) { var stringOption = Object.Instantiate(stringOpt, container); - var vals = Values.Select(CustomStringName.CreateAndRegister).ToArray(); - var data = ScriptableObject.CreateInstance(); - - data.Title = StringName; - data.Type = global::OptionTypes.String; - data.Values = vals; - data.Index = Value; - - stringOption.data = data; - stringOption.Title = StringName; - stringOption.TitleText.text = Title; - stringOption.Values = vals; + stringOption.SetUpFromData(Data, 20); stringOption.OnValueChanged = (Il2CppSystem.Action)ValueChanged; + + // SetUpFromData method doesnt work correctly so we must set the values manually + stringOption.Title = StringName; + stringOption.Values = ((StringGameSetting)Data).Values; + stringOption.Value = DefaultValue; OptionBehaviour = stringOption; - stringOption.Initialize(); - stringOption.Value = Value; - stringOption.ValueText.text = Values[Value]; - stringOption.SetUpFromData(stringOption.data, 20); return stringOption; } @@ -60,7 +62,7 @@ namespace MiraAPI.GameOptions.OptionTypes public override void OnValueChanged(int newValue) { - DestroyableSingleton.Instance.Notifier.AddSettingsChangeMessage(StringName, OptionBehaviour.GetValueString(newValue), false); + DestroyableSingleton.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false); if (OptionBehaviour is null) return; var opt = OptionBehaviour as StringOption; diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs index f54b5d89..5169f568 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs @@ -1,4 +1,5 @@ using System; +using AmongUs.GameOptions; using MiraAPI.Networking; using MiraAPI.Utilities; using UnityEngine; @@ -22,27 +23,30 @@ namespace MiraAPI.GameOptions.OptionTypes ZeroInfinity = zeroInfinity; Value = Mathf.Clamp(defaultValue, min, max); + + Data = ScriptableObject.CreateInstance(); + + 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 = "0"; + data.ZeroIsInfinity = ZeroInfinity; + data.SuffixType = SuffixType; + data.OptionName = FloatOptionNames.Invalid; } public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container) { var numberOption = Object.Instantiate(numberOpt, Vector3.zero, Quaternion.identity, container); - var data = ScriptableObject.CreateInstance(); - data.Title = StringName; - data.Type = global::OptionTypes.Float; - data.Increment = Increment; - data.SuffixType = SuffixType; - data.FormatString = "0"; - data.ValidRange = new FloatRange(Min, Max); - data.ZeroIsInfinity = ZeroInfinity; - data.Value = Value; - numberOption.data = data; - numberOption.SetUpFromData(numberOption.data, 20); + numberOption.SetUpFromData(Data, 20); numberOption.OnValueChanged = (Il2CppSystem.Action)ValueChanged; - OptionBehaviour = numberOption; - numberOption.Value = Value; + + OptionBehaviour = numberOption; return numberOption; } @@ -70,9 +74,9 @@ namespace MiraAPI.GameOptions.OptionTypes public override void OnValueChanged(float newValue) { Value = Mathf.Clamp(newValue, Min, Max); + DestroyableSingleton.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(Value), false); if (OptionBehaviour is null) return; - DestroyableSingleton.Instance.Notifier.AddSettingsChangeMessage(StringName, OptionBehaviour.GetValueString(newValue), false); var opt = OptionBehaviour as NumberOption; if (opt) diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs index 58f59c4b..b6f0ddc5 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs @@ -12,6 +12,7 @@ namespace MiraAPI.GameOptions.OptionTypes public abstract class ModdedOption : IModdedOption { public uint Id { get; } + public BaseGameSetting Data { get; protected init; } public T Value { get; protected set; } public T DefaultValue { get; init; } public Action ChangedEvent { get; set; } diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs index 9132cb4c..d85932bc 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedStringOption.cs @@ -7,30 +7,36 @@ using Object = UnityEngine.Object; namespace MiraAPI.GameOptions.OptionTypes { - public class ModdedStringOption(string title, int defaultValue, string[] values, Type roleType) : ModdedOption(title, defaultValue, roleType) + public class ModdedStringOption : ModdedOption { - public string[] Values { get; private set; } = values; + public ModdedStringOption(string title, int defaultValue, string[] values, Type roleType) : base(title, defaultValue, roleType) + { + Values = values; + Data = ScriptableObject.CreateInstance(); + var data = (StringGameSetting)Data; + + data.Title = StringName; + data.Type = global::OptionTypes.String; + data.Values = Values.Select(CustomStringName.CreateAndRegister).ToArray(); + data.Index = Value; + } + + public string[] Values { get; set; } public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container) { var stringOption = Object.Instantiate(stringOpt, container); - var vals = Values.Select(CustomStringName.CreateAndRegister).ToArray(); - var data = ScriptableObject.CreateInstance(); - data.Title = StringName; - data.Type = global::OptionTypes.String; - data.Values = vals; - data.Index = Value; - - stringOption.data = data; + stringOption.SetUpFromData(Data, 20); stringOption.OnValueChanged = (Il2CppSystem.Action)ValueChanged; + // SetUpFromData method doesnt work correctly so we must set the values manually + stringOption.Title = StringName; + stringOption.Values = ((StringGameSetting)Data).Values; + stringOption.Value = DefaultValue; + OptionBehaviour = stringOption; - - stringOption.SetUpFromData(stringOption.data, 20); - - stringOption.Value = Value; - + return stringOption; } @@ -56,7 +62,7 @@ namespace MiraAPI.GameOptions.OptionTypes public override void OnValueChanged(int newValue) { - DestroyableSingleton.Instance.Notifier.AddSettingsChangeMessage(StringName, OptionBehaviour.GetValueString(newValue), false); + DestroyableSingleton.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false); if (OptionBehaviour is null) return; var opt = OptionBehaviour as StringOption; diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs index 907e5da5..184a5e18 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs @@ -5,16 +5,24 @@ using Object = UnityEngine.Object; namespace MiraAPI.GameOptions.OptionTypes { - public class ModdedToggleOption(string title, bool defaultValue, System.Type roleType) : ModdedOption(title, defaultValue, roleType) + public class ModdedToggleOption : ModdedOption { + public ModdedToggleOption(string title, bool defaultValue, System.Type roleType) : base(title, defaultValue, roleType) + { + Value = defaultValue; + + Data = ScriptableObject.CreateInstance(); + + var data = (CheckboxGameSetting)Data; + data.Title = StringName; + data.Type = global::OptionTypes.Checkbox; + } + public override OptionBehaviour CreateOption(ToggleOption toggleOpt, NumberOption numberOpt, StringOption stringOpt, Transform container) { var toggleOption = Object.Instantiate(toggleOpt, Vector3.zero, Quaternion.identity, container); - var data = ScriptableObject.CreateInstance(); - data.Title = StringName; - data.Type = global::OptionTypes.Checkbox; - toggleOption.data = data; + toggleOption.SetUpFromData(Data, 20); toggleOption.TitleText.text = Title; toggleOption.CheckMark.enabled = Value; @@ -22,8 +30,6 @@ namespace MiraAPI.GameOptions.OptionTypes OptionBehaviour = toggleOption; - toggleOption.SetUpFromData(toggleOption.data, 20); - return toggleOption; }