Moved around some of the sanity checks

Author: Swamp Ig

moduleManager.cs

@@ -472,7 +472,7 @@ orderby ass.GetName().Version descending, a.path ascending
                     errors += errorFiles[file] + " error"+ (errorFiles[file]>1?"s":"") +" in GameData/" + file + "\n";
 
 
-            status = "ModuleManager applied " + patchCount + " patches and found " + errorCount + " error" + (errorCount > 1 ? "s" : "");
+            status = "ModuleManager applied " + patchCount + " patches and found " + errorCount + " error" + (errorCount != 1 ? "s" : "");
 
             print("[ModuleManager] " + status + "\n" + errors);
 
@@ -511,13 +511,21 @@ public void ApplyPatch(List<String> excludePaths, string Stage)
             print("[ModuleManager] " + Stage + (Stage == ":FIRST" ? " (default) pass" : " pass"));
             foreach (UrlDir.UrlConfig mod in GameDatabase.Instance.root.AllConfigs.ToArray())
             {
-                string name = RemoveWS(mod.name);
-
-                if (mod.type[0] == '@' || (mod.type[0] == '$') || (mod.type[0] == '!'))
+                if (!IsBraquetBalanced(mod.type))
                 {
-                    int lastErrorCount = errorCount;
+                    print("[ModuleManager] Skipping a patch with unbalanced square brackets or a space (replace them with a '?') :\n" + mod.name + "\n");
+                    addErrorFiles(mod.parent);
+                    errorCount++;
+                    continue;
+                }
 
-                    try
+                string name = RemoveWS(mod.type);
+
+                int lastErrorCount = errorCount;
+
+                try
+                {
+                    if (name[0] == '@' || (name[0] == '$') || (name[0] == '!'))
                     {
                         // Ensure the stage is correct
                         int stageIdx = name.IndexOf(Stage);
@@ -534,9 +542,11 @@ public void ApplyPatch(List<String> excludePaths, string Stage)
                             continue;
                         }
 
+                        // TODO: do we want to ensure there's only one phase specifier?
+
                         if (!CheckNeeds(ref name))
                         {
-                            print("[ModuleManager] node " + mod.url + " - unable to satisfy the list of things that it NEEDS!");
+                            print("[ModuleManager] Not applying patch " + mod.url + " - unable to satisfy NEEDS");
                             continue;
                         }
 
@@ -554,14 +564,6 @@ public void ApplyPatch(List<String> excludePaths, string Stage)
                         string pattern = splits.Length > 1 ? splits[1] : null;
                         string type = splits[0].Substring(1);
 
-                        if (!IsBraquetBalanced(mod.name))
-                        {
-                            print("[ModuleManager] Skipping a patch with unbalanced square brackets or a space (replace them with a '?') :\n" + mod.name + "\n");
-                            addErrorFiles(mod.parent);
-                            errorCount++;
-                            continue;
-                        }
-
                         foreach (UrlDir.UrlConfig url in GameDatabase.Instance.root.AllConfigs.ToArray())
                         {
                             if (url.type == type
@@ -598,35 +600,35 @@ public void ApplyPatch(List<String> excludePaths, string Stage)
                             }
                         }
                     }
-                    catch (Exception e)
-                    {
-                        print("[ModuleManager] Exception while processing node : " + mod.url + "\n" + e.ToString());
-                        addErrorFiles(mod.parent);
-                    }
-                    finally
+                    else if(Stage == ":FIRST" && mod.type.Contains(":NEEDS["))
                     {
-                        if (lastErrorCount < errorCount)
-                            addErrorFiles(mod.parent, errorCount - lastErrorCount);
-                    }
-                }
-                else if(Stage == ":FIRST" && mod.type.Contains(":NEEDS["))
-                {
-                    mod.parent.configs.Remove(mod);
-                    string type = mod.type;
+                        mod.parent.configs.Remove(mod);
+                        string type = mod.type;
 
-                    // NEEDS for ordinary nodes
-                    if (!CheckNeeds(ref type))
-                    {
-                        print("[ModuleManager] Deleting Node " + mod.url + " as it can't satisfy its NEEDS");
-                        continue;
-                    }
-                    Debug.LogWarning(type);
+                        // NEEDS for ordinary nodes
+                        if (!CheckNeeds(ref type))
+                        {
+                            print("[ModuleManager] Deleting Node " + mod.url + " as it can't satisfy its NEEDS");
+                            continue;
+                        }
+                        Debug.LogWarning(type);
 
-                    ConfigNode copy = new ConfigNode(type);
-                    mod.config.CopyTo(copy);
+                        ConfigNode copy = new ConfigNode(type);
+                        mod.config.CopyTo(copy);
 
-                    mod.parent.configs.Add(new UrlDir.UrlConfig(mod.parent, copy));
+                        mod.parent.configs.Add(new UrlDir.UrlConfig(mod.parent, copy));
 
+                    }
+                }
+                catch (Exception e)
+                {
+                    print("[ModuleManager] Exception while processing node : " + mod.url + "\n" + e.ToString());
+                    addErrorFiles(mod.parent);
+                }
+                finally
+                {
+                    if (lastErrorCount < errorCount)
+                        addErrorFiles(mod.parent, errorCount - lastErrorCount);
                 }
             }
         }