Temporarily disable escape menu version preset

Will be readded a later time when it is convenient to do so
This commit is contained in:
pizzaboxer 2024-10-24 23:49:23 +01:00
parent 7e51852c0b
commit 21396fb39e
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
3 changed files with 84 additions and 69 deletions

View File

@ -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<RenderingMode, string> RenderingModes => new Dictionary<RenderingMode, string>
@ -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<InGameMenuVersion, Dictionary<string, string?>> IGMenuVersions => new Dictionary<InGameMenuVersion, Dictionary<string, string?>>
{
{
InGameMenuVersion.Default,
new Dictionary<string, string?>
{
{ "V2Rollout", null },
{ "EnableV4", null },
{ "EnableV4Chrome", null },
{ "ABTest", null },
{ "ReportButtonCutOff", null }
}
},
//public static IReadOnlyDictionary<InGameMenuVersion, Dictionary<string, string?>> IGMenuVersions => new Dictionary<InGameMenuVersion, Dictionary<string, string?>>
//{
// {
// InGameMenuVersion.Default,
// new Dictionary<string, string?>
// {
// { "V2Rollout", null },
// { "EnableV4", null },
// { "EnableV4Chrome", null },
// { "ABTest", null },
// { "ReportButtonCutOff", null }
// }
// },
{
InGameMenuVersion.V1,
new Dictionary<string, string?>
{
{ "V2Rollout", "0" },
{ "EnableV4", "False" },
{ "EnableV4Chrome", "False" },
{ "ABTest", "False" },
{ "ReportButtonCutOff", "False" }
}
},
// {
// InGameMenuVersion.V1,
// new Dictionary<string, string?>
// {
// { "V2Rollout", "0" },
// { "EnableV4", "False" },
// { "EnableV4Chrome", "False" },
// { "ABTest", "False" },
// { "ReportButtonCutOff", "False" }
// }
// },
{
InGameMenuVersion.V2,
new Dictionary<string, string?>
{
{ "V2Rollout", "100" },
{ "EnableV4", "False" },
{ "EnableV4Chrome", "False" },
{ "ABTest", "False" },
{ "ReportButtonCutOff", null }
}
},
// {
// InGameMenuVersion.V2,
// new Dictionary<string, string?>
// {
// { "V2Rollout", "100" },
// { "EnableV4", "False" },
// { "EnableV4Chrome", "False" },
// { "ABTest", "False" },
// { "ReportButtonCutOff", null }
// }
// },
{
InGameMenuVersion.V4,
new Dictionary<string, string?>
{
{ "V2Rollout", "0" },
{ "EnableV4", "True" },
{ "EnableV4Chrome", "False" },
{ "ABTest", "False" },
{ "ReportButtonCutOff", null }
}
},
// {
// InGameMenuVersion.V4,
// new Dictionary<string, string?>
// {
// { "V2Rollout", "0" },
// { "EnableV4", "True" },
// { "EnableV4Chrome", "False" },
// { "ABTest", "False" },
// { "ReportButtonCutOff", null }
// }
// },
{
InGameMenuVersion.V4Chrome,
new Dictionary<string, string?>
{
{ "V2Rollout", "0" },
{ "EnableV4", "True" },
{ "EnableV4Chrome", "True" },
{ "ABTest", "False" },
{ "ReportButtonCutOff", null }
}
}
};
// {
// InGameMenuVersion.V4Chrome,
// new Dictionary<string, string?>
// {
// { "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

View File

@ -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();
}

View File

@ -131,7 +131,7 @@
<ui:TextBox Width="200" Padding="10,5,10,5" Text="{Binding FontSize, Mode=TwoWay}" PreviewTextInput="ValidateInt32" />
</controls:OptionControl>
<controls:OptionControl
<!--<controls:OptionControl
Header="{x:Static resources:Strings.Menu_FastFlags_Presets_EscapeMenuVersion_Title}"
HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/A-guide-to-FastFlags#escape-menu-version">
<ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding IGMenuVersions.Keys, Mode=OneTime}" Text="{Binding SelectedIGMenuVersion, Mode=TwoWay}">
@ -141,7 +141,7 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:OptionControl>
</controls:OptionControl>-->
<controls:OptionControl
Margin="0,24,0,0"