diff --git a/OpenKh.Patcher/PatcherProcessor.cs b/OpenKh.Patcher/PatcherProcessor.cs index 14fb058e9..2d4cad917 100644 --- a/OpenKh.Patcher/PatcherProcessor.cs +++ b/OpenKh.Patcher/PatcherProcessor.cs @@ -221,22 +221,22 @@ public void Patch(string originalAssets, string outputDir, Metadata metadata, st { if (Language != "jp") { - if (!context.GetOriginalAssetPath(assetFile.Name).Contains(".a.fm") && !context.GetOriginalAssetPath(assetFile.Name).Contains("/jp/")) + if (!context.GetOriginalAssetPath(name).Contains(".a.fm") && !context.GetOriginalAssetPath(name).Contains("/jp/")) { - Log.Warn("File not found: " + context.GetOriginalAssetPath(assetFile.Name) + " Skipping. \nPlease check your game extraction."); + Log.Warn("File not found: " + context.GetOriginalAssetPath(name) + " Skipping. \nPlease check your game extraction."); } } else { - if (!globalFilePaths.Any(x=>context.GetOriginalAssetPath(assetFile.Name).Contains(x))) + if (!globalFilePaths.Any(x=>context.GetOriginalAssetPath(name).Contains(x))) { - Log.Warn("File not found: " + context.GetOriginalAssetPath(assetFile.Name) + " Skipping. \nPlease check your game extraction."); + Log.Warn("File not found: " + context.GetOriginalAssetPath(name) + " Skipping. \nPlease check your game extraction."); } } } else { - Log.Warn("File not found: " + context.GetOriginalAssetPath(assetFile.Name) + " Skipping. \nPlease check your game extraction."); + Log.Warn("File not found: " + context.GetOriginalAssetPath(name) + " Skipping. \nPlease check your game extraction."); } } else if (assetFile.Source[0].Type == "internal") @@ -245,22 +245,22 @@ public void Patch(string originalAssets, string outputDir, Metadata metadata, st { if (Language != "jp") { - if (!context.GetOriginalAssetPath(assetFile.Name).Contains(".a.fm") && !context.GetOriginalAssetPath(assetFile.Name).Contains("/jp/")) + if (!context.GetOriginalAssetPath(name).Contains(".a.fm") && !context.GetOriginalAssetPath(name).Contains("/jp/")) { - Log.Warn("File not found: " + context.GetOriginalAssetPath(assetFile.Name) + " Skipping. \nPlease check your game extraction."); + Log.Warn("File not found: " + context.GetOriginalAssetPath(name) + " Skipping. \nPlease check your game extraction."); } } else { - if (!globalFilePaths.Any(x => context.GetOriginalAssetPath(assetFile.Name).Contains(x))) + if (!globalFilePaths.Any(x => context.GetOriginalAssetPath(name).Contains(x))) { - Log.Warn("File not found: " + context.GetOriginalAssetPath(assetFile.Name) + " Skipping. \nPlease check your game extraction."); + Log.Warn("File not found: " + context.GetOriginalAssetPath(name) + " Skipping. \nPlease check your game extraction."); } } } else { - Log.Warn("File not found: " + context.GetOriginalAssetPath(assetFile.Name) + " Skipping. \nPlease check your game extraction."); + Log.Warn("File not found: " + context.GetOriginalAssetPath(name) + " Skipping. \nPlease check your game extraction."); } } else diff --git a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs index a19a763de..849604c1c 100644 --- a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs +++ b/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs @@ -506,12 +506,12 @@ public string GameDataLocation } public bool IsNotExtracting { get; private set; } - public bool IsGameDataFound => (IsNotExtracting && GameService.FolderContainsUniqueFile(GameId, Path.Combine(GameDataLocation, "kh2")) || + public bool IsGameDataFound => IsNotExtracting && (GameService.FolderContainsUniqueFile(GameId, Path.Combine(GameDataLocation, "kh2")) || (GameEdition == PC && (GameService.FolderContainsUniqueFile("kh2", Path.Combine(GameDataLocation, "kh2")) || GameService.FolderContainsUniqueFile("kh1", Path.Combine(GameDataLocation, "kh1")) || Directory.Exists(Path.Combine(GameDataLocation, "bbs", "message")) || - Directory.Exists(Path.Combine(GameDataLocation, "Recom", "SYS"))))|| - Directory.Exists(Path.Combine(GameDataLocation, "kh3d","setdata"))|| + Directory.Exists(Path.Combine(GameDataLocation, "Recom", "SYS"))|| + Directory.Exists(Path.Combine(GameDataLocation, "kh3d","setdata"))))|| OverrideGameDataFound); public Visibility GameDataNotFoundVisibility => !IsGameDataFound ? Visibility.Visible : Visibility.Collapsed; public Visibility GameDataFoundVisibility => IsGameDataFound ? Visibility.Visible : Visibility.Collapsed; diff --git a/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml b/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml index 9555d21cc..b50bcd3f9 100644 --- a/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml +++ b/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml @@ -28,7 +28,6 @@ CurrentPage="{Binding ElementName=PageGameEdition}" PageChanged="Wizard_PageChanged" Finish="Wizard_Finish" Background="{Binding ColorTheme.BackgroundColor}"> - - - Supported games: - - Kingdom Hearts II (JP, US, EU, Final Mix, PC) - - Please select the location of the PlayStation 2 ISO Image. - - - - - - - - - + + + Supported games: + + Kingdom Hearts II (JP, US, EU, Final Mix, PC) + + Please select the location of the PlayStation 2 ISO Image. + + + + + + + + + A copy of was successfully recognized! - - + + It was not possible to recognize the game of the ISO you provided. Be sure that the game is within the list of supported games. - - + + + - - Region - - Use game default region - Japanese (text JP, menu JP, voice JP) - English (text US, menu US, voice US) - English (text US, menu UK, voice US) - Italian (text IT, menu IT, voice IT) - Spanish (text SP, menu SP, voice SP) - German (text GR, menu GR, voice GR) - French (text FR, menu FR, voice FR) - Final Mix (text JP, menu FM, voice US) - - - + + + Region + + Use game default region + Japanese (text JP, menu JP, voice JP) + English (text US, menu US, voice US) + English (text US, menu UK, voice US) + Italian (text IT, menu IT, voice IT) + Spanish (text SP, menu SP, voice SP) + German (text GR, menu GR, voice GR) + French (text FR, menu FR, voice FR) + Final Mix (text JP, menu FM, voice US) + + Forces to load the internal configuration to a specific region. This allows to effectively load files from other languages, swap the O and X buttons and use the font table in a different way. Do not worry if some region files are not found as the Mods Manager has a fallback mechanic. - - + + + - - Game Collection - - KINGDOM HEARTS HD 1.5+2.5 ReMIX - KINGDOM HEARTS HD 2.8 Final Chapter Prologue - - - Panacea allows the PC version of Kingdom Hearts to load the mods you have installed, without - modifying the game files. - The file is named 'DBGHELP.dll' for Windows and 'version.dll' for Linux and it can be found in your game's install folder. - Panacea will run every time you start the game and attempt to load built mods. To uninstall Panacea, click Remove Panacea button. - - - - It seems you do not have Panacea installed or you are running a different version than the one - compatible with this version of Mods Manager. We need your permission to install it into the game's folder. - If you choose not to install, you may need to use one of the Build and Patch options to apply mods - to your game. - -