From 21396fb39ef6ff1521c23a5b9ba358041fa8f828 Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Thu, 24 Oct 2024 23:49:23 +0100 Subject: [PATCH] Temporarily disable escape menu version preset Will be readded a later time when it is convenient to do so --- Bloxstrap/FastFlagManager.cs | 134 +++++++++--------- Bloxstrap/Installer.cs | 15 ++ .../Settings/Pages/FastFlagsPage.xaml | 4 +- 3 files changed, 84 insertions(+), 69 deletions(-) diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs index c5ac0a2..11a3af6 100644 --- a/Bloxstrap/FastFlagManager.cs +++ b/Bloxstrap/FastFlagManager.cs @@ -39,17 +39,17 @@ namespace Bloxstrap { "UI.FullscreenTitlebarDelay", "FIntFullscreenTitleBarTriggerDelayMillis" }, - { "UI.Menu.Style.V2Rollout", "FIntNewInGameMenuPercentRollout3" }, - { "UI.Menu.Style.EnableV4.1", "FFlagEnableInGameMenuControls" }, - { "UI.Menu.Style.EnableV4.2", "FFlagEnableInGameMenuModernization" }, - { "UI.Menu.Style.EnableV4Chrome", "FFlagEnableInGameMenuChrome" }, - { "UI.Menu.Style.ReportButtonCutOff", "FFlagFixReportButtonCutOff" }, + //{ "UI.Menu.Style.V2Rollout", "FIntNewInGameMenuPercentRollout3" }, + //{ "UI.Menu.Style.EnableV4.1", "FFlagEnableInGameMenuControls" }, + //{ "UI.Menu.Style.EnableV4.2", "FFlagEnableInGameMenuModernization" }, + //{ "UI.Menu.Style.EnableV4Chrome", "FFlagEnableInGameMenuChrome" }, + //{ "UI.Menu.Style.ReportButtonCutOff", "FFlagFixReportButtonCutOff" }, - { "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" }, - { "UI.Menu.Style.ABTest.2", "FFlagEnableV3MenuABTest3" }, - { "UI.Menu.Style.ABTest.3", "FFlagEnableInGameMenuChromeABTest3" }, - { "UI.Menu.Style.ABTest.4", "FFlagEnableInGameMenuChromeABTest4" } + //{ "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" }, + //{ "UI.Menu.Style.ABTest.2", "FFlagEnableV3MenuABTest3" }, + //{ "UI.Menu.Style.ABTest.3", "FFlagEnableInGameMenuChromeABTest3" }, + //{ "UI.Menu.Style.ABTest.4", "FFlagEnableInGameMenuChromeABTest4" } }; public static IReadOnlyDictionary RenderingModes => new Dictionary @@ -86,68 +86,68 @@ namespace Bloxstrap // this is one hell of a dictionary definition lmao // since these all set the same flags, wouldn't making this use bitwise operators be better? - public static IReadOnlyDictionary> IGMenuVersions => new Dictionary> - { - { - InGameMenuVersion.Default, - new Dictionary - { - { "V2Rollout", null }, - { "EnableV4", null }, - { "EnableV4Chrome", null }, - { "ABTest", null }, - { "ReportButtonCutOff", null } - } - }, + //public static IReadOnlyDictionary> IGMenuVersions => new Dictionary> + //{ + // { + // InGameMenuVersion.Default, + // new Dictionary + // { + // { "V2Rollout", null }, + // { "EnableV4", null }, + // { "EnableV4Chrome", null }, + // { "ABTest", null }, + // { "ReportButtonCutOff", null } + // } + // }, - { - InGameMenuVersion.V1, - new Dictionary - { - { "V2Rollout", "0" }, - { "EnableV4", "False" }, - { "EnableV4Chrome", "False" }, - { "ABTest", "False" }, - { "ReportButtonCutOff", "False" } - } - }, + // { + // InGameMenuVersion.V1, + // new Dictionary + // { + // { "V2Rollout", "0" }, + // { "EnableV4", "False" }, + // { "EnableV4Chrome", "False" }, + // { "ABTest", "False" }, + // { "ReportButtonCutOff", "False" } + // } + // }, - { - InGameMenuVersion.V2, - new Dictionary - { - { "V2Rollout", "100" }, - { "EnableV4", "False" }, - { "EnableV4Chrome", "False" }, - { "ABTest", "False" }, - { "ReportButtonCutOff", null } - } - }, + // { + // InGameMenuVersion.V2, + // new Dictionary + // { + // { "V2Rollout", "100" }, + // { "EnableV4", "False" }, + // { "EnableV4Chrome", "False" }, + // { "ABTest", "False" }, + // { "ReportButtonCutOff", null } + // } + // }, - { - InGameMenuVersion.V4, - new Dictionary - { - { "V2Rollout", "0" }, - { "EnableV4", "True" }, - { "EnableV4Chrome", "False" }, - { "ABTest", "False" }, - { "ReportButtonCutOff", null } - } - }, + // { + // InGameMenuVersion.V4, + // new Dictionary + // { + // { "V2Rollout", "0" }, + // { "EnableV4", "True" }, + // { "EnableV4Chrome", "False" }, + // { "ABTest", "False" }, + // { "ReportButtonCutOff", null } + // } + // }, - { - InGameMenuVersion.V4Chrome, - new Dictionary - { - { "V2Rollout", "0" }, - { "EnableV4", "True" }, - { "EnableV4Chrome", "True" }, - { "ABTest", "False" }, - { "ReportButtonCutOff", null } - } - } - }; + // { + // InGameMenuVersion.V4Chrome, + // new Dictionary + // { + // { "V2Rollout", "0" }, + // { "EnableV4", "True" }, + // { "EnableV4Chrome", "True" }, + // { "ABTest", "False" }, + // { "ReportButtonCutOff", null } + // } + // } + //}; // all fflags are stored as strings // to delete a flag, set the value as null diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs index 4bdf2fd..6742f42 100644 --- a/Bloxstrap/Installer.cs +++ b/Bloxstrap/Installer.cs @@ -590,6 +590,21 @@ namespace Bloxstrap } } + if (Utilities.CompareVersions(existingVer, "2.8.1") == VersionComparison.LessThan) + { + // wipe all escape menu flag presets + App.FastFlags.SetValue("FIntNewInGameMenuPercentRollout3", null); + App.FastFlags.SetValue("FFlagEnableInGameMenuControls", null); + App.FastFlags.SetValue("FFlagEnableInGameMenuModernization", null); + App.FastFlags.SetValue("FFlagEnableInGameMenuChrome", null); + App.FastFlags.SetValue("FFlagFixReportButtonCutOff", null); + App.FastFlags.SetValue("FFlagEnableMenuControlsABTest", null); + App.FastFlags.SetValue("FFlagEnableV3MenuABTest3", null); + App.FastFlags.SetValue("FFlagEnableInGameMenuChromeABTest3", null); + App.FastFlags.SetValue("FFlagEnableInGameMenuChromeABTest4", null); + } + + App.Settings.Save(); App.FastFlags.Save(); } diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml index 239644e..65f145f 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml @@ -131,7 +131,7 @@ - @@ -141,7 +141,7 @@ - + -->