From 22421b502cd6111b5fef2a5739dc602d823d8532 Mon Sep 17 00:00:00 2001
From: strongleong <nikita_chul@mail.ru>
Date: Sun, 6 Feb 2022 23:20:05 +1100
Subject: [PATCH] Added checks for game version

---
 ScrapModLoader/MainWindow.xaml    |  2 +-
 ScrapModLoader/MainWindow.xaml.cs | 12 +++++++-----
 ScrapModLoader/ModsLauncher.cs    |  9 ++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ScrapModLoader/MainWindow.xaml b/ScrapModLoader/MainWindow.xaml
index 3ba9f43..02aebb3 100644
--- a/ScrapModLoader/MainWindow.xaml
+++ b/ScrapModLoader/MainWindow.xaml
@@ -69,7 +69,7 @@
                 <Button Name="ButtonSettings" Content=" Settings " Click="ButtonSettings_Click" />
             </StackPanel>
             <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Left">
-                <ComboBox Name="ScraplandVersion" Margin="0,0,10,0">
+                <ComboBox Name="ScraplandVersion" Margin="0,0,10,0" SelectionChanged="ScraplandVersion_SelectionChanged">
                     <ComboBoxItem Content="Original" IsEnabled="False" />
                     <ComboBoxItem Content="Remastered" />
                 </ComboBox>
diff --git a/ScrapModLoader/MainWindow.xaml.cs b/ScrapModLoader/MainWindow.xaml.cs
index 9f20fa4..b2c1a74 100644
--- a/ScrapModLoader/MainWindow.xaml.cs
+++ b/ScrapModLoader/MainWindow.xaml.cs
@@ -157,20 +157,22 @@ namespace ScrapModLoader
 
         private void ButtonRunScrapland_Click(Object sender, RoutedEventArgs e)
         {
-
-            String gamePath = ScraplandVersion.SelectedIndex == 0 
-                ? modsLauncher.ScraplandPath : modsLauncher.ScraplandRemasteredPath;
-
-            modsLauncher.LoadMods(gamePath);
+            modsLauncher.LoadMods();
 
             String args = "-fullscreen:1";
             if (Windowed.IsChecked ?? false)
                 args = "-fullscreen:0";
 
+            String gamePath = modsLauncher.SelectedGameVersion == "1.0" ? 
+                modsLauncher.ScraplandPath : modsLauncher.ScraplandRemasteredPath;
+
             Process.Start(gamePath + @"\bin\Scrap.exe", args);
 
             if (CloseLauncher.IsChecked ?? false)
                 Close();
         }
+
+        private void ScraplandVersion_SelectionChanged(Object sender, SelectionChangedEventArgs e) =>
+            modsLauncher.SelectedGameVersion = ScraplandVersion.SelectedIndex == 0 ? "1.0" : "1.1";
     }
 }
diff --git a/ScrapModLoader/ModsLauncher.cs b/ScrapModLoader/ModsLauncher.cs
index c06e2c3..af187ad 100644
--- a/ScrapModLoader/ModsLauncher.cs
+++ b/ScrapModLoader/ModsLauncher.cs
@@ -11,12 +11,14 @@ namespace ScrapModLoader
         public List<ScrapMod> Mods { get; private set; }
         public String ScraplandPath { get; set; }
         public String ScraplandRemasteredPath { get; set; }
+        public String SelectedGameVersion { get; set; }
 
         public ModsLauncher()
         {
             Mods = new List<ScrapMod>();
             ScraplandPath = Settings.Default.ScraplandPath;
             ScraplandRemasteredPath = Settings.Default.ScraplandRemasteredPath;
+            SelectedGameVersion = "0.0";
         }
 
         public void ScanMods()
@@ -76,10 +78,15 @@ namespace ScrapModLoader
             return isFound;
         }
 
-        public void LoadMods(String gamePath)
+        public void LoadMods()
         {
+            String gamePath = SelectedGameVersion == "1.0" ? ScraplandPath : ScraplandRemasteredPath;
+
             foreach (ScrapMod mod in Mods)
             {
+                if (mod.RequiredGame != SelectedGameVersion)
+                    continue;
+
                 if (mod.Checked)
                 {
                     if (!mod.IsEnabled(gamePath))