Science labs can now reset experiments (#146)

* Science: Labs can now reset experiments * CHANGELOG.md: Add Science lab reset details * Build: Release dll (v.1.7.2)
Kerbalism · Jul 17, 2018 · 4d9da4c · 4d9da4c
1 parent 352ecbd
commit 4d9da4c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 ### Changes since the last release
 
+ * Science labs can now reset experiments (PiezPiedPy)
  * CryoTanks are now simulated in the background also fuel boiloff is simulated in the planner (PiezPiedPy)
  * Reverted the Quick'n'dirty fix for GPOSpeedFuelPump because that one is fixed now with v1.8.14 (Gordon Dry)
  * Added a fix to make sure there is a module Reliability for parachutes, also for RealChute/RealChuteFAR (Gordon Dry)

diff --git a/GameData/Kerbalism/Kerbalism.dll b/GameData/Kerbalism/Kerbalism.dll
diff --git a/GameData/Kerbalism/Profiles/Default.cfg b/GameData/Kerbalism/Profiles/Default.cfg
@@ -658,8 +658,8 @@ PARTUPGRADE
   }
 }
 
-// boost Mk3 Shuttle cockpit Nitrogen storage
-@PART[mk3Cockpit_Shuttle]:NEEDS[ProfileDefault]:FOR[Kerbalism]
+// boost Mk3 Shuttle cockpit and Science Lab Nitrogen storage
+@PART[mk3Cockpit_Shuttle,Large_Crewed_Lab]:NEEDS[ProfileDefault]:FOR[Kerbalism]
 {
   @MODULE[Configure]
   {

diff --git a/GameData/Kerbalism/System/Planner.cfg b/GameData/Kerbalism/System/Planner.cfg
@@ -35,17 +35,6 @@
 }
 
 
-@PART[*]:HAS[@MODULE[ModuleScienceConverter]]:AFTER[Kerbalism]
-{
-  MODULE
-  {
-    name = PlannerController
-    title = science
-	considered = true
-  }
-}
-
-
 @PART[*]:HAS[@MODULE[ModuleActiveRadiator]]:FOR[Kerbalism]
 {
   MODULE

diff --git a/GameData/Kerbalism/System/Science.cfg b/GameData/Kerbalism/System/Science.cfg
@@ -28,7 +28,7 @@
 // Replace stock lab with our own
 // ============================================================================
 
-@PART[*]:HAS[@MODULE[ModuleScienceLab]]:NEEDS[FeatureScience]:FINAL
+@PART[*]:HAS[@MODULE[ModuleScienceLab]]:NEEDS[FeatureScience]:FOR[zzzKerbalism]
 {
   !MODULE[ModuleScienceLab] {}
   !MODULE[ModuleScienceConverter] {}
@@ -52,7 +52,7 @@
 // Remove stock science data containers
 // ============================================================================
 
-@PART[*]:HAS[@MODULE[ModuleScienceContainer]]:NEEDS[FeatureScience]:FOR[Kerbalism]
+@PART[*]:HAS[@MODULE[ModuleScienceContainer]]:NEEDS[FeatureScience]:FOR[zzzKerbalism]
 {
   !MODULE[ModuleScienceContainer] {}
 }
@@ -74,7 +74,7 @@
 // ============================================================================
 
 // note: this also should support DMagic and Universal Storage experiment parts
-@PART[*]:HAS[@MODULE[*ModuleScience*]]:NEEDS[FeatureScience]:FOR[Kerbalism]
+@PART[*]:HAS[@MODULE[*ModuleScience*]]:NEEDS[FeatureScience]:FOR[zzzKerbalism]
 {
   @MODULE[*ModuleScience*]:HAS[#experimentID[crewReport]]           { @xmitDataScalar = 1 }
   @MODULE[*ModuleScience*]:HAS[#experimentID[evaReport]]            { @xmitDataScalar = 1 }

diff --git a/src/Modules/Laboratory.cs b/src/Modules/Laboratory.cs
@@ -7,12 +7,13 @@ namespace KERBALISM
 {
 
 
-	public sealed class Laboratory : PartModule, IModuleInfo, ISpecifics, IContractObjectiveModule
+	public sealed class Laboratory: PartModule, IModuleInfo, ISpecifics, IContractObjectiveModule
 	{
 		// config
 		[KSPField] public double ec_rate;                     // ec consumed per-second
 		[KSPField] public double analysis_rate;               // analysis speed in Mb/s
 		[KSPField] public string researcher = string.Empty;   // required crew for analysis
+		[KSPField] public bool cleaner = true;                // can clean experiments
 
 		// persistence
 		[KSPField(isPersistant = true)] public bool running;  // true if the lab is active
@@ -40,11 +41,12 @@ public void Update()
 			if (Lib.IsFlight())
 			{
 				Events["Toggle"].guiName = Lib.StatusToggle("Lab", status);
+
+				// if a cleaner and either a researcher is not required, or the researcher is present
+				if (cleaner && (!researcher_cs || researcher_cs.Check(part.protoModuleCrew))) Events["CleanExperiments"].active = true;
+				else Events["CleanExperiments"].active = false;
 			}
-			else
-			{
-				Events["Toggle"].guiName = Lib.StatusToggle("Lab", running ? "enabled" : "disabled");
-			}
+			else Events["Toggle"].guiName = Lib.StatusToggle("Lab", running ? "enabled" : "disabled");
 		}
 
 
@@ -146,6 +148,24 @@ public void Toggle()
 			running = !running;
 		}
 
+		[KSPEvent(guiActive = true, guiActiveEditor = false, guiName = "Clean Experiments", active = true)]
+		public void CleanExperiments()
+		{
+			List<ModuleScienceExperiment> modules = vessel.FindPartModulesImplementing<ModuleScienceExperiment>();
+			bool message = false;
+			foreach (ModuleScienceExperiment m in modules)
+			{
+				if (m.resettable && m.Inoperable)
+				{
+					m.ResetExperiment();
+					message = true;
+				}
+			}
+			// inform the user
+			if (message) Message.Post("Vessel experiments have been cleaned.");
+		}
+
+
 
 		// action groups
 		[KSPAction("#KERBALISM_Laboratory_Action")] public void Action(KSPActionParam param) { Toggle(); }
@@ -162,6 +182,7 @@ public Specifics Specs()
 		{
 			Specifics specs = new Specifics();
 			specs.Add("Researcher", new CrewSpecs(researcher).Info());
+			if (cleaner) specs.Add("Can clean experiments");
 			specs.Add("EC rate", Lib.HumanReadableRate(ec_rate));
 			specs.Add("Analysis rate", Lib.HumanReadableDataRate(analysis_rate));
 			return specs;