v.07.1

Fixed Action group actions for Auto-collecting Containers Science is now recoverable in containers Fixed Lab boost showing with now lab on vessel
RoxieCeleste · Aug 25, 2014 · 1cccdcd · 1cccdcd
1 parent 39d3af5
commit 1cccdcd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/GameData/SirDargon/ConfigurableScienceData/Plugins/ConfigurableScienceData.dll b/GameData/SirDargon/ConfigurableScienceData/Plugins/ConfigurableScienceData.dll
diff --git a/GameData/SirDargon/ScienceContainers/Plugins/ScienceContainer.dll b/GameData/SirDargon/ScienceContainers/Plugins/ScienceContainer.dll
diff --git a/src/AutoCollectScienceContainer.cs b/src/AutoCollectScienceContainer.cs
@@ -62,17 +62,17 @@ public class AutoCollectScienceContainer : ScienceContainer {
 
 		/* Actions */
 		[KSPAction("Toggle Auto-collect")]
-		public void toggleAutoCollect() {
+		public void toggleAutoCollect(KSPActionParam param) {
 			autoCollectEnabled = !autoCollectEnabled;
 		}
 
 		[KSPAction("Start Auto-collect")]
-		public void startAutoCollectAction() {
+		public void startAutoCollectAction(KSPActionParam param) {
 			startAutoCollect();
 		}
 
 		[KSPAction("Stop Auto-collect")]
-		public void stopAutoCollectAction() {
+		public void stopAutoCollectAction(KSPActionParam param) {
 			stopAutoCollect();
 		}
 

diff --git a/src/ScienceContainer.cs b/src/ScienceContainer.cs
@@ -8,7 +8,7 @@
 namespace ScienceContainer {
 	public class ScienceContainer : PartModule, IScienceDataContainer {
 
-		protected List<CfgScienceData> storedData = new List<CfgScienceData>();
+		protected List<ScienceData> storedData = new List<ScienceData>();
 
 		/* Overriden PartModule Methods */
 		public override void OnStart(StartState state) {
@@ -17,17 +17,17 @@ public class ScienceContainer : PartModule, IScienceDataContainer {
 
 		public override void OnLoad(ConfigNode node) {
 			base.OnLoad(node);
-			foreach(ConfigNode dataNode in node.GetNodes("CfgScienceData")) {
+			foreach(ConfigNode dataNode in node.GetNodes("ScienceData")) {
 				storedData.Add(new CfgScienceData(dataNode));
 			}
 			updateMenu();
 		}
 
 		public override void OnSave(ConfigNode node) {
 			base.OnSave(node);
-			node.RemoveNodes("CfgScienceData");
+			node.RemoveNodes("ScienceData");
 			foreach(CfgScienceData data in storedData) {
-				data.Save((ConfigNode)node.AddNode("CfgScienceData"));
+				data.Save((ConfigNode)node.AddNode("ScienceData"));
 			}
 		}
 
@@ -68,7 +68,7 @@ public class ScienceContainer : PartModule, IScienceDataContainer {
 				false,
 				"",
 				false,
-				data.labBoost < 1 && ModuleScienceLab.IsLabData(data),
+				data.labBoost < 1 && vessel.FindPartModulesImplementing<ModuleCfgScienceLab>().Count > 0 && ModuleScienceLab.IsLabData(data),
 				new Callback<ScienceData>(onDiscardData),
 				new Callback<ScienceData>(onKeepData),
 				new Callback<ScienceData>(onTransmitData),