read all XComEngine.ini files from the Config folder when reading MCOs

fixes X2CommunityCore#249
remcoros · Aug 14, 2023 · ad07bbd · ad07bbd
1 parent eb1a4ed
commit ad07bbd
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/xcom2-launcher/xcom2-launcher/Classes/Mod/ModEntry.cs b/xcom2-launcher/xcom2-launcher/Classes/Mod/ModEntry.cs
@@ -274,16 +274,24 @@ private IEnumerable<ModClassOverride> GetUIScreenListenerOverrides()
 
         private IEnumerable<ModClassOverride> GetClassOverrides()
         {
-            var file = FilePath.Combine(Path, "Config", "XComEngine.ini");
-
-            if (!File.Exists(file))
-                return new ModClassOverride[0];
+            var result = new List<ModClassOverride>();
+            var configPath = FilePath.Combine(Path, "Config");
+            if (!Directory.Exists(configPath))
+            {
+                return Array.Empty<ModClassOverride>();
+            }
+
+            foreach (var file in Directory.GetFiles(configPath, "XComEngine.ini", SearchOption.AllDirectories))
+            {
+                var modClassOverrides = from line in File.ReadLines(file)
+                    select (l: line, match: s_classOverridesRegex.Match(s_whitespaceRegex.Replace(line, "")))
+                    into m
+                    where m.match.Success
+                    select new ModClassOverride(this, m.match.Groups[2].Value, m.match.Groups[1].Value, ModClassOverrideType.Class, m.l);
+                result.AddRange(modClassOverrides);
+            }
 
-            return from line in File.ReadLines(file)
-                select (l: line, match: s_classOverridesRegex.Match(s_whitespaceRegex.Replace(line, "")))
-                into m
-                where m.match.Success
-                select new ModClassOverride(this, m.match.Groups[2].Value, m.match.Groups[1].Value, ModClassOverrideType.Class, m.l);
+            return result;
         }
 
         public void ShowOnSteam()