Merge pull request #68 from Kerbas-ad-astra/master

New categories per #67
Crzyrndm · Dec 17, 2016 · 103de49 · 103de49
2 parents da0ed0b + 39f7426
commit 103de49
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 10 deletions.
diff --git a/GameData/000_FilterExtensions Configs/Default/08_Science.cfg b/GameData/000_FilterExtensions Configs/Default/08_Science.cfg
@@ -8,9 +8,11 @@ CATEGORY
 	SUBCATEGORIES
 	{
 		list = 0, Data Transmitter
-		list = 1, Experiments
-		list = 2, Sensors
-		list = 3, Labs
-		list = 4, Scanners
+		list = 1, Data Transmitter (Direct)
+		list = 2, Data Transmitter (Relay)
+		list = 3, Experiments
+		list = 4, Sensors
+		list = 5, Labs
+		list = 6, Scanners
 	}
 }
diff --git a/GameData/000_FilterExtensions Configs/SubCategories_Science.cfg b/GameData/000_FilterExtensions Configs/SubCategories_Science.cfg
@@ -7,27 +7,81 @@ SUBCATEGORY
 		CHECK
 		{
 			type = moduleName
-			value = ModuleDataTransmitter, ModuleLimitedDataTransmitter, ModuleRTAntenna, ModuleSPUPassive
+			value = ModuleLimitedDataTransmitter, ModuleRTAntenna, ModuleSPUPassive
 		}
+		//CHECK
+		//{
+		//	type = field
+		//	value = ModuleDataTransmitter,antennaType,INTERNAL
+		//	invert = true
+		//}
 	}
-
 }
 SUBCATEGORY
 {
-	name = Experiments
-	icon = Experiment
+	name = Data Transmitter (Direct)
+	icon = DataTransmitter
 	FILTER
 	{
 		CHECK
 		{
-			type = crew
-			value = 0
+			type = moduleName
+			value = ModuleDataTransmitter
 		}
+		CHECK
+		{
+			type = field
+			value = ModuleDataTransmitter,antennaType,DIRECT
+		}
+	}	
+}
+SUBCATEGORY
+{
+	name = Data Transmitter (Relay)
+	icon = DataTransmitter
+	FILTER
+	{
+		CHECK
+		{
+			type = moduleName
+			value = ModuleDataTransmitter
+		}
+		CHECK
+		{
+			type = field
+			value = ModuleDataTransmitter,antennaType,RELAY
+		}
+	}	
+}
+SUBCATEGORY
+{
+	name = Experiments
+	icon = Experiment
+	FILTER
+	{
 		CHECK
 		{
 			type = moduleName
 			value = ModuleScienceExperiment, DMModuleScienceAnimate, DMSolarCollector, DMSoilMoisture, DMAnomalyScanner, DMBioDrill, DMRoverGooMat, DMXRayDiffract, StationExperiment, SampleAnalyzer, ModuleCostlyExperiment, PhaseExperimentCore, KEESExperiment, InterstellarTelescope
 		}
+		CHECK
+		{
+			type = field
+			value = ModuleScienceExperiment,experimentID,probeReport
+			invert = true
+		}
+		CHECK
+		{
+			type = field
+			value = ModuleScienceExperiment,experimentID,surfaceSampleProbes
+			invert = true
+		}
+		CHECK
+		{
+			type = field
+			value = ModuleScienceExperiment,experimentID,crewReport
+			invert = true
+		}
 	}
 }
 SUBCATEGORY