Added subcategory check type

Moved subcategories to a more generic location to accommodate this

FilterExtension/ConfigNodes/Check.cs

@@ -28,7 +28,8 @@ public enum CheckType
         crashTolerance,
         maxTemp,
         profile,
-        check
+        check,
+        subcategory
     }
 
     public class Check
@@ -187,12 +188,17 @@ public bool checkPart(AvailablePart part)
                             result = false;
                     }
                     break;
+                case CheckType.subcategory:
+                    result = PartType.checkSubcategory(part, value);
+                    break;
                 default:
                     Core.Log("invalid Check type specified");
                     result = false;
                     break;
             }
 
+
+
             if (invert)
                 result = !result;
 
@@ -243,6 +249,8 @@ public static CheckType getType(string type)
                     return CheckType.profile;
                 case "check":
                     return CheckType.check;
+                case "subcategory":
+                    return CheckType.subcategory;
                 default:
                     return CheckType.category;
             }
@@ -292,6 +300,8 @@ public static string getTypeString(CheckType type)
                     return "profile";
                 case CheckType.check:
                     return "check";
+                case CheckType.subcategory:
+                    return "subcategory";
                 default:
                     return "category";
             }

FilterExtension/ConfigNodes/Filter.cs

@@ -47,21 +47,10 @@ internal bool checkFilter(AvailablePart part)
                 if (!ResearchAndDevelopment.PartModelPurchased(part) && !ResearchAndDevelopment.IsExperimentalPart(part))
                     return false;
             }
+            bool val = true;
             foreach (Check c in checks)
-            {
-                bool val = c.checkPart(part);
-                if (!val)
-                {
-                    if (invert)
-                        return true; // part failed a check, result inverted
-                    else
-                        return false; // part failed a check
-                }
-            }
-            if (invert)
-                return false; // part passed all checks, result inverted
-            else
-                return true; // part passed all checks, thus meets the filter requirements
+                val &= c.checkPart(part);
+            return invert ? !val : val;
         }
 
         public bool Equals(Filter f2)

FilterExtension/Core.cs

@@ -72,8 +72,6 @@ void Awake()
 
             loadIcons();
             checkAndMarkConflicts();
-
-
         }
 
         private void getConfigs()
@@ -189,7 +187,7 @@ private void processFilterDefinitions()
                 customSubCategory sC = new customSubCategory(node);
                 if (sC.hasFilters)
                 {
-                    if (sC.subCategoryTitle != null && checkSubCategoryHasParts(sC))
+                    if (sC.subCategoryTitle != null)
                     {
                         if (!subCategoriesDict.ContainsKey(sC.subCategoryTitle)) // if nothing else has the same title
                             subCategoriesDict.Add(sC.subCategoryTitle, sC);

FilterExtension/Settings.cs

@@ -15,12 +15,9 @@ class Settings : MonoBehaviour
         public void Start()
         {
             showWindow = false;
-            if (btnLauncher != null)
-                return;
-
-            btnLauncher = ApplicationLauncher.Instance.AddModApplication(() => showWindow = !showWindow, () => showWindow = !showWindow,
-                                                                        null, null, null, null,
-                                                                        ApplicationLauncher.AppScenes.SPACECENTER,
+            if (btnLauncher == null)
+                btnLauncher = ApplicationLauncher.Instance.AddModApplication(() => showWindow = !showWindow, () => showWindow = !showWindow,
+                                                                        null, null, null, null, ApplicationLauncher.AppScenes.SPACECENTER,
                                                                         GameDatabase.Instance.GetTexture("000_FilterExtensions/Icons/FilterCreator", false));
         }
 

FilterExtension/Utility/PartType.cs

@@ -7,7 +7,18 @@ namespace FilterExtensions.Utility
 {
     public static class PartType
     {        
-        private static bool categoryCheck(AvailablePart part)
+        public static bool checkSubcategory(AvailablePart part, string value)
+        {
+            foreach (string s in value.Split(','))
+            {
+                string sTrimmed = s.Trim();
+                if (Core.Instance.subCategoriesDict.ContainsKey(sTrimmed) && Core.Instance.subCategoriesDict[sTrimmed].checkFilters(part))
+                    return true;
+            }
+            return false;
+        }
+
+        public static bool categoryCheck(AvailablePart part)
         {
             if (part.category != PartCategories.none)
                 return false;
@@ -27,7 +38,6 @@ internal static bool checkCustom(AvailablePart part, string value)
                     val = isMultiCoupler(part);
                     break;
                 default:
-                    Core.Log("incorrect value in custom type check");
                     val = false;
                     break;
             }

GameData/000_FilterExtensions Configs/Default/NamesAndIcons.cfg

@@ -25,4 +25,39 @@ FilterSetIcon
 FilterRemove
 {
 	// remove = subCatName
+}
+
+FilterRename
+{
+	name = LqdHydrogen, Nuclear Engines
+	name = LiquidFuel, Nuclear Rockets
+	name = ElectricCharge/IntakeAtm, Electric Fans
+	name = Airflow/ElectricCharge, Electric Jet
+	name = Karbonite, Karbonite Engines
+	name = IntakeAtm/Karbonite, Karbonite Jets
+	name = ElectricCharge/Karborundum, Karborundum Engines
+	name = Aluminium/LqdOxygen, Aluminium Engines
+	name = IntakeAtm, Thermal Engines
+	name = LqdHydrogen/Oxidizer, Cryo Engines
+	name = MJPropellant, MJ Propellant Engines
+	name = LqdMethane/LqdOxygen, Methane Engines
+	name = LqdDeuterium/LqdHydrogen/LqdTritium, Fusion Engines
+
+}
+
+FilterSetIcon
+{
+	icon = Nuclear Engines, NuclearRocket
+	icon = Nuclear Rockets, NuclearRocket
+	icon = Electric Fans, FanEngine
+	icon = Electric Jet, FanEngine
+	icon = Karbonite Engines, EngineKarbonite
+	icon = Karbonite Jets, EngineJetKarbonite
+	icon = Karborundum Engines, EngineKarborundum
+	icon = Aluminium Engines, EngineAluminium
+	icon = Thermal Engines, EngineThermal
+	icon = Cryo Engines, EngineCryo
+	icon = MJ Propellant Engines, EngineMJ
+	icon = Methane Engines, EngineMethane
+	icon = Fusion Engines, EngineFusion
 }