From ce4d96bd4a579d1041fb55837135355dd7b64437 Mon Sep 17 00:00:00 2001 From: 4sval Date: Tue, 16 May 2023 23:40:23 +0200 Subject: [PATCH] dead game nobody cares --- CUE4Parse | 2 +- FModel/Creator/Typefaces.cs | 2 +- FModel/Enums.cs | 4 +++- FModel/Helper.cs | 5 ----- FModel/Settings/UserSettings.cs | 14 +++++++------- FModel/ViewModels/CUE4ParseViewModel.cs | 6 +++--- .../Resources/Converters/StringToGameConverter.cs | 2 +- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index 215f3dbe..a245c88c 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 215f3dbe910992d65011676e47e395dd9bd189df +Subproject commit a245c88cc360237848c6c1f1b71d514853b57dd6 diff --git a/FModel/Creator/Typefaces.cs b/FModel/Creator/Typefaces.cs index 4e11a74a..38a9a90f 100644 --- a/FModel/Creator/Typefaces.cs +++ b/FModel/Creator/Typefaces.cs @@ -201,7 +201,7 @@ public class Typefaces Description = OnTheFly(_SPELLBREAK_BASE_PATH + _MONTSERRAT_SEMIBOLD + _EXT); break; } - case FGame.PandaGame: + case FGame.MultiVersus: { DisplayName = OnTheFly(_PANDAGAME_BASE_PATH + language switch { diff --git a/FModel/Enums.cs b/FModel/Enums.cs index 1fa255bd..eaa7cd24 100644 --- a/FModel/Enums.cs +++ b/FModel/Enums.cs @@ -92,8 +92,10 @@ public enum FGame Gameface, [Description("Sea of Thieves")] Athena, - [Description("Your Beloved ™ Panda")] + [Description("DEPRECATED")] PandaGame, + [Description("MultiVersus")] + MultiVersus, [Description("Tower of Fantasy")] Hotta, [Description("eFootball 2023")] diff --git a/FModel/Helper.cs b/FModel/Helper.cs index a44a3d09..67cd659f 100644 --- a/FModel/Helper.cs +++ b/FModel/Helper.cs @@ -16,11 +16,6 @@ public static class Helper internal readonly ulong UlongValue; } - public static bool IAmThePanda(string key) - => key.Length == 11 && - key.StartsWith("mu", StringComparison.OrdinalIgnoreCase) && - key.EndsWith("sus", StringComparison.OrdinalIgnoreCase); - public static string FixKey(string key) { if (string.IsNullOrEmpty(key)) diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs index 86a6c533..bfe43db7 100644 --- a/FModel/Settings/UserSettings.cs +++ b/FModel/Settings/UserSettings.cs @@ -271,7 +271,7 @@ namespace FModel.Settings {FGame.PortalWars, Constants._NO_PRESET_TRIGGER}, {FGame.Gameface, Constants._NO_PRESET_TRIGGER}, {FGame.Athena, Constants._NO_PRESET_TRIGGER}, - {FGame.PandaGame, Constants._NO_PRESET_TRIGGER}, + {FGame.MultiVersus, Constants._NO_PRESET_TRIGGER}, {FGame.Hotta, Constants._NO_PRESET_TRIGGER}, {FGame.eFootball, Constants._NO_PRESET_TRIGGER} }; @@ -302,7 +302,7 @@ namespace FModel.Settings {FGame.PortalWars, EGame.GAME_UE4_27}, {FGame.Gameface, EGame.GAME_GTATheTrilogyDefinitiveEdition}, {FGame.Athena, EGame.GAME_SeaOfThieves}, - {FGame.PandaGame, EGame.GAME_UE4_26}, + {FGame.MultiVersus, EGame.GAME_UE4_26}, {FGame.Hotta, EGame.GAME_TowerOfFantasy}, {FGame.eFootball, EGame.GAME_UE4_26} }; @@ -333,7 +333,7 @@ namespace FModel.Settings {FGame.PortalWars, null}, {FGame.Gameface, null}, {FGame.Athena, null}, - {FGame.PandaGame, null}, + {FGame.MultiVersus, null}, {FGame.Hotta, null}, {FGame.eFootball, null} }; @@ -364,7 +364,7 @@ namespace FModel.Settings {FGame.PortalWars, null}, {FGame.Gameface, null}, {FGame.Athena, null}, - {FGame.PandaGame, null}, + {FGame.MultiVersus, null}, {FGame.Hotta, null}, {FGame.eFootball, null} }; @@ -390,7 +390,7 @@ namespace FModel.Settings {FGame.PortalWars, null}, {FGame.Gameface, null}, {FGame.Athena, null}, - {FGame.PandaGame, null}, + {FGame.MultiVersus, null}, {FGame.Hotta, null}, {FGame.eFootball, null} }; @@ -433,7 +433,7 @@ namespace FModel.Settings {FGame.PortalWars, new FEndpoint[]{new (), new ()}}, {FGame.Gameface, new FEndpoint[]{new (), new ()}}, {FGame.Athena, new FEndpoint[]{new (), new ()}}, - {FGame.PandaGame, new FEndpoint[]{new (), new ()}}, + {FGame.MultiVersus, new FEndpoint[]{new (), new ()}}, {FGame.Hotta, new FEndpoint[]{new (), new ()}}, {FGame.eFootball, new FEndpoint[]{new (), new ()}} }; @@ -511,7 +511,7 @@ namespace FModel.Settings {FGame.PortalWars, new List()}, {FGame.Gameface, new List()}, {FGame.Athena, new List()}, - {FGame.PandaGame, new List()}, + {FGame.MultiVersus, new List()}, {FGame.Hotta, new List()}, {FGame.eFootball, new List()} }; diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 6341b786..6c943d98 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -150,7 +150,7 @@ public class CUE4ParseViewModel : ViewModel { var parent = gameDirectory.SubstringBeforeLast("\\Content").SubstringAfterLast("\\"); if (gameDirectory.Contains("eFootball")) parent = gameDirectory.SubstringBeforeLast("\\pak").SubstringAfterLast("\\"); - Game = Helper.IAmThePanda(parent) ? FGame.PandaGame : parent.ToEnum(FGame.Unknown); + Game = parent.ToEnum(FGame.Unknown); var versions = new VersionContainer(UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform, customVersions: UserSettings.Default.OverridedCustomVersions[Game], optionOverrides: UserSettings.Default.OverridedOptions[Game], @@ -335,7 +335,7 @@ public class CUE4ParseViewModel : ViewModel file.FileCount = vfs.FileCount; } - Game = Helper.IAmThePanda(Provider.GameName) ? FGame.PandaGame : Provider.GameName.ToEnum(Game); + Game = Provider.GameName.ToEnum(Game); } public void ClearProvider() @@ -345,7 +345,7 @@ public class CUE4ParseViewModel : ViewModel AssetsFolder.Folders.Clear(); SearchVm.SearchResults.Clear(); Helper.CloseWindow("Search View"); - Provider.UnloadAllVfs(); + Provider.UnloadNonStreamedVfs(); GC.Collect(); } diff --git a/FModel/Views/Resources/Converters/StringToGameConverter.cs b/FModel/Views/Resources/Converters/StringToGameConverter.cs index 3bd91b69..21fbc0c5 100644 --- a/FModel/Views/Resources/Converters/StringToGameConverter.cs +++ b/FModel/Views/Resources/Converters/StringToGameConverter.cs @@ -26,7 +26,7 @@ public class StringToGameConverter : IValueConverter "MinecraftDungeons" => FGame.Dungeons, "shoebill" => FGame.SwGame, "a99769d95d8f400baad1f67ab5dfe508" => FGame.Platform, - "711c5e95dc094ca58e5f16bd48e751d6" => FGame.PandaGame, + "711c5e95dc094ca58e5f16bd48e751d6" => FGame.MultiVersus, "9361c8c6d2f34b42b5f2f61093eedf48" => FGame.TslGame, 381210 => FGame.DeadByDaylight, 578080 => FGame.TslGame,