From 494f41c440e636b7d3bd485a54f57429f6f8b3ee Mon Sep 17 00:00:00 2001 From: pointfeev Date: Thu, 18 Aug 2022 10:27:47 -0400 Subject: [PATCH] more minor string changes & arma 3 unexception --- CreamInstaller/CreamInstaller.csproj | 2 +- CreamInstaller/Forms/InstallForm.cs | 12 ++++++------ CreamInstaller/Forms/SelectForm.cs | 6 +++--- CreamInstaller/Paradox/ParadoxLauncher.cs | 4 ++-- CreamInstaller/Program.cs | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CreamInstaller/CreamInstaller.csproj b/CreamInstaller/CreamInstaller.csproj index cc87462..f2c9922 100644 --- a/CreamInstaller/CreamInstaller.csproj +++ b/CreamInstaller/CreamInstaller.csproj @@ -5,7 +5,7 @@ True Resources\ini.ico true - 3.6.1.2 + 3.6.1.3 Resources\ini.ico LICENSE 2021, pointfeev (https://github.com/pointfeev) diff --git a/CreamInstaller/Forms/InstallForm.cs b/CreamInstaller/Forms/InstallForm.cs index 9719591..96398d2 100644 --- a/CreamInstaller/Forms/InstallForm.cs +++ b/CreamInstaller/Forms/InstallForm.cs @@ -67,8 +67,8 @@ internal partial class InstallForm : CustomForm } foreach (string directory in selection.DllDirectories) { - if (selection.Platform is Platform.Steam && selection.SelectedDlc.Any(d => d.Value.type is DlcType.Steam or DlcType.SteamHidden) - || selection.ExtraSelectedDlc.Any(item => item.dlc.Any(dlc => dlc.Value.type is DlcType.Steam or DlcType.SteamHidden))) + if (selection.Platform is Platform.Steam || selection.SelectedDlc.Any(d => d.Value.type is DlcType.Steam or DlcType.SteamHidden) + || selection.Platform is Platform.Paradox || selection.ExtraSelectedDlc.Any(item => item.dlc.Any(dlc => dlc.Value.type is DlcType.Steam or DlcType.SteamHidden))) { directory.GetSmokeApiComponents(out string api32, out string api32_o, out string api64, out string api64_o, out string config, out string cache); if (File.Exists(api32) || File.Exists(api32_o) || File.Exists(api64) || File.Exists(api64_o) || File.Exists(config) || File.Exists(cache)) @@ -81,8 +81,8 @@ internal partial class InstallForm : CustomForm await SmokeAPI.Install(directory, selection, this); } } - if (selection.Platform is Platform.Epic && selection.SelectedDlc.Any(d => d.Value.type is DlcType.EpicCatalogItem or DlcType.EpicEntitlement) - || selection.ExtraSelectedDlc.Any(item => item.dlc.Any(dlc => dlc.Value.type is DlcType.EpicCatalogItem or DlcType.EpicEntitlement))) + if (selection.Platform is Platform.Epic || selection.SelectedDlc.Any(d => d.Value.type is DlcType.EpicCatalogItem or DlcType.EpicEntitlement) + || selection.Platform is Platform.Paradox || selection.ExtraSelectedDlc.Any(item => item.dlc.Any(dlc => dlc.Value.type is DlcType.EpicCatalogItem or DlcType.EpicEntitlement))) { directory.GetScreamApiComponents(out string api32, out string api32_o, out string api64, out string api64_o, out string config); if (File.Exists(api32) || File.Exists(api32_o) || File.Exists(api64) || File.Exists(api64_o) || File.Exists(config)) @@ -166,11 +166,11 @@ internal partial class InstallForm : CustomForm try { await Operate(); - UpdateUser($"SmokeAPI/ScreamAPI successfully {(Uninstalling ? "uninstalled" : "installed and generated")} for " + ProgramCount + " program(s).", InstallationLog.Success); + UpdateUser($"DLC unlocker(s) successfully {(Uninstalling ? "uninstalled" : "installed and generated")} for " + ProgramCount + " program(s).", InstallationLog.Success); } catch (Exception exception) { - UpdateUser($"SmokeAPI/ScreamAPI {(Uninstalling ? "uninstallation" : "installation and/or generation")} failed: " + exception, InstallationLog.Error); + UpdateUser($"DLC unlocker {(Uninstalling ? "uninstallation" : "installation and/or generation")} failed: " + exception, InstallationLog.Error); retryButton.Enabled = true; } userProgressBar.Value = userProgressBar.Maximum; diff --git a/CreamInstaller/Forms/SelectForm.cs b/CreamInstaller/Forms/SelectForm.cs index c257417..0796188 100644 --- a/CreamInstaller/Forms/SelectForm.cs +++ b/CreamInstaller/Forms/SelectForm.cs @@ -869,9 +869,9 @@ internal partial class SelectForm : CustomForm _ = form.Show(SystemIcons.Information, "Blocks the program from caching and displaying games protected by DLL checks," + "\nanti-cheats, or that are confirmed not to be working with SmokeAPI or ScreamAPI." + - "\n\nBlocked games:" + blockedGames + - "\n\nBlocked game sub-directories:" + blockedDirectories + - "\n\nBlocked game sub-directory exceptions (not blocked):" + blockedDirectoryExceptions, + "\n\nBlocked games: " + (string.IsNullOrWhiteSpace(blockedGames.ToString()) ? "(none)" : blockedGames) + + "\n\nBlocked game sub-directories: " + (string.IsNullOrWhiteSpace(blockedDirectories.ToString()) ? "(none)" : blockedDirectories) + + "\n\nBlocked game sub-directory exceptions: " + (string.IsNullOrWhiteSpace(blockedDirectoryExceptions.ToString()) ? "(none)" : blockedDirectoryExceptions), "OK", customFormText: "Block Protected Games"); } diff --git a/CreamInstaller/Paradox/ParadoxLauncher.cs b/CreamInstaller/Paradox/ParadoxLauncher.cs index 544dbdf..6fa8162 100644 --- a/CreamInstaller/Paradox/ParadoxLauncher.cs +++ b/CreamInstaller/Paradox/ParadoxLauncher.cs @@ -59,8 +59,8 @@ internal static class ParadoxLauncher { using DialogForm dialogForm = new(form); return dialogForm.Show(SystemIcons.Warning, - $"WARNING: There are no installed games with DLC that can be added to the Paradox Launcher!" + - "\n\nInstalling SmokeAPI/ScreamAPI for the Paradox Launcher is pointless, since no DLC will be added to the configuration!", + $"WARNING: There are no scanned games with DLC that can be added to the Paradox Launcher!" + + "\n\nInstalling DLC unlockers for the Paradox Launcher alone can cause existing configurations to be deleted!", "Ignore", "Cancel", customFormText: "Paradox Launcher") != DialogResult.OK; } } diff --git a/CreamInstaller/Program.cs b/CreamInstaller/Program.cs index 1cda271..84f36a6 100644 --- a/CreamInstaller/Program.cs +++ b/CreamInstaller/Program.cs @@ -27,9 +27,9 @@ internal static class Program internal static readonly string CurrentProcessFilePath = CurrentProcess.MainModule.FileName; internal static bool BlockProtectedGames = true; - internal static readonly string[] ProtectedGames = { "PAYDAY 2", "Call to Arms" }; // non-functioning SmokeAPI/ScreamAPI or DLL detections + internal static readonly string[] ProtectedGames = { "PAYDAY 2", "Call to Arms" }; // non-functioning DLC unlockers or DLL detections internal static readonly string[] ProtectedGameDirectories = { @"\EasyAntiCheat", @"\BattlEye" }; // DLL detections - internal static readonly string[] ProtectedGameDirectoryExceptions = { "Arma 3" }; // Arma 3's BattlEye doesn't detect DLL changes? + internal static readonly string[] ProtectedGameDirectoryExceptions = Array.Empty(); internal static bool IsGameBlocked(string name, string directory = null) {