diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index f1ce5f15..5bd23b2e 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -29,6 +29,7 @@ + diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 59e77142..f9f263f5 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -999,6 +999,8 @@ private async Task ApplyModifications() if (!Directory.Exists(modFolder)) Directory.CreateDirectory(modFolder); + bool appDisabled = App.Settings.Prop.UseDisableAppPatch && !_launchCommandLine.Contains("--deeplink"); + // cursors await CheckModPreset(App.Settings.Prop.CursorType == CursorType.From2006, @"content\textures\Cursors\KeyboardMouse\ArrowCursor.png", "Cursor.From2006.ArrowCursor.png"); await CheckModPreset(App.Settings.Prop.CursorType == CursorType.From2006, @"content\textures\Cursors\KeyboardMouse\ArrowFarCursor.png", "Cursor.From2006.ArrowFarCursor.png"); @@ -1014,8 +1016,9 @@ private async Task ApplyModifications() await CheckModPreset(App.Settings.Prop.UseOldCharacterSounds, @"content\sounds\impact_water.mp3", "Empty.mp3"); await CheckModPreset(App.Settings.Prop.UseOldDeathSound, @"content\sounds\ouch.ogg", "OldDeath.ogg"); - // misc - await CheckModPreset(App.Settings.Prop.UseDisableAppPatch && !_launchCommandLine.Contains("--deeplink"), @"ExtraContent\places\Mobile.rbxl", ""); + // Mobile.rbxl + await CheckModPreset(appDisabled, @"ExtraContent\places\Mobile.rbxl", ""); + await CheckModPreset(App.Settings.Prop.UseOldAvatarBackground && !appDisabled, @"ExtraContent\places\Mobile.rbxl", "OldAvatarBackground.rbxl"); // emoji presets are downloaded remotely from github due to how large they are string contentFonts = Path.Combine(Directories.Modifications, "content\\fonts"); diff --git a/Bloxstrap/Models/Settings.cs b/Bloxstrap/Models/Settings.cs index 104509f3..95fd18f4 100644 --- a/Bloxstrap/Models/Settings.cs +++ b/Bloxstrap/Models/Settings.cs @@ -31,6 +31,7 @@ public class Settings public bool UseOldDeathSound { get; set; } = true; public bool UseOldCharacterSounds { get; set; } = false; public bool UseDisableAppPatch { get; set; } = false; + public bool UseOldAvatarBackground { get; set; } = false; public CursorType CursorType { get; set; } = CursorType.Default; public EmojiType EmojiType { get; set; } = EmojiType.Default; public bool DisableFullscreenOptimizations { get; set; } = false; diff --git a/Bloxstrap/Resources/Mods/OldAvatarBackground.rbxl b/Bloxstrap/Resources/Mods/OldAvatarBackground.rbxl new file mode 100644 index 00000000..578e822d Binary files /dev/null and b/Bloxstrap/Resources/Mods/OldAvatarBackground.rbxl differ diff --git a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml index 8972f0ff..41b0e5ab 100644 --- a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml +++ b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml @@ -61,7 +61,7 @@ - + @@ -71,17 +71,27 @@ - + - + - + + + + + + + + + + + @@ -91,7 +101,7 @@ - + @@ -101,7 +111,7 @@ - + diff --git a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs index b02209fe..7859f4af 100644 --- a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs @@ -71,6 +71,12 @@ public string SelectedCursorType set => App.Settings.Prop.CursorType = CursorTypes[value]; } + public bool OldAvatarBackground + { + get => App.Settings.Prop.UseOldAvatarBackground; + set => App.Settings.Prop.UseOldAvatarBackground = value; + } + public bool DisableAppPatchEnabled { get => App.Settings.Prop.UseDisableAppPatch;