mirror of
https://github.com/All-Of-Us-Mods/MiraAPI.git
synced 2026-11-19 13:17:10 +00:00
WIP fix errors in the game settings edit menu
This commit is contained in:
1 parent
55dac36e7d
commit
475551917b
6 files changed
+76
-56
No files matched your search
@@ -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; }
|
||||
|
||||
@@ -7,34 +7,36 @@ using Object = UnityEngine.Object;
|
||||
|
||||
namespace MiraAPI.GameOptions.OptionTypes
|
||||
{
|
||||
public class ModdedEnumOption(string title, int defaultValue, Type enumType, Type roleType) : ModdedOption<int>(title, defaultValue, roleType)
|
||||
public class ModdedEnumOption : ModdedOption<int>
|
||||
{
|
||||
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<StringGameSetting>();
|
||||
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<StringGameSetting>();
|
||||
|
||||
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<OptionBehaviour>)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<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, OptionBehaviour.GetValueString(newValue), false);
|
||||
DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
|
||||
if (OptionBehaviour is null) return;
|
||||
|
||||
var opt = OptionBehaviour as StringOption;
|
||||
|
||||
@@ -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<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 = "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<FloatGameSetting>();
|
||||
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<OptionBehaviour>)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<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(Value), false);
|
||||
|
||||
if (OptionBehaviour is null) return;
|
||||
DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, OptionBehaviour.GetValueString(newValue), false);
|
||||
|
||||
var opt = OptionBehaviour as NumberOption;
|
||||
if (opt)
|
||||
|
||||
@@ -12,6 +12,7 @@ namespace MiraAPI.GameOptions.OptionTypes
|
||||
public abstract class ModdedOption<T> : IModdedOption
|
||||
{
|
||||
public uint Id { get; }
|
||||
public BaseGameSetting Data { get; protected init; }
|
||||
public T Value { get; protected set; }
|
||||
public T DefaultValue { get; init; }
|
||||
public Action<T> ChangedEvent { get; set; }
|
||||
|
||||
@@ -7,30 +7,36 @@ using Object = UnityEngine.Object;
|
||||
|
||||
namespace MiraAPI.GameOptions.OptionTypes
|
||||
{
|
||||
public class ModdedStringOption(string title, int defaultValue, string[] values, Type roleType) : ModdedOption<int>(title, defaultValue, roleType)
|
||||
public class ModdedStringOption : ModdedOption<int>
|
||||
{
|
||||
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<StringGameSetting>();
|
||||
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<StringGameSetting>();
|
||||
|
||||
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<OptionBehaviour>)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<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, OptionBehaviour.GetValueString(newValue), false);
|
||||
DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(newValue), false);
|
||||
if (OptionBehaviour is null) return;
|
||||
|
||||
var opt = OptionBehaviour as StringOption;
|
||||
|
||||
@@ -5,16 +5,24 @@ using Object = UnityEngine.Object;
|
||||
|
||||
namespace MiraAPI.GameOptions.OptionTypes
|
||||
{
|
||||
public class ModdedToggleOption(string title, bool defaultValue, System.Type roleType) : ModdedOption<bool>(title, defaultValue, roleType)
|
||||
public class ModdedToggleOption : ModdedOption<bool>
|
||||
{
|
||||
public ModdedToggleOption(string title, bool defaultValue, System.Type roleType) : base(title, defaultValue, roleType)
|
||||
{
|
||||
Value = defaultValue;
|
||||
|
||||
Data = ScriptableObject.CreateInstance<CheckboxGameSetting>();
|
||||
|
||||
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<CheckboxGameSetting>();
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user