Fixes for EVA science

pehvbot · Feb 8, 2022 · f27b899 · f27b899
1 parent 259e785
commit f27b899
Showing 1 changed file with 2 additions and 53 deletions.
diff --git a/GameData/LRTR/science/cleanupParts/experimentAdder.cfg b/GameData/LRTR/science/cleanupParts/experimentAdder.cfg
@@ -10,19 +10,13 @@
 //  ones that are out there already.
 //==================================================================================
 
-// Remove all Experiments except Breaking Ground and EVA Science pack
-@PART[*]:HAS[~name[RobotArmScanner_*]]:BEFORE[LRTR]:NEEDS[LRTRScience]
+// Remove all Experiments except Breaking Ground and EVA
+@PART[*]:HAS[~name[RobotArmScanner_*],!MODULE[KerbalEVA]]:BEFORE[LRTR]:NEEDS[LRTRScience]
 {
 	!MODULE[ModuleScienceExperiment[~experimentID[ROCScience*]]],* {}
 	!MODULE[DMModuleScienceAnimate],* {}
 	!MODULE[DMModuleScienceAnimateGeneric],* {}
 }
-//sometimes science gets added back in
-//@PART[*]:HAS[~name[RobotArmScanner_*]]:NEEDS[LRTRScience]:FINAL
-//{
-//	!MODULE[DMModuleScienceAnimate],* {}
-//	!MODULE[DMModuleScienceAnimateGeneric],* {}
-//}
 
 // Add Science Storage Container to Stock Probes
 @PART[*]:HAS[@MODULE[ModuleCommand],#CrewCapacity[<1]]:FOR[LRTR]:NEEDS[LRTRScience]
@@ -109,48 +103,3 @@
 		dataIsCollectable = true
 	}
 }
-
-// Add Surface Sample to Kerbals
-@PART[kerbalEVA*]:FOR[LRTR]:NEEDS[LRTRScience]
-{
-	MODULE
-	{
-		name = ModuleScienceExperiment
-		experimentID = surfaceSample
-		experimentActionName = Take Surface Sample
-		resetActionName = Discard Sample
-		reviewActionName = Review Sample
-		hideUIwhenUnavailable = True
-		rerunnable = True
-		resettable = True
-		resettableOnEVA = False
-		hideFxModuleUI = True
-		resourceToReset = Supplies
-		resourceResetCost = 5
-		xmitDataScalar = 0.25
-		dataIsCollectable = True
-		deployableSeated = False
-	}
-}
-
-// Add EVA to Kerbals
-@PART[kerbalEVA*]:FOR[LRTR]:NEEDS[LRTRScience]
-{
-	MODULE
-	{
-		name = ModuleScienceExperiment
-		experimentID = evaReport
-		experimentActionName = EVA Report
-		resetActionName = Discard Report
-		reviewActionName = Review Report
-		hideUIwhenUnavailable = True
-		rerunnable = True
-		resettable = True
-		resettableOnEVA = False
-		hideFxModuleUI = True
-		resourceToReset = Supplies
-		resourceResetCost = 5
-		xmitDataScalar = 1
-		dataIsCollectable = True
-	}
-}