diff --git a/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs
index 8ab42588..aee41a0f 100644
--- a/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs
+++ b/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs
@@ -156,7 +156,7 @@ public class ModdedNumberOptionAttribute(
var value = opt.Value;
if (ValueType == typeof(int))
- return (int)MathF.Round(value);
+ return (int)MathF.Round(value, MidpointRounding.AwayFromZero);
return value;
}
@@ -172,6 +172,6 @@ public class ModdedNumberOptionAttribute(
///
int ITypedOption.GetValueUnboxed()
{
- return (int)MathF.Round(GetValueUnboxed());
+ return (int)MathF.Round(GetValueUnboxed(), MidpointRounding.AwayFromZero);
}
}
diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs
index 83e1ee0a..d26fac6a 100644
--- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs
+++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs
@@ -158,7 +158,7 @@ public class ModdedNumberOptionListAttribute(
var value = opt.Value;
if (ValueType == typeof(int))
- return (int)MathF.Round(value);
+ return (int)MathF.Round(value, MidpointRounding.AwayFromZero);
return value;
}
@@ -174,6 +174,6 @@ public class ModdedNumberOptionListAttribute(
///
int ITypedOptionList.GetValueUnboxed(int idx)
{
- return (int)MathF.Round(GetValueUnboxed(idx));
+ return (int)MathF.Round(GetValueUnboxed(idx), MidpointRounding.AwayFromZero);
}
}
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs
index 066ccde1..ea6e9771 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedBaseStringOption.cs
@@ -47,6 +47,7 @@ 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;
}
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
index eb5bba87..883387f6 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
@@ -54,6 +54,11 @@ public class ModdedNumberOption : ModdedOption
///
public bool ShiftIncrement { get; }
+ ///
+ /// Gets a value indicating whether the option is an int option.
+ ///
+ public bool IsInt { get; }
+
///
/// Gets a value indicating whether zero is infinity.
///
@@ -98,27 +103,45 @@ public class ModdedNumberOption : ModdedOption
ZeroWordValue = zeroBehavior;
ShiftIncrement = halfIncrements;
NegativeWordValue = negativeBehavior;
- FormatString = formatString ??
- (defaultValue.IsInteger() &&
- Increment.IsInteger() &&
- Value.IsInteger() &&
- Min.IsInteger() &&
- Max.IsInteger() ? "0" : "0.0");
+ IsInt = defaultValue.IsInteger() &&
+ Increment.IsInteger() &&
+ Value.IsInteger() &&
+ Min.IsInteger() &&
+ Max.IsInteger();
+ FormatString = formatString ?? (IsInt ? "0" : "0.0");
Value = Mathf.Clamp(defaultValue, min, max);
- var data = ScriptableObject.CreateInstance();
- data.Type = global::OptionTypes.Float;
- data.Title = StringName;
- data.Value = Value;
- data.Increment = Increment;
- data.ValidRange = new FloatRange(Min, Max);
- data.FormatString = FormatString;
- data.ZeroIsInfinity = ZeroInfinity;
- data.SuffixType = (NumberSuffixes)SuffixType;
- data.OptionName = FloatOptionNames.Invalid;
+ if (IsInt)
+ {
+ var data = ScriptableObject.CreateInstance();
+ data.Type = global::OptionTypes.Int;
+ data.Title = StringName;
+ data.Value = (int)Value;
+ data.Increment = (int)Increment;
+ data.ValidRange = new IntRange((int)Min, (int)Max);
+ data.FormatString = FormatString;
+ data.ZeroIsInfinity = ZeroInfinity;
+ data.SuffixType = (NumberSuffixes)SuffixType;
+ data.OptionName = Int32OptionNames.Invalid;
- Data = data;
+ Data = data;
+ }
+ else
+ {
+ var data = ScriptableObject.CreateInstance();
+ data.Type = global::OptionTypes.Float;
+ data.Title = StringName;
+ data.Value = Value;
+ data.Increment = Increment;
+ data.ValidRange = new FloatRange(Min, Max);
+ data.FormatString = FormatString;
+ data.ZeroIsInfinity = ZeroInfinity;
+ data.SuffixType = (NumberSuffixes)SuffixType;
+ data.OptionName = FloatOptionNames.Invalid;
+
+ Data = data;
+ }
}
///
@@ -225,6 +248,7 @@ 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;
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs
index 455d9b54..6818ad23 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedPlayerOption.cs
@@ -46,6 +46,7 @@ public class ModdedPlayerOption : ModdedOption
var data = ScriptableObject.CreateInstance();
data.Title = StringName;
data.Type = global::OptionTypes.Player;
+ data.OptionName = Int32OptionNames.Invalid;
Data = data;
}
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
index 24aad9ac..b23d3af7 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
@@ -40,6 +40,7 @@ public class ModdedToggleOption : ModdedOption
var data = ScriptableObject.CreateInstance();
data.Title = StringName;
data.Type = global::OptionTypes.Checkbox;
+ data.OptionName = BoolOptionNames.Invalid;
Data = data;
}
diff --git a/MiraAPI/Modifiers/Types/TimedModifier.cs b/MiraAPI/Modifiers/Types/TimedModifier.cs
index a3e50854..59d927fc 100644
--- a/MiraAPI/Modifiers/Types/TimedModifier.cs
+++ b/MiraAPI/Modifiers/Types/TimedModifier.cs
@@ -51,7 +51,7 @@ public abstract class TimedModifier : BaseModifier
/// A string with the time remaining.
public override string GetDescription()
{
- return $"Remaining Time: {MathF.Round(Duration - TimeRemaining, 0)}s/{Duration}s";
+ return $"Remaining Time: {MathF.Round(Duration - TimeRemaining, 0, MidpointRounding.AwayFromZero)}s/{Duration}s";
}
///
diff --git a/MiraAPI/Patches/Options/OptionsPatches.cs b/MiraAPI/Patches/Options/OptionsPatches.cs
index 7aad70e9..656f0cf9 100644
--- a/MiraAPI/Patches/Options/OptionsPatches.cs
+++ b/MiraAPI/Patches/Options/OptionsPatches.cs
@@ -1,6 +1,7 @@
using HarmonyLib;
using MiraAPI.GameOptions;
using MiraAPI.Roles;
+using MiraAPI.Translation;
using MiraAPI.Utilities;
using UnityEngine;
@@ -184,5 +185,46 @@ public static class OptionsPatches
[HarmonyPatch(typeof(StringOption), nameof(StringOption.UpdateValue))]
[HarmonyPatch(typeof(NumberOption), nameof(NumberOption.UpdateValue))]
[HarmonyPatch(typeof(PlayerOption), nameof(PlayerOption.UpdateValue))]
+ [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.UpdateValue))]
public static bool UpdateValuePrefix(OptionBehaviour __instance) => !__instance.IsCustom();
+
+ [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;
+ }
+
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(ToggleOption), nameof(ToggleOption.Initialize))]
+ public static bool ToggleInit(ToggleOption __instance)
+ {
+ if (!__instance.IsCustom())
+ {
+ return true;
+ }
+
+ __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
+ return false;
+ }
+
+ [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;
+ }
}
diff --git a/MiraAPI/Utilities/ColorExtensions.cs b/MiraAPI/Utilities/ColorExtensions.cs
index 95c5d662..dc6de4cd 100644
--- a/MiraAPI/Utilities/ColorExtensions.cs
+++ b/MiraAPI/Utilities/ColorExtensions.cs
@@ -18,7 +18,7 @@ public static class ColorExtensions
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static byte ToByte(this float @float)
{
- return (byte)MathF.Round(@float * 255f);
+ return (byte)MathF.Round(@float * 255f, MidpointRounding.AwayFromZero);
}
///
diff --git a/MiraAPI/Utilities/Extensions.cs b/MiraAPI/Utilities/Extensions.cs
index 30135d96..a2efe4ac 100644
--- a/MiraAPI/Utilities/Extensions.cs
+++ b/MiraAPI/Utilities/Extensions.cs
@@ -204,7 +204,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, MidpointRounding.AwayFromZero));
}
///