diff --git a/MiraAPI/Patches/Options/OptionsPatches.cs b/MiraAPI/Patches/Options/OptionsPatches.cs index 656f0cf9..c65a5d82 100644 --- a/MiraAPI/Patches/Options/OptionsPatches.cs +++ b/MiraAPI/Patches/Options/OptionsPatches.cs @@ -225,6 +225,7 @@ public static class OptionsPatches } __instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate(); + __instance.ValueText.text = Helpers.FormatValue(__instance.Value, (MiraNumberSuffixes)__instance.SuffixType, __instance.FormatString); return false; } } diff --git a/MiraAPI/Patches/Options/SettingPatches.cs b/MiraAPI/Patches/Options/SettingPatches.cs index cd7f7138..6a0115b4 100644 --- a/MiraAPI/Patches/Options/SettingPatches.cs +++ b/MiraAPI/Patches/Options/SettingPatches.cs @@ -1,5 +1,4 @@ -using System.Globalization; -using System.Linq; +using System.Linq; using HarmonyLib; using MiraAPI.GameOptions; using MiraAPI.GameOptions.OptionTypes; @@ -46,15 +45,7 @@ public static class SettingPatches } else { - var part = value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo); - result = suffix switch - { - MiraNumberSuffixes.Multiplier => part + "x", - MiraNumberSuffixes.Percent => part + "%", - MiraNumberSuffixes.Distance => part + MiraApiPlugin.DistanceSuffix.Value, - MiraNumberSuffixes.Seconds => TranslationController.Instance.GetString(StringNames.GameSecondsAbbrev, part), - _ => part, - }; + result = Helpers.FormatValue(value, suffix, __instance.FormatString); } } else if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f) @@ -63,15 +54,7 @@ public static class SettingPatches } else { - var part = value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo); - result = suffix switch - { - MiraNumberSuffixes.Multiplier => part + "x", - MiraNumberSuffixes.Percent => part + "%", - MiraNumberSuffixes.Distance => part + MiraApiPlugin.DistanceSuffix.Value, - MiraNumberSuffixes.Seconds => TranslationController.Instance.GetString(StringNames.GameSecondsAbbrev, part), - _ => part, - }; + result = Helpers.FormatValue(value, suffix, __instance.FormatString); } __result = result; diff --git a/MiraAPI/Utilities/Helpers.cs b/MiraAPI/Utilities/Helpers.cs index 538afc7d..a04d50e8 100644 --- a/MiraAPI/Utilities/Helpers.cs +++ b/MiraAPI/Utilities/Helpers.cs @@ -613,14 +613,7 @@ public static class Helpers public static string FormatValue(float value, MiraNumberSuffixes suffix = MiraNumberSuffixes.None, string formatString = "0.0") { var part = value.ToString(formatString, NumberFormatInfo.InvariantInfo); - return suffix switch - { - MiraNumberSuffixes.Percent => part + "%", - MiraNumberSuffixes.Multiplier => part + "x", - MiraNumberSuffixes.Distance => part + MiraApiPlugin.DistanceSuffix.Value, - MiraNumberSuffixes.Seconds => TranslationController.Instance.GetString(StringNames.GameSecondsAbbrev, part), - _ => part, - }; + return part + GetSuffix(suffix); } ///