v1.0.1

KilLo445 · Apr 4, 2024 · 58f6262 · 58f6262
1 parent 0f32936
commit 58f6262
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 37 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,4 +1,8 @@
-v1.0.0
+v1.0.1
+- Fixed a small oversight
+- Updated random messages
+
+v1.0.0
 - Added Need for Speed: High Stakes
 - Added Need for Speed: Hot Pursuit 2
 - Added tooltips

diff --git a/NFSPatcher/MainWindow.xaml.cs b/NFSPatcher/MainWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace NFSPatcher
     public partial class MainWindow : Window
     {
         // Strings
-        public static string version = "1.0.0";
+        public static string version = "1.0.1";
         string latestVer = "https://raw.githubusercontent.com/KilLo445/NFSPatcher/main/Remote/latest-version.txt";
 
         string githubLink = "https://github.com/KilLo445/NFSPatcher";
@@ -45,7 +45,6 @@ public MainWindow()
 
             var random = new Random();
             var list = new List<string> {
-                "lmao",
                 "VROOOOM",
                 "First, I'm gonna take your ride, then I'm gonna take your girl!",
                 "Sit down! How you been?",
@@ -57,7 +56,6 @@ public MainWindow()
                 "Cars? I got covered.",
                 "I'm glad you're here, sugar plum.",
                 "EA Games. Make running these games challenging... get it??? ...",
-                "EA Spor... wait wrong one."
             };
             int index = random.Next(list.Count);
             randText.Text = list[index];

diff --git a/NFSPatcher/Windows/NFS10.xaml.cs b/NFSPatcher/Windows/NFS10.xaml.cs
@@ -93,6 +93,13 @@ private void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void GoBTN_Click(object sender, RoutedEventArgs e)
         {
+            string comboBoxSelection = ComboBox.Text;
+            if (comboBoxSelection == null || comboBoxSelection == "")
+            {
+                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
             MessageBoxResult isCEConfirm = MessageBox.Show($"Do you have {gameName} Collectors Edition?\n\nIf you don't know, you probably do.", $"{gameName}", MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (isCEConfirm == MessageBoxResult.Yes) { isCollectors = true; }
             if (isCEConfirm == MessageBoxResult.No) { isCollectors = false; }
@@ -125,12 +132,7 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
                 SelectInstallPath();
                 if (selectPathCanceled == true) { return; }
             }
-
-            string comboBoxSelection = ComboBox.Text;
-            if (comboBoxSelection == null || comboBoxSelection == "")
-            {
-                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
+
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS18.xaml.cs b/NFSPatcher/Windows/NFS18.xaml.cs
@@ -74,6 +74,13 @@ private void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void GoBTN_Click(object sender, RoutedEventArgs e)
         {
+            string comboBoxSelection = ComboBox.Text;
+            if (comboBoxSelection == null || comboBoxSelection == "")
+            {
+                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
             RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\EA Games\Need for Speed(TM) The Run", true);
             if (key != null)
             {
@@ -103,12 +110,7 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
                 SelectInstallPath();
                 if (selectPathCanceled == true) { return; }
             }
-
-            string comboBoxSelection = ComboBox.Text;
-            if (comboBoxSelection == null || comboBoxSelection == "")
-            {
-                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
+
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Create Firewall Rule")

diff --git a/NFSPatcher/Windows/NFS2.xaml.cs b/NFSPatcher/Windows/NFS2.xaml.cs
@@ -74,7 +74,9 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
             if (comboBoxSelection == null || comboBoxSelection == "")
             {
                 MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
             }
+
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS3.xaml.cs b/NFSPatcher/Windows/NFS3.xaml.cs
@@ -73,7 +73,9 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
             if (comboBoxSelection == null || comboBoxSelection == "")
             {
                 MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
             }
+
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS4.xaml.cs b/NFSPatcher/Windows/NFS4.xaml.cs
@@ -76,7 +76,9 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
             if (comboBoxSelection == null || comboBoxSelection == "")
             {
                 MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
             }
+
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS6.xaml.cs b/NFSPatcher/Windows/NFS6.xaml.cs
@@ -63,6 +63,13 @@ private void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void GoBTN_Click(object sender, RoutedEventArgs e)
         {
+            string comboBoxSelection = ComboBox.Text;
+            if (comboBoxSelection == null || comboBoxSelection == "")
+            {
+                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
             RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\EA Games\Need For Speed Hot Pursuit 2", true);
             if (key != null)
             {
@@ -92,11 +99,6 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
                 if (selectPathCanceled == true) { return; }
             }
 
-            string comboBoxSelection = ComboBox.Text;
-            if (comboBoxSelection == null || comboBoxSelection == "")
-            {
-                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS7.xaml.cs b/NFSPatcher/Windows/NFS7.xaml.cs
@@ -86,6 +86,13 @@ private void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void GoBTN_Click(object sender, RoutedEventArgs e)
         {
+            string comboBoxSelection = ComboBox.Text;
+            if (comboBoxSelection == null || comboBoxSelection == "")
+            {
+                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
             RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\EA Games\Need For Speed Underground", true);
             if (key != null)
             {
@@ -115,11 +122,6 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
                 if (selectPathCanceled == true) { return; }
             }
 
-            string comboBoxSelection = ComboBox.Text;
-            if (comboBoxSelection == null || comboBoxSelection == "")
-            {
-                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS8.xaml.cs b/NFSPatcher/Windows/NFS8.xaml.cs
@@ -86,6 +86,13 @@ private void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void GoBTN_Click(object sender, RoutedEventArgs e)
         {
+            string comboBoxSelection = ComboBox.Text;
+            if (comboBoxSelection == null || comboBoxSelection == "")
+            {
+                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
             RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\EA Games\Need For Speed Underground 2", true);
             if (key != null)
             {
@@ -115,11 +122,6 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
                 if (selectPathCanceled == true) { return; }
             }
 
-            string comboBoxSelection = ComboBox.Text;
-            if (comboBoxSelection == null || comboBoxSelection == "")
-            {
-                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/NFSPatcher/Windows/NFS9.xaml.cs b/NFSPatcher/Windows/NFS9.xaml.cs
@@ -86,6 +86,13 @@ private void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void GoBTN_Click(object sender, RoutedEventArgs e)
         {
+            string comboBoxSelection = ComboBox.Text;
+            if (comboBoxSelection == null || comboBoxSelection == "")
+            {
+                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
             RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\EA Games\Need for Speed Most Wanted", true);
             if (key != null)
             {
@@ -115,11 +122,6 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
                 if (selectPathCanceled == true) { return; }
             }
 
-            string comboBoxSelection = ComboBox.Text;
-            if (comboBoxSelection == null || comboBoxSelection == "")
-            {
-                MessageBox.Show("Please select a patch method.", "NFSPatcher", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
             if (comboBoxSelection != null)
             {
                 if (comboBoxSelection == "Main Patches")

diff --git a/Remote/latest-version.txt b/Remote/latest-version.txt
@@ -1 +1 @@
-1.0.0
+1.0.1