diff --git a/FModel/App.config b/FModel/App.config index 99863990..a329cfed 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -94,6 +94,94 @@ False + + { + "[BR] Cosmetics": { + "Path": "/FortniteGame/Content/Athena/Items/Cosmetics/", + "isChecked": "True" + }, + "[BR] Cosmetics Variants": { + "Path": "/FortniteGame/Content/Athena/Items/CosmeticVariantTokens/", + "isChecked": "True" + }, + "[BR] Banners": { + "Path": "/FortniteGame/Content/Athena/Items/BannerToken/", + "isChecked": "True" + }, + "[BR] Challenges": { + "Path": "/FortniteGame/Content/Athena/Items/ChallengeBundles/", + "isChecked": "True" + }, + "[BR] Consumables": { + "Path": "/FortniteGame/Content/Athena/Items/Consumables/", + "isChecked": "False" + }, + "[BR] Traps": { + "Path": "/FortniteGame/Content/Athena/Items/Traps/", + "isChecked": "False" + }, + "[BR] Weapons": { + "Path": "/FortniteGame/Content/Athena/Items/Weapons/", + "isChecked": "True" + }, + "[BR] 2D Assets": { + "Path": "/FortniteGame/Content/2dAssets/", + "isChecked": "True" + }, + "[BR] Featured Images": { + "Path": "/FortniteGame/Content/UI/Foundation/Textures/BattleRoyale/FeaturedItems/", + "isChecked": "False" + }, + "[STW] Heroes": { + "Path": "/FortniteGame/Content/Heroes/", + "isChecked": "False" + }, + "[STW] Defenders": { + "Path": "/FortniteGame/Content/Items/Defenders/", + "isChecked": "False" + }, + "[STW] Schematics": { + "Path": "/FortniteGame/Content/Items/Schematics/", + "isChecked": "False" + }, + "[STW] Traps": { + "Path": "/FortniteGame/Content/Items/Traps/", + "isChecked": "False" + }, + "[STW] Weapons": { + "Path": "/FortniteGame/Content/Items/Weapons/", + "isChecked": "False" + }, + "[STW] Ingredients": { + "Path": "/FortniteGame/Content/Items/Ingredients/", + "isChecked": "False" + }, + "[STW] Persistent Resources": { + "Path": "/FortniteGame/Content/Items/PersistentResources/", + "isChecked": "False" + }, + "[STW] CardPacks": { + "Path": "/FortniteGame/Content/Items/CardPacks/", + "isChecked": "False" + }, + "Tokens": { + "Path": "/FortniteGame/Content/Items/Tokens/", + "isChecked": "False" + }, + "Icons": { + "Path": "/FortniteGame/Content/UI/Foundation/Textures/Icons/", + "isChecked": "False" + }, + "Additional Banners": { + "Path": "/FortniteGame/Content/UI/Foundation/Textures/Banner/", + "isChecked": "False" + }, + "Additional Loading Screens": { + "Path": "/FortniteGame/Content/UI/Foundation/Textures/LoadingScreens/", + "isChecked": "False" + } +} + diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index fd14f544..cf487373 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -152,6 +152,9 @@ FModel_Settings.xaml + + FModel_UpdateMode.xaml + @@ -417,6 +420,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/FModel/FModel_Main.xaml b/FModel/FModel_Main.xaml index aa7acee3..18bb3a7b 100644 --- a/FModel/FModel_Main.xaml +++ b/FModel/FModel_Main.xaml @@ -44,7 +44,7 @@ - + diff --git a/FModel/FModel_Main.xaml.cs b/FModel/FModel_Main.xaml.cs index dccd949d..8ad07647 100644 --- a/FModel/FModel_Main.xaml.cs +++ b/FModel/FModel_Main.xaml.cs @@ -155,7 +155,8 @@ namespace FModel //LOAD AND EXTRACT DIFF if (MI_DifferenceMode.IsChecked && MI_UpdateMode.IsChecked) { - //not done yet + await PAKsLoader.LoadDifference(); + await AssetsLoader.ExtractUpdateMode(); } } private void MI_ReloadAESs_Click(object sender, RoutedEventArgs e) @@ -250,10 +251,21 @@ namespace FModel { MI_LoadAllPAKs.Header = "Load And Extract Difference"; MI_UpdateMode.IsEnabled = true; + MI_Auto_Save_Images.IsChecked = true; //auto save images + + if (MI_DifferenceMode.IsChecked && MI_UpdateMode.IsChecked) + { + if (!FormsUtility.IsWindowOpen("Update Mode")) + { + new FModel_UpdateMode().Show(); + } + else { FormsUtility.GetOpenedWindow("Update Mode").Focus(); } + } } if (!MI_UpdateMode.IsChecked) { MI_LoadAllPAKs.Header = "Load Difference"; + MI_Auto_Save_Images.IsChecked = false; } //BOTH diff --git a/FModel/Forms/FModel_SearchFiles.xaml b/FModel/Forms/FModel_SearchFiles.xaml index 4794843c..cf2818f2 100644 --- a/FModel/Forms/FModel_SearchFiles.xaml +++ b/FModel/Forms/FModel_SearchFiles.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" Title="Search" Height="700" - Width="1000" + Width="1100" Style="{StaticResource {x:Type Window}}" WindowStartupLocation="CenterScreen" Icon="/FModel;component/Logo.ico" @@ -38,12 +38,13 @@ - + -