Compare commits

..

No commits in common. "e93f0d62a62ae71b4d338933431d4915ace71fc9" and "7ea9b424521edf49eff09540dcc9ba37959b690c" have entirely different histories.

3 changed files with 8 additions and 8 deletions

View File

@ -16,7 +16,7 @@ public class EftInstalledPreCheck : PreCheckBase
{ {
if (_internalData.OriginalGamePath is null || !Directory.Exists(_internalData.OriginalGamePath) || !File.Exists(Path.Join(_internalData.OriginalGamePath, "Escapefromtarkov.exe"))) if (_internalData.OriginalGamePath is null || !Directory.Exists(_internalData.OriginalGamePath) || !File.Exists(Path.Join(_internalData.OriginalGamePath, "Escapefromtarkov.exe")))
{ {
return PreCheckResult.FromError("Your EFT installation could not be found, try running the Battlestate Games Launcher and ensure EFT is installed on your computer", "Retry", RequestReevaluation); return PreCheckResult.FromError("EFT installation could not be found", "Retry", RequestReevaluation);
} }
return PreCheckResult.FromSuccess("EFT install folder found"); return PreCheckResult.FromSuccess("EFT install folder found");

View File

@ -17,7 +17,7 @@ public class EftLauncherPreCheck : PreCheckBase
return eftLauncherProcs.Length == 0 return eftLauncherProcs.Length == 0
? PreCheckResult.FromSuccess("Eft launcher is closed") ? PreCheckResult.FromSuccess("Eft launcher is closed")
: PreCheckResult.FromError("Your Battlestate Games Launcher is open. Please close it to continue installing SPT", : PreCheckResult.FromError("Your BSG launcher is open. Please close it to continue installing SPT",
"Kill EFT Launcher Processes", "Kill EFT Launcher Processes",
() => () =>
{ {

View File

@ -30,7 +30,7 @@ public class ReleaseCheckTask : InstallerTaskBase
if (SPTReleaseInfoFile == null) if (SPTReleaseInfoFile == null)
{ {
return Result.FromError("Failed to download release metadata, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button"); return Result.FromError("Failed to download release metadata");
} }
var SPTReleaseInfo = var SPTReleaseInfo =
@ -44,7 +44,7 @@ public class ReleaseCheckTask : InstallerTaskBase
if (SPTPatchMirrorsFile == null) if (SPTPatchMirrorsFile == null)
{ {
return Result.FromError("Failed to download patch mirror data, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button"); return Result.FromError("Failed to download patch mirror data");
} }
var patchMirrorInfo = var patchMirrorInfo =
@ -52,7 +52,7 @@ public class ReleaseCheckTask : InstallerTaskBase
if (SPTReleaseInfo == null || patchMirrorInfo == null) if (SPTReleaseInfo == null || patchMirrorInfo == null)
{ {
return Result.FromError("An error occurred while deserializing SPT or patch data, try clicking the 'Whats this' button below followed by the 'Clear Metadata cache' button"); return Result.FromError("An error occurred while deserializing SPT or patch data");
} }
_data.ReleaseInfo = SPTReleaseInfo; _data.ReleaseInfo = SPTReleaseInfo;
@ -66,7 +66,7 @@ public class ReleaseCheckTask : InstallerTaskBase
if (intGameVersion < intSPTVersion) if (intGameVersion < intSPTVersion)
{ {
return Result.FromError("Your live EFT is out of date. Please update it using the Battlestate Games Launcher and try runing the SPT Installer again"); return Result.FromError("Your live EFT is out of date. Please update it using the BSG Launcher then run the SPT Installer again");
} }
if (intGameVersion == intSPTVersion) if (intGameVersion == intSPTVersion)
@ -83,12 +83,12 @@ public class ReleaseCheckTask : InstallerTaskBase
"Could not find a downgrade patcher for the version of EFT you have installed." + "Could not find a downgrade patcher for the version of EFT you have installed." +
"\nThis can happen due to one of the following reasons:" + "\nThis can happen due to one of the following reasons:" +
"\n* Live EFT just updated. The SPT team will create a new patcher within 24 hours, hold tight!" + "\n* Live EFT just updated. The SPT team will create a new patcher within 24 hours, hold tight!" +
"\n* Live EFT just updated. You have not installed it on your computer using your Battlestate Games launcher"); "\n* Live EFT just updated. You have not installed it on your computer using the BSG launcher");
} }
if (liveClientIsOutdated) if (liveClientIsOutdated)
{ {
return Result.FromError("Your live EFT is out of date. Please update it using your Battlestate Games Launcher then run the SPT Installer again"); return Result.FromError("Your live EFT is out of date. Please update it using the BSG Launcher then run the SPT Installer again");
} }
_data.PatchNeeded = patchNeedCheck; _data.PatchNeeded = patchNeedCheck;