some contains standardising, fix byTag test

Crzyrndm · Apr 23, 2016 · c5b02a3 · c5b02a3
1 parent 2df31aa
commit c5b02a3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/FilterExtension/Utility/PartType.cs b/FilterExtension/Utility/PartType.cs
@@ -113,11 +113,13 @@ public static bool checkModuleTitle(AvailablePart part, string[] values, bool co
         {
             if (part.moduleInfos == null)
                 return false;
-
-            if (contains)
-                return part.moduleInfos.Any(m => values.Contains(m.moduleName, StringComparer.OrdinalIgnoreCase));
-            else
-                return part.moduleInfos.Any(m => !values.Contains(m.moduleName, StringComparer.OrdinalIgnoreCase));
+
+            foreach (AvailablePart.ModuleInfo mi in part.moduleInfos)
+            {
+                if (contains == values.Contains(mi.moduleName, StringComparer.OrdinalIgnoreCase))
+                    return true;
+            }
+            return false;
         }
 
         /// <summary>
@@ -127,6 +129,7 @@ public static bool checkModuleName(AvailablePart part, string[] value, bool cont
         {
             if (part.partPrefab == null || part.partPrefab.Modules == null)
                 return false;
+
             if (contains)
                 return value.Any(s => checkModuleNameType(part, s) || part.partPrefab.Modules.Contains(s));
             else
@@ -342,10 +345,12 @@ public static bool checkResource(AvailablePart part, string[] value, bool contai
             if (part.partPrefab == null || part.partPrefab.Resources == null)
                 return false;
 
-            if (contains)
-                return value.Any(s => part.partPrefab.Resources.Contains(s) && part.partPrefab.Resources[s].maxAmount > 0);
-            else
-                return value.Any(s => !part.partPrefab.Resources.Contains(s) || part.partPrefab.Resources[s].maxAmount <= 0);
+            foreach (PartResource r in part.partPrefab.Resources)
+            {
+                if (r.maxAmount > 0 && contains == value.Contains(r.resourceName))
+                    return true;
+            }
+            return false;
         }
 
         /// <summary>
@@ -355,8 +360,11 @@ public static bool checkPropellant(AvailablePart part, string[] value, bool cont
         {
             foreach (ModuleEngines e in part.partPrefab.Modules.GetModules<ModuleEngines>())
             {
-                if (contains && e.propellants.Any(p => value.Contains(p.name)) || (!contains && e.propellants.Any(p => !value.Contains(p.name))))
-                    return true;
+                foreach (Propellant p in e.propellants)
+                {
+                    if (contains == value.Contains(p.name))
+                        return true;
+                }
             }
             return false;
         }
@@ -588,9 +596,7 @@ public static bool checkBulkHeadProfiles(AvailablePart part, string[] value, boo
 
             foreach (string s in part.bulkheadProfiles.Split(','))
             {
-                if (contains && value.Contains(s.Trim()))
-                    return true;
-                if (!contains && !value.Contains(s.Trim()))
+                if (contains == value.Contains(s.Trim()))
                     return true;
             }
             return false;
@@ -601,11 +607,9 @@ public static bool checkTags(AvailablePart part, string[] value, bool contains)
             if (string.IsNullOrEmpty(part.tags))
                 return false;
 
-            foreach (string s in part.tags.Split(new char[4] { ' ', ',', '|', ';' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).Where(s => s!= string.Empty).ToArray())
+            foreach (string s in part.tags.Split(new char[4] { ' ', ',', '|', ';' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToArray())
             {
-                if (contains && value.Contains(s.Trim()))
-                    return true;
-                if (!contains && !value.Contains(s.Trim()))
+                if (contains == value.Contains(s))
                     return true;
             }
             return false;

diff --git a/GameData/000_FilterExtensions/FilterExtensions.dll b/GameData/000_FilterExtensions/FilterExtensions.dll
diff --git a/Testing/ByTag.cfg b/Testing/ByTag.cfg
@@ -6,7 +6,7 @@ SUBCATEGORY
 		CHECK
 		{
 			type = tag
-			value = mk2
+			value = (more
 		}
 	}
 }
@@ -19,7 +19,7 @@ SUBCATEGORY
 		CHECK
 		{
 			type = tag
-			value = mk2, mk1
+			value = (more, moar
 			contains = false
 		}
 	}