debug stuff...

Crzyrndm · Nov 19, 2016 · da0ed0b · da0ed0b
1 parent 25009f2
commit da0ed0b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 34 deletions.
diff --git a/FilterExtension/Utility/PartType.cs b/FilterExtension/Utility/PartType.cs
@@ -836,52 +836,45 @@ public static bool Contains<T>(string[] CheckParams, IEnumerable<T> partParams,
 
         public static bool NodeCheck(AvailablePart part, string[] parameters, ConfigNodes.Check.Equality equality = ConfigNodes.Check.Equality.Equals)
         {
-            try
+            Type baseType;
+            if (parameters.Length < 3
+                || !Loaded_Modules.TryGetValue(parameters[0], out baseType))
+                return false;
+            foreach (PartModule pm in part.partPrefab.Modules)
             {
-                Type baseType;
-                if (parameters.Length < 3
-                    || !Loaded_Modules.TryGetValue(parameters[0], out baseType))
-                    return false;
-                foreach (PartModule pm in part.partPrefab.Modules)
+                if (baseType.IsAssignableFrom(Loaded_Modules[pm.moduleName]))
                 {
-                    if (baseType.IsAssignableFrom(Loaded_Modules[pm.moduleName]))
+                    BaseField f = pm.Fields[parameters[1]];
+                    if (f == null)
                     {
-                        BaseField f = pm.Fields[parameters[1]];
-                        if (f == null)
-                        {
-                            return false;
-                        }
-                        double res, org;
-                        if (f.originalValue == null)
+                        return false;
+                    }
+                    double res, org;
+                    if (f.originalValue == null)
+                    {
+                        return parameters[2].Equals("null", StringComparison.OrdinalIgnoreCase);
+                    }
+                    else if (!double.TryParse(parameters[2], out res) || !double.TryParse(f.originalValue.ToString(), out org))
+                    {
+                        return string.Equals(parameters[2], f.originalValue.ToString(), StringComparison.OrdinalIgnoreCase);
+                    }
+                    else
+                    {
+                        if (equality == ConfigNodes.Check.Equality.Equals)
                         {
-                            return parameters[2].Equals("null", StringComparison.OrdinalIgnoreCase);
+                            return org == res;
                         }
-                        else if (!double.TryParse(parameters[2], out res) || !double.TryParse(f.originalValue.ToString(), out org))
+                        else if (equality == ConfigNodes.Check.Equality.GreaterThan)
                         {
-                            return string.Equals(parameters[2], f.originalValue.ToString(), StringComparison.OrdinalIgnoreCase);
+                            return org > res;
                         }
-                        else
+                        else if (equality == ConfigNodes.Check.Equality.LessThan)
                         {
-                            if (equality == ConfigNodes.Check.Equality.Equals)
-                            {
-                                return org == res;
-                            }
-                            else if (equality == ConfigNodes.Check.Equality.GreaterThan)
-                            {
-                                return org > res;
-                            }
-                            else if (equality == ConfigNodes.Check.Equality.LessThan)
-                            {
-                                return org < res;
-                            }
+                            return org < res;
                         }
                     }
                 }
             }
-            catch (Exception ex)
-            {
-                UnityEngine.Debug.LogException(ex);
-            }
             return false;
         }
     }

diff --git a/GameData/000_FilterExtensions/FilterExtensions.dll b/GameData/000_FilterExtensions/FilterExtensions.dll
diff --git a/Testing/FE_Testing.dll b/Testing/FE_Testing.dll