diff --git a/.gitignore b/.gitignore index 4929b46..caff63a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,8 @@ [Tt]humbs.db _ReSharper.* *.resharper -Ankh.NoLoad \ No newline at end of file +Ankh.NoLoad +/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip +/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip +/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip +/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin index 9996240..7fec07a 100644 Binary files a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin and b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin differ diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin index 3388d94..64aec41 100644 Binary files a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin and b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0072e871-6b74-4081-b594-ee6d9254552a.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0072e871-6b74-4081-b594-ee6d9254552a.vsidx deleted file mode 100644 index 4ebb9e6..0000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0072e871-6b74-4081-b594-ee6d9254552a.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/66cedb23-8f2a-464d-85e3-13412a4ee003.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/00b6800d-fbec-4b29-92fb-2aba7ae03006.vsidx similarity index 72% rename from VTOL_2.0.0/.vs/VTOL/FileContentIndex/66cedb23-8f2a-464d-85e3-13412a4ee003.vsidx rename to VTOL_2.0.0/.vs/VTOL/FileContentIndex/00b6800d-fbec-4b29-92fb-2aba7ae03006.vsidx index 2adb67d..db70fd5 100644 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/66cedb23-8f2a-464d-85e3-13412a4ee003.vsidx and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/00b6800d-fbec-4b29-92fb-2aba7ae03006.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/058e30bf-32f9-4834-9225-4174fb4441ad.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/058e30bf-32f9-4834-9225-4174fb4441ad.vsidx deleted file mode 100644 index 98918bb..0000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/058e30bf-32f9-4834-9225-4174fb4441ad.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/1357a2aa-2700-4e79-8d03-f2d6b7b71c22.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/1357a2aa-2700-4e79-8d03-f2d6b7b71c22.vsidx deleted file mode 100644 index 8b190ed..0000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/1357a2aa-2700-4e79-8d03-f2d6b7b71c22.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/256766e8-1c07-48d1-ab39-cde41e11a985.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/256766e8-1c07-48d1-ab39-cde41e11a985.vsidx new file mode 100644 index 0000000..d702474 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/256766e8-1c07-48d1-ab39-cde41e11a985.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4f9bf00c-2bf2-49a6-ba33-e80a275dc26f.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4f9bf00c-2bf2-49a6-ba33-e80a275dc26f.vsidx new file mode 100644 index 0000000..0c30520 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4f9bf00c-2bf2-49a6-ba33-e80a275dc26f.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b142ca12-20ef-4e76-85a0-d6d38592c524.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b142ca12-20ef-4e76-85a0-d6d38592c524.vsidx deleted file mode 100644 index aa29cf3..0000000 Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b142ca12-20ef-4e76-85a0-d6d38592c524.vsidx and /dev/null differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/bc5ced4a-cd26-46f6-88e8-b81e38b1e385.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/bc5ced4a-cd26-46f6-88e8-b81e38b1e385.vsidx new file mode 100644 index 0000000..9ad5ddc Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/bc5ced4a-cd26-46f6-88e8-b81e38b1e385.vsidx differ diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cdfa5812-62ad-45d2-994e-f1e0b8d557a7.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cdfa5812-62ad-45d2-994e-f1e0b8d557a7.vsidx new file mode 100644 index 0000000..2c85fc5 Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cdfa5812-62ad-45d2-994e-f1e0b8d557a7.vsidx differ diff --git a/VTOL_2.0.0/MainWindow.xaml b/VTOL_2.0.0/MainWindow.xaml index e6f0f2a..60f859c 100644 --- a/VTOL_2.0.0/MainWindow.xaml +++ b/VTOL_2.0.0/MainWindow.xaml @@ -366,14 +366,14 @@ - + - + - + @@ -391,7 +391,7 @@ - + diff --git a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs index 4713c23..38d1184 100644 --- a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs +++ b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs @@ -3575,11 +3575,12 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio } else { + Console.WriteLine("Candidate Detected ------\n\n\n\n\n"); DispatchIfNecessary(async () => { - Update_ActionCard_Progress(Action_Card_, 20); + Update_ActionCard_Progress(Action_Card_, 5); if (Progress_Bar != null) @@ -3607,22 +3608,20 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + @"ns_startup_args.txt", User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\ns_startup_args.txt", true); } - Update_ActionCard_Progress(Action_Card_, 10); - if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg")) + if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\mods\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg")) { - await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", true); + await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\mods\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", true); } - await Task.Delay(200); ; - Update_ActionCard_Progress(Action_Card_, 10); + await Task.Delay(100) ; if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + @"ns_startup_args_dedi.txt")) @@ -3636,7 +3635,21 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio } Update_ActionCard_Progress(Action_Card_, 10); + string searchPattern = @"Northstar.*"; + string baseFolderPath = Path.Combine(User_Settings_Vars.NorthstarInstallLocation, User_Settings_Vars.Profile_Path + @"\mods"); + + string[] matchingFolders = Directory.GetDirectories(baseFolderPath, searchPattern, SearchOption.AllDirectories); + + foreach (string folderPath in matchingFolders) + { + if (Directory.Exists(folderPath)) + { + + TryDeleteDirectory(folderPath, true); + + } + } string searchQuery3 = "*" + "Northstar.dll" + "*"; var Destinfo = new DirectoryInfo(Destination); @@ -3665,7 +3678,6 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio } - Update_ActionCard_Progress(Action_Card_, 5); @@ -3685,7 +3697,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg")) { - await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", true); + await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\mods\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", true);