1 files changed, 118 insertions, 6 deletions

@@ -33,6 +33,48 @@ startup
     vars.visitedMaps = new HashSet<string>();
     vars.collectedKeys = new HashSet<string>();
     vars.latestKeyKey = null;
+    vars.importantPanels = new HashSet<string>();
+    vars.importantMultiPanels = new HashSet<string>();
+    vars.importantMaps = new HashSet<string>();
+    vars.importantMultiMaps = new HashSet<string>();
+    vars.importantKeys = new HashSet<string>();
+    vars.importantCollectibles = new HashSet<string>();
+
+    vars.configFiles = null;
+    vars.settings = settings;
+    var findConfigFiles = (Action<string>)((string folder) => {
+        var files = new List<string>();
+        if (folder != null)
+        {
+            vars.log("Searching for config files in '" + folder + "'");
+            files.AddRange(System.IO.Directory.GetFiles(folder, "*.lingo2_config"));
+            files.AddRange(System.IO.Directory.GetFiles(folder, "*.lingo2_config.txt"));
+            files.AddRange(System.IO.Directory.GetFiles(folder, "*.lingo2_conf"));
+            files.AddRange(System.IO.Directory.GetFiles(folder, "*.lingo2_confi"));
+            vars.log("Found " + files.Count + " config files");
+        }
+
+        // Only add the parent setting the first time we call this function
+        if (vars.configFiles == null)
+        {
+            vars.configFiles = new Dictionary<string, string>();
+            vars.settings.Add("configs", (files.Count > 0), "Split based on configuration file:");
+        }
+
+        foreach (var file in files)
+        {
+            string fileName = file.Split('\\').Last();
+            if (vars.configFiles.ContainsKey(fileName)) continue;
+            vars.configFiles[fileName] = file;
+            vars.settings.Add(fileName, false, null, "configs");
+        }
+    });
+    // Search for config files relative to LiveSplit.exe
+    findConfigFiles(Directory.GetCurrentDirectory());
+    // Search for config files relative to the current layout
+    findConfigFiles(System.IO.Path.GetDirectoryName(timer.Layout.FilePath));
+    // Search for config files relative to the current splits
+    findConfigFiles(System.IO.Path.GetDirectoryName(timer.Run.FilePath));
 
     vars.log("Autosplitter loaded");
 }
@@ -73,6 +115,71 @@ init
     vars.lastPanelPath = new StringWatcher(ptr + 135, 101);
 
     vars.log(String.Format("Magic autosplitter array: {0}", ptr.ToString("X")));
+
+    if (settings["configs"])
+    {
+        string[] lines = {""};
+        foreach (var configFile in vars.configFiles.Keys)
+        {
+            if (settings[configFile])
+            {
+                // Full path is saved in the dictionary.
+                lines = System.IO.File.ReadAllLines(vars.configFiles[configFile]);
+                vars.log("Selected config file: " + configFile);
+                break;
+            }
+        }
+        if (lines.Length == 0)
+        {
+            vars.log("Config file empty or no config file selected!");
+        }
+        else
+        {
+            string mode = "";
+            for (int i=0; i<lines.Length; i++)
+            {
+                var line = lines[i].Split('#')[0]; // Strip comments
+                line = line.Trim(); // Strip whitespace
+                if (line == "")
+                {
+                    // No reason to process empty lines
+                    continue;
+                }
+
+                if (line.Contains(':'))
+                {
+                    var parts = line.Split(':');
+                    mode = parts[0];
+                    continue;
+                }
+
+                if (mode == "panels")
+                {
+                    vars.importantPanels.Add(line);
+                }
+                else if (mode == "multipanels")
+                {
+                    vars.importantMultiPanels.Add(line);
+                }
+                else if (mode == "maps")
+                {
+                    vars.importantMaps.Add(line);
+                }
+                else if (mode == "multimaps")
+                {
+                    vars.importantMultiMaps.Add(line);
+                }
+                else if (mode == "keys")
+                {
+                    vars.importantKeys.Add(line);
+                }
+                else if (mode == "collectibles")
+                {
+                    vars.importantCollectibles.Add(line);
+                }
+            }
+        }
+    }
 }
 
 update
@@ -130,12 +237,12 @@ split
 
     if (vars.lastPanel != vars.prevPanel)
     {
-        if (settings["panels"])
+        if (settings["panels"] || vars.importantPanels.Contains(vars.lastPanel) || vars.importantMultiPanels.Contains(vars.lastPanel))
         {
             should_split = true;
         }
 
-        if (settings["panels_first"])
+        if (settings["panels_first"] || vars.importantPanels.Contains(vars.lastPanel))
         {
             if (vars.solvedPanels.Contains(vars.lastPanel))
             {
@@ -157,12 +264,12 @@ split
     }
     else if (vars.currentMap.Current != vars.prevMap)
     {
-        if (settings["maps"])
+        if (settings["maps"] || vars.importantMaps.Contains(vars.currentMap.Current) || vars.importantMultiMaps.Contains(vars.currentMap.Current))
         {
             should_split = true;
         }
 
-        if (settings["maps_first"])
+        if (settings["maps_first"] || vars.importantMaps.Contains(vars.currentMap.Current))
         {
             if (vars.visitedMaps.Contains(vars.currentMap.Current))
             {
@@ -189,7 +296,7 @@ split
     }
     else if (vars.latestKeyKey != null && !vars.collectedKeys.Contains(vars.latestKeyKey))
     {
-        if (settings["keys"])
+        if (settings["keys"] || vars.importantKeys.Contains(vars.latestKeyKey))
         {
             should_split = true;
             vars.log("Split on collected key: " + vars.latestKeyKey);
@@ -199,7 +306,12 @@ split
     }
     else if (vars.latestCollectible.Current != vars.latestCollectible.Old)
     {
-        if (vars.latestCollectible.Current.EndsWith("Painting"))
+        if (vars.importantCollectibles.Contains(vars.latestCollectible.Current))
+        {
+            should_split = true;
+            vars.log("Split on configured collectible: " + vars.latestCollectible.Current);
+        }
+        else if (vars.latestCollectible.Current.EndsWith("Painting"))
         {
             if (settings["paintings"])
             {