Merge pull request linuxgurugamer#23 from Gordon-Dry/making-the-categ…

…ories-work-with-RO-and-RP-1 Making the categories work with RO and RP-1
Gordon-Dry · Sep 21, 2020 · 6ad3371 · 6ad3371
2 parents c149d62 + 11b14eb
commit 6ad3371
Show file tree

Hide file tree

Showing 10 changed files with 290 additions and 96 deletions.
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/GPS.dds b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/GPS.dds
diff --git a/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/GPS_selected.dds b/GameData/000_FilterExtensions/Icons/Autoloaded_PatchIcon/GPS_selected.dds
diff --git a/GameData/000_FilterExtensions_Configs/Default/02_Engines.cfg b/GameData/000_FilterExtensions_Configs/Default/02_Engines.cfg
@@ -8,13 +8,16 @@ CATEGORY
 
 	SUBCATEGORIES
 	{
-		list = 0,Rockets
-		list = 1,SRBs
-		list = 2,Prop Engines
-		list = 3,Jets
-		list = 4,AJE Enabled Jets
-		list = 5,Nuclear Rockets
-		list = 6,Ions
-		list = 7,MonoProp
+		list = 0,Sounding Rockets
+		list = 1,Early Rockets
+		list = 2,Rockets
+		list = 3,Upper Stage Engines
+		list = 4,SRBs
+		list = 5,Prop Engines
+		list = 6,Jets
+		list = 7,AJE Enabled Jets
+		list = 8,Nuclear Rockets
+		list = 9,Ions
+		list = 10,MonoProp
 	}
 }
diff --git a/GameData/000_FilterExtensions_Configs/Default/08_Science.cfg b/GameData/000_FilterExtensions_Configs/Default/08_Science.cfg
@@ -8,16 +8,13 @@ CATEGORY
     SUBCATEGORIES:NEEDS[!RemoteTech]
     {
         list = 0, Data Transmitter
-        list = 1, Data Transmitter (Internal)
-        list = 2, Data Transmitter (Direct)
-        list = 3, Data Transmitter (Omni)
-        list = 4, Data Transmitter (Relay)
-        list = 5, Data Transmitter (Dish)
-        list = 6, Experiments
-        list = 7, Sensors
-        list = 8, Labs
-        list = 9, Scanners
-        list = 10, GPS
+        list = 1, Data Transmitter (Direct)
+        list = 2, Data Transmitter (Relay)
+        list = 3, Experiments
+        list = 4, Sensors
+        list = 5, Labs
+        list = 6, Scanners
+        list = 7, GPS
     }
     SUBCATEGORIES:NEEDS[RemoteTech]
     {

diff --git a/GameData/000_FilterExtensions_Configs/Default/Mod_B9.cfg b/GameData/000_FilterExtensions_Configs/Default/Mod_B9.cfg
@@ -10,7 +10,7 @@ CATEGORY:NEEDS[B9_Aerospace]
 		CHECK
 		{
 			type = folder
-			value = B9_Aerospace,B9_Aerospace_Legacy
+			value = B9_Aerospace,B9_Aerospace_Legacy,B9_Aerospace_HX
 		}
 	}
 

diff --git a/GameData/000_FilterExtensions_Configs/Default/Mod_ProceduralParts.cfg b/GameData/000_FilterExtensions_Configs/Default/Mod_ProceduralParts.cfg
@@ -24,5 +24,6 @@ CATEGORY:NEEDS[ProceduralParts]
 		list = 6,Thermal
 		list = 7,Electrical
 		list = 8,Utility
+		list = 9,Drone
 	}
 }
diff --git a/GameData/000_FilterExtensions_Configs/Default/NamesAndIcons.cfg b/GameData/000_FilterExtensions_Configs/Default/NamesAndIcons.cfg
@@ -1,12 +1,36 @@
 FilterRename
 {
+	name = Aniline,Furfuryl,IRFNA-III=>Sounding Rockets
+	name = Ethanol75,LqdOxygen=>Early Rockets
+	name = Ethanol75,HTP,LqdOxygen=>Early Rockets
+	name = Ethanol90,HTP,LqdOxygen=>Early Rockets
+	name = Hydyne,HTP,LqdOxygen=>Early Rockets
+	name = AK20,Kerosene=>Early Rockets
+	name = Kerosene,LqdOxygen=>Rockets
 	name = LiquidFuel,Oxidizer=>Rockets
-	name = ElectricCharge,XenonGas=>Ion - Xenon
+	name = HTP,Kerosene,LqdOxygen=>Rockets
+	name = IWFNA,UDMH=>Upper Stage Engines
+	name = HTP,Kerosene=>Upper Stage Engines
 	name = IntakeAir,LiquidFuel=>Jets
+	name = IntakeAir,Kerosene=>Jets
+	name = IntakeAir,AvGas=>Jets
 	name = SolidFuel=>SRBs
+	name = HTPB=>SRBs
+	name = PBAN=>SRBs
+	name = PSPC=>SRBs
+	name = NGNC=>SRBs
+	name = HNIW=>SRBs
 	name = MonoPropellant=>MonoProp
+	name = HTP=>MonoProp
+	name = Hydazine=>MonoProp
+	name = Helium=>MonoProp
+	name = Nitrogen=>MonoProp
+	name = NitrousOxide=>MonoProp
+	name = CaveaB=>MonoProp
 	name = ArgonGas,ElectricCharge=>Ion - Argon
-	name = HydrogenGas,ElectricCharge=>Ion - Hydrogen
+	name = ElectricCharge,XenonGas=>Ion - Xenon
+	name = ElectricCharge,HydrogenGas=>Ion - Hydrogen
+	name = ElectricCharge,Lithium=>MPD - Lithium
 	name = LqdHydrogen=>Nuclear Engines
 	//name = LiquidFuel=>Nuclear Rockets
 	name = LiquidFuel=>Liquid Fuel Engines
@@ -27,16 +51,20 @@ FilterRename
 
 FilterSetIcon
 {
+	icon = Sounding Rockets=>EngineOther
+	icon = Early Rockets=>EngineOther
 	icon = Rockets=>EngineLFO
-	icon = Ion - Xenon=>EngineIon
+	icon = Upper Stage Engines=>EngineOther
 	icon = Jets=>EngineJet
 	icon = AJE Enabled Jets=>EngineJet
 	icon = SRBs=>EngineSolid
 	icon = MonoProp=>EngineMono
 	icon = Ore=>fuels_ore
 	icon = Ablator=>Ablative_Shield
 	icon = Ion - Argon=>EngineArgon
+	icon = Ion - Xenon=>EngineIon
 	icon = Ion - Hydrogen=>EnginePlasma
+	icon = MPD - Lithium=>EnginePlasma
 	icon = Nuclear Engines=>NuclearRocket
 	icon = Nuclear Rockets=>NuclearRocket
 	icon = Electric Fans=>FanEngine

diff --git a/GameData/000_FilterExtensions_Configs/SubCategories_Control.cfg b/GameData/000_FilterExtensions_Configs/SubCategories_Control.cfg
@@ -14,6 +14,12 @@ SUBCATEGORY
 			type = moduleName
 			value = ModuleCommand
 		}
+        CHECK
+        {
+            type = moduleName
+            value = LaunchClamp
+            invert = true
+        }
 	}
 }
 SUBCATEGORY

diff --git a/GameData/000_FilterExtensions_Configs/SubCategories_Electrical.cfg b/GameData/000_FilterExtensions_Configs/SubCategories_Electrical.cfg
@@ -94,5 +94,11 @@ SUBCATEGORY
 			value = ModuleCommand, ModuleDockingNode
 			invert = true
 		}
+		CHECK
+		{
+			type = moduleName
+			value = ModuleCommand
+			invert = true
+		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ CATEGORY:NEEDS[B9_Aerospace] @@
     		CHECK
     		{
     			type = folder
-    			value = B9_Aerospace,B9_Aerospace_Legacy
+    			value = B9_Aerospace,B9_Aerospace_Legacy,B9_Aerospace_HX
     		}
     	}
@@ Expand Down @@