v2.9.1

H1emu · Mar 19, 2024 · bddcdf0 · bddcdf0
1 parent 045e041
commit bddcdf0
Show file tree

Hide file tree

Showing 33 changed files with 424 additions and 664 deletions.
diff --git a/H1EmuLauncher/App.config b/H1EmuLauncher/App.config
@@ -22,9 +22,6 @@
             <setting name="sessionIdKey" serializeAs="String">
                 <value />
             </setting>
-            <setting name="currentPatchVersion2015" serializeAs="String">
-                <value />
-            </setting>
             <setting name="currentPatchVersion2016" serializeAs="String">
                 <value />
             </setting>

diff --git a/H1EmuLauncher/Classes/ApplyPatch.cs b/H1EmuLauncher/Classes/ApplyPatch.cs
@@ -13,15 +13,13 @@ class ApplyPatchClass
 
         public static void CheckPatch()
         {
-            gameVersionString = SettingsPages.GameFiles.gameVersionString;
+            gameVersionString = LauncherWindow.gameVersionString;
 
             switch (gameVersionString)
             {
-                case "15jan2015":
                 case "22dec2016":
                 case "kotk":
                     if (gameVersionString == "kotk" && Properties.Settings.Default.currentPatchVersionKotK != latestPatchVersion ||
-                        gameVersionString == "15jan2015" && Properties.Settings.Default.currentPatchVersion2015 != latestPatchVersion || 
                         gameVersionString == "22dec2016" && Properties.Settings.Default.currentPatchVersion2016 != latestPatchVersion || 
                         gameVersionString == "22dec2016" && Directory.Exists($"{Properties.Settings.Default.activeDirectory}\\BattlEye") ||
                         gameVersionString == "22dec2016" && Directory.Exists($"{Properties.Settings.Default.activeDirectory}\\Resources\\Assets\\Assets_256.pack") || 
@@ -35,8 +33,7 @@ public static void CheckPatch()
                         {
                             LauncherWindow.launcherInstance.playButton.IsEnabled = false;
 
-                            if (gameVersionString == "15jan2015" && string.IsNullOrEmpty(Properties.Settings.Default.currentPatchVersion2015) ||
-                                gameVersionString == "22dec2016" && string.IsNullOrEmpty(Properties.Settings.Default.currentPatchVersion2016) ||
+                            if (gameVersionString == "22dec2016" && string.IsNullOrEmpty(Properties.Settings.Default.currentPatchVersion2016) ||
                                 gameVersionString == "kotk" && string.IsNullOrEmpty(Properties.Settings.Default.currentPatchVersionKotK))
                                 LauncherWindow.launcherInstance.playButton.Content = LauncherWindow.launcherInstance.FindResource("item150").ToString();
                             else
@@ -72,7 +69,7 @@ public static void ApplyPatch()
             // Deletes old patch files if any of them are already in the directory, including the .zip file in case of corruption
             if (File.Exists($"{Properties.Settings.Default.activeDirectory}\\dinput8.dll") || File.Exists($"{Properties.Settings.Default.activeDirectory}\\msvcp140d.dll") ||
                 File.Exists($"{Properties.Settings.Default.activeDirectory}\\ucrtbased.dll") || File.Exists($"{Properties.Settings.Default.activeDirectory}\\vcruntime140d.dll") ||
-                File.Exists($"{Properties.Settings.Default.activeDirectory}\\vcruntime140_1d.dll"))
+                File.Exists($"{Properties.Settings.Default.activeDirectory}\\vcruntime140_1d.dll") || File.Exists($"{Properties.Settings.Default.activeDirectory}\\H1Z1_FP.exe"))
             {
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\dinput8.dll");
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\msvcp140d.dll");
@@ -81,33 +78,36 @@ public static void ApplyPatch()
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\vcruntime140_1d.dll");
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2015.zip");
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2016.zip");
+                File.Delete($"{Properties.Settings.Default.activeDirectory}\\H1Z1_FP.exe");
             }
 
             // Unzip all of the files to directory
             try
             {
-                if (gameVersionString == "15jan2015")
-                {
-                    File.WriteAllBytes($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2015.zip", Properties.Resources.Game_Patch_2015);
-                    ZipFile.ExtractToDirectory($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2015.zip", $"{Properties.Settings.Default.activeDirectory}");
-                }
-                else if (gameVersionString == "22dec2016")
+                if (gameVersionString == "22dec2016")
                 {
                     File.WriteAllBytes($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2016.zip", Properties.Resources.Game_Patch_2016);
-                    ZipFile.ExtractToDirectory($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2016.zip", $"{Properties.Settings.Default.activeDirectory}");
+                    ZipFile.ExtractToDirectory($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2016.zip", $"{Properties.Settings.Default.activeDirectory}", true);
                 }
                 else if (gameVersionString == "kotk")
                 {
                     File.WriteAllBytes($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_KotK.zip", Properties.Resources.Game_Patch_KotK);
-                    ZipFile.ExtractToDirectory($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_KotK.zip", $"{Properties.Settings.Default.activeDirectory}");
+                    ZipFile.ExtractToDirectory($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_KotK.zip", $"{Properties.Settings.Default.activeDirectory}", true);
                 }
             }
-            catch { }
+            catch (Exception e)
+            {
+                Application.Current.Dispatcher.Invoke(new Action(delegate
+                {
+                    if (LauncherWindow.gameVersionString == "22dec2016")
+                        CustomMessageBox.Show($"{LauncherWindow.launcherInstance.FindResource("item96")}\n\n{e.Message}", LauncherWindow.launcherInstance);
+                    else if (LauncherWindow.gameVersionString == "kotk")
+                        CustomMessageBox.Show($"{LauncherWindow.launcherInstance.FindResource("item97")}\n\n{e.Message}", LauncherWindow.launcherInstance);
+                }));
+            }
 
             // Delete the .zip file, not needed anymore
-            if (gameVersionString == "15jan2015")
-                File.Delete($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2015.zip");
-            else if (gameVersionString == "22dec2016")
+            if (gameVersionString == "22dec2016")
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_2016.zip");
             else if (gameVersionString == "kotk")
                 File.Delete($"{Properties.Settings.Default.activeDirectory}\\Game_Patch_KotK.zip");
@@ -135,9 +135,7 @@ public static void ApplyPatch()
             File.WriteAllBytes($"{Properties.Settings.Default.activeDirectory}\\ClientConfig.ini", Properties.Resources.CustomClientConfig);
 
             // Finish
-            if (gameVersionString == "15jan2015")
-                Properties.Settings.Default.currentPatchVersion2015 = latestPatchVersion;
-            else if (gameVersionString == "22dec2016")
+            if (gameVersionString == "22dec2016")
                 Properties.Settings.Default.currentPatchVersion2016 = latestPatchVersion;
             else if (gameVersionString == "kotk")
                 Properties.Settings.Default.currentPatchVersionKotK = latestPatchVersion;

diff --git a/H1EmuLauncher/H1EmuLauncher.csproj b/H1EmuLauncher/H1EmuLauncher.csproj
@@ -7,18 +7,18 @@
 	  <UseWPF>true</UseWPF>
 	  <UseWindowsForms>true</UseWindowsForms>
 	  <ApplicationIcon>Icon.ico</ApplicationIcon>
-	  <FileVersion>2.8.9</FileVersion>
+	  <FileVersion>2.9.1</FileVersion>
 	  <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 	  <Authors>H1Emu</Authors>
-	  <Version>2.8.9</Version>
+	  <Version>2.9.1</Version>
 	  <AssemblyName>H1EmuLauncher</AssemblyName>
 	  <SignAssembly>false</SignAssembly>
 	  <Copyright>© H1Emu</Copyright>
 	  <Product>H1Emu Launcher</Product>
 	  <Description>A launcher for the H1Emu project.</Description>
 	  <Title>H1Emu Launcher</Title>
 	  <PackageIcon>Icon.ico</PackageIcon>
-	  <AssemblyVersion>2.8.9</AssemblyVersion>
+	  <AssemblyVersion>2.9.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -52,7 +52,6 @@
     <None Remove="Resources\Folder.png" />
     <None Remove="Resources\Folder_Hover.png" />
     <None Remove="Resources\Folder_Pressed.png" />
-    <None Remove="Resources\Game-Patch-2015.zip" />
     <None Remove="Resources\Game-Patch-2016.zip" />
     <None Remove="Resources\Game-Patch-KotK.zip" />
     <None Remove="Resources\Grain.png" />
@@ -207,9 +206,6 @@
     <Resource Include="Resources\Folder_Pressed.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Resources\Game-Patch-2015.zip">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Resources\Game-Patch-2016.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>

diff --git a/H1EmuLauncher/H1EmuLauncher.csproj.user b/H1EmuLauncher/H1EmuLauncher.csproj.user
@@ -36,9 +36,6 @@
     <Compile Update="SteamFramePages\DownloadComplete.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="SteamFramePages\GameInfo.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Update="Windows\LauncherWindow.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -130,9 +127,6 @@
     <Page Update="SteamFramePages\DownloadStatus.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="SteamFramePages\GameInfo.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Update="Windows\LauncherWindow.xaml">
       <SubType>Designer</SubType>
     </Page>

diff --git a/H1EmuLauncher/Language/StringResources.bg-BG.xaml b/H1EmuLauncher/Language/StringResources.bg-BG.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">• Статус •</system:String>
     <system:String x:Key="item21">Получих депо ключ за {0} резултат: {1}</system:String>
     <system:String x:Key="item23">Инсталирането е готово!</system:String>
-    <system:String x:Key="item24">Трябва да инсталирате друга версия.? Натиснете бутона отдолу за да изтеглете отново!</system:String>
+    <system:String x:Key="item24">Трябва да изтеглите играта отново? Натиснете бутона отдолу за да изтеглете отново!</system:String>
     <system:String x:Key="item25">Влизане</system:String>
     <system:String x:Key="item26">Момента се изтегля:</system:String>
     <system:String x:Key="item27">версия</system:String>

diff --git a/H1EmuLauncher/Language/StringResources.de-DE.xaml b/H1EmuLauncher/Language/StringResources.de-DE.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">Bitte stellen Sie sicher, dass Sie das Feld Auth-Code ausfüllen.</system:String>
     <system:String x:Key="item21">Depotschlüssel für {0} Ergebnis: {1}</system:String>
     <system:String x:Key="item23">Download abgeschlossen!</system:String>
-    <system:String x:Key="item24">Müssen Sie eine andere Version herunterladen? Drücken Sie die Schaltfläche unten, um sich erneut anzumelden!</system:String>
+    <system:String x:Key="item24">Müssen Sie das Spiel erneut herunterladen? Drücken Sie die Schaltfläche unten, um sich erneut anzumelden!</system:String>
     <system:String x:Key="item25">Anmelden</system:String>
     <system:String x:Key="item26">Wird gerade heruntergeladen:</system:String>
     <system:String x:Key="item27">Version</system:String>
@@ -103,7 +103,7 @@
     <system:String x:Key="item121">H1Z1.exe wird gerade verwendet\n\nBitte schließen Sie alle offenen Instanzen von H1Z1.\n\nSie können die Schaltfläche unten verwenden, um alle Prozesse von H1Z1 zu beenden.</system:String>
     <system:String x:Key="item122">Aktuelle Spielversion:</system:String>
     <system:String x:Key="item124">Launcher version</system:String>
-    <system:String x:Key="item125">Copyright © 2023 | H1Emu Project</system:String>
+    <system:String x:Key="item125">Copyright © 2024 | H1Emu Project</system:String>
     <system:String x:Key="item126">Lead Entwickler</system:String>
     <system:String x:Key="item127">Entwickler</system:String>
     <system:String x:Key="item128">Administratoren</system:String>

diff --git a/H1EmuLauncher/Language/StringResources.en-EN.xaml b/H1EmuLauncher/Language/StringResources.en-EN.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">Please make sure to fill in the Auth Code box.</system:String>
     <system:String x:Key="item21">Got depot key for {0} result: {1}</system:String>
     <system:String x:Key="item23">Download complete!</system:String>
-    <system:String x:Key="item24">Need to download a different version? Press the button below to login again!</system:String>
+    <system:String x:Key="item24">Need to download the game again? Press the button below to login again!</system:String>
     <system:String x:Key="item25">LOGIN</system:String>
     <system:String x:Key="item26">Currently downloading:</system:String>
     <system:String x:Key="item27">version</system:String>
@@ -103,7 +103,7 @@
     <system:String x:Key="item121">H1Z1.exe is currently being used.\n\nPlease close any open instances of H1Z1.\n\nYou can use the button below to kill all processes of H1Z1.</system:String>
     <system:String x:Key="item122">Current Game Version:</system:String>
     <system:String x:Key="item124">Launcher version</system:String>
-    <system:String x:Key="item125">Copyright © 2023 | H1Emu Project</system:String>
+    <system:String x:Key="item125">Copyright © 2024 | H1Emu Project</system:String>
     <system:String x:Key="item126">Lead Development</system:String>
     <system:String x:Key="item127">Developers</system:String>
     <system:String x:Key="item128">Administrators</system:String>

diff --git a/H1EmuLauncher/Language/StringResources.es-ES.xaml b/H1EmuLauncher/Language/StringResources.es-ES.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">Asegúrese de completar el cuadro Código de autenticación.</system:String>
     <system:String x:Key="item21">Se obtuvo la clave de depot para {0} resultado: {1}</system:String>
     <system:String x:Key="item23">¡Descarga completada!</system:String>
-    <system:String x:Key="item24">¿Necesitas descargar una versión diferente? ¡Presiona en el botón de abajo para iniciar se sesión de nuevo!</system:String>
+    <system:String x:Key="item24">¿Necesitas descargar el juego nuevamente? ¡Presiona en el botón de abajo para iniciar se sesión de nuevo!</system:String>
     <system:String x:Key="item25">INICIAR SESIÓN</system:String>
     <system:String x:Key="item26">Descargando:</system:String>
     <system:String x:Key="item27">versión</system:String>
@@ -103,7 +103,7 @@
     <system:String x:Key="item121">H1Z1.exe está en ejecución.\n\nCierre todas las instancias abiertas de H1Z1.\n\nPuede usar el botón a continuación para eliminar todos los procesos de H1Z1.</system:String>
     <system:String x:Key="item122">Versión De Juego Actual:</system:String>
     <system:String x:Key="item124">Versión del launcher</system:String>
-    <system:String x:Key="item125">Copyright © 2023 | H1Emu Project</system:String>
+    <system:String x:Key="item125">Copyright © 2024 | H1Emu Project</system:String>
     <system:String x:Key="item126">Desarrolladores líder</system:String>
     <system:String x:Key="item127">Desarrolladores</system:String>
     <system:String x:Key="item128">Administradores</system:String>

diff --git a/H1EmuLauncher/Language/StringResources.fr-FR.xaml b/H1EmuLauncher/Language/StringResources.fr-FR.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">Assurez-vous de remplir la case Code d'authentification.</system:String>
     <system:String x:Key="item21">La clé de dépôt pour {0} obtenue , résultat: {1}</system:String>
     <system:String x:Key="item23">Téléchargement terminé !</system:String>
-    <system:String x:Key="item24">Vous avez besoin de télécharger une autre version ? Appuyez sur le bouton ci-dessous pour vous connecter à nouveau !</system:String>
+    <system:String x:Key="item24">Besoin de télécharger à nouveau le jeu? Appuyez sur le bouton ci-dessous pour vous connecter à nouveau !</system:String>
     <system:String x:Key="item25">CONNEXION</system:String>
     <system:String x:Key="item26">Actuellement en cours de téléchargement:</system:String>
     <system:String x:Key="item27">version</system:String>
@@ -103,7 +103,7 @@
     <system:String x:Key="item121">H1Z1.exe est actuellement en cours d'utilisation.\n\nVeuillez fermer toutes les instances ouvertes de H1Z1.\n\nVous pouvez utiliser le bouton ci-dessous pour tuer tous les processus de H1Z1.</system:String>
     <system:String x:Key="item122">Version actuelle du jeu:</system:String>
     <system:String x:Key="item124">Version du launcher</system:String>
-    <system:String x:Key="item125">Copyright © 2023 | H1Emu Project</system:String>
+    <system:String x:Key="item125">Copyright © 2024 | H1Emu Project</system:String>
     <system:String x:Key="item126">Développement de Prospects</system:String>
     <system:String x:Key="item127">Développeurs</system:String>
     <system:String x:Key="item128">Administrateurs</system:String>

diff --git a/H1EmuLauncher/Language/StringResources.hr-HR.xaml b/H1EmuLauncher/Language/StringResources.hr-HR.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">Obavezno ispunite polje Auth Code.</system:String>
     <system:String x:Key="item21">Dobiven depo kljuć za {0} rezultat: {1}</system:String>
     <system:String x:Key="item23">Preuzimanje dovršeno!</system:String>
-    <system:String x:Key="item24">Potrebna vam je druga verzija? Pritisnite na gumb ispod da bi ste se ponovno prijavili!</system:String>
+    <system:String x:Key="item24">Trebate ponovo preuzeti igru? Pritisnite na gumb ispod da bi ste se ponovno prijavili!</system:String>
     <system:String x:Key="item25">Prijava</system:String>
     <system:String x:Key="item26">Trenutno preuzimanje:</system:String>
     <system:String x:Key="item27">Verzija</system:String>
@@ -103,7 +103,7 @@
     <system:String x:Key="item121">H1Z1.exe je trenutno u korištenju.\n\nZatvorite sve otvorene instance H1Z1.\n\nMožete upotrijebiti gumb ispod da prekinete sve procese H1Z1.</system:String>
     <system:String x:Key="item122">Trenutna verzija igre:</system:String>
     <system:String x:Key="item124">Verzija launchera</system:String>
-    <system:String x:Key="item125">Copyright © 2023 | H1Emu Project</system:String>
+    <system:String x:Key="item125">Copyright © 2024 | H1Emu Project</system:String>
     <system:String x:Key="item126">Vodeći developer</system:String>
     <system:String x:Key="item127">Programeri</system:String>
     <system:String x:Key="item128">Administratori</system:String>

diff --git a/H1EmuLauncher/Language/StringResources.nl-NL.xaml b/H1EmuLauncher/Language/StringResources.nl-NL.xaml
@@ -20,7 +20,7 @@
     <system:String x:Key="item19">Zorg ervoor dat u het veld Auth-code invult.</system:String>
     <system:String x:Key="item21">Kreeg depotsleutel voor {0} resultaat: {1}</system:String>
     <system:String x:Key="item23">Download voltooid</system:String>
-    <system:String x:Key="item24">Een andere versie nodig? Klik de knop om opnieuw in te loggen!</system:String>
+    <system:String x:Key="item24">Wil je het spel opnieuw downloaden? Klik de knop om opnieuw in te loggen!</system:String>
     <system:String x:Key="item25">Inloggen</system:String>
     <system:String x:Key="item26">aan het downloaden:</system:String>
     <system:String x:Key="item27">versie</system:String>
@@ -103,7 +103,7 @@
     <system:String x:Key="item121">H1Z1.exe is momenteel in gebruik.\n\nSluit alle geopende exemplaren van H1Z1.\n\nU kunt de onderstaande knop gebruiken om alle processen van H1Z1 te beëindigen.</system:String>
     <system:String x:Key="item122">Huidige spel versie:</system:String>
     <system:String x:Key="item124">Launcher versie</system:String>
-    <system:String x:Key="item125">Copyright © 2023 | H1Emu Project</system:String>
+    <system:String x:Key="item125">Copyright © 2024 | H1Emu Project</system:String>
     <system:String x:Key="item126">Hoofd-Ontwikelaar</system:String>
     <system:String x:Key="item127">Ontwikkelaars</system:String>
     <system:String x:Key="item128">Administrators</system:String>