From 1cccdcd48e1a4ff3944020433dc5f49e902356a5 Mon Sep 17 00:00:00 2001 From: SirDargon Date: Sun, 24 Aug 2014 20:05:17 -0400 Subject: [PATCH] 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 --- .../Plugins/ConfigurableScienceData.dll | Bin 9728 -> 9728 bytes .../Plugins/ScienceContainer.dll | Bin 13824 -> 13824 bytes src/AutoCollectScienceContainer.cs | 6 +++--- src/ScienceContainer.cs | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GameData/SirDargon/ConfigurableScienceData/Plugins/ConfigurableScienceData.dll b/GameData/SirDargon/ConfigurableScienceData/Plugins/ConfigurableScienceData.dll index ea4e22bd0081a6871312987bb647d6df081d8124..77e4af4ceba262b161a963c647ab595cb42e0b43 100644 GIT binary patch delta 4576 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 NK5jOC$;R6C{{gd>;wk_D delta 4461 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 a9tuQPX{^~fMR} diff --git a/GameData/SirDargon/ScienceContainers/Plugins/ScienceContainer.dll b/GameData/SirDargon/ScienceContainers/Plugins/ScienceContainer.dll index 0b98095a802ac5648f72da69e6328881a11bc0a4..d5bbe01cd3ce2c2244d069886a4b93b163edfa81 120000 GIT binary patch delta 3912 zcmb7H4RBP|6+ZXAeLwq?HE$E%Cg#VDA<0XY1d>oN3WNwn!;gSTL}`!&iB6^|3%jun zrC}E)qWD8yt~euu1EHf;ky;wc6gwj_SZ!_VjOdI%h5A#gQrl6~I>ut!@7{eNT07Hb z=6&yc=bU@)IrpA>_a!rs8MxPBz~q%V@2X!t)FGZQeQ<{&g4$U04KQ=evYCFnd>RWIO816K@s_UBg21evdu<7D;--L7v zlywDDd~`Qf$RM)4nSGc!U?eVu*=fAd*oaJg^>*R7aghvr8Ppl6QhHa1bI_brZ>DC# z5VEvHA>LME7BDxRrWQ64hoYLhQN*ZAcA)ADWWBQ;w^bVIlKaH1dTsh#=|~_~{Ayz( z63Qij-7`{c@Xtt<(z{3;2^6|>pq^A^8m&Hic%5|Qzl2@c^V60RWa29Ty12 zod|cYh7>gA&KQ#nGl4!fpvB$<>fgi>;Nwo7_@!01NQFS(#RE=|Z{Tt_E;kaL@XL$G zBAVMJBU*`TdhwM1!l+EAK#zAtbT1#?(2iWhX@6z& zO4!u48PRJ4mhDUQKw+EFYYR-vL)Mc7i1g4jJF;|=yb7`)=Jd`VT z1t$JKp?7{6x=iE;FO2mfi)0aM;_f7f8&*lUK`Jkmg{~I!gKqaMhh|S@I6qe6EhtN^B0zV2$EPXwl4Wv|r^$qTk@%i7u?{7)xZRiX1?VA#2bJaz3cv9E)z?8b ziVx6iJ*Ee!2N1? zk6$Mry`=U{e>`jlIAs6h7$MiHS$Isysv<%TZET6exfA`o$tN~?w?yjJarpvP8&`Dww#oaZ1|fI2;vW$AJX(khQWh-8Aa)?MYIE!s-j23AqS%(AVFb0wQuSu(xcMV&;v*h=+WIGp z&~fFN+rk1m?J>E9=|cM4qjC=?kcKalvwP@Jv0_{35Tsk9Z3_ z_j$~xwNR8sJyrr%M8EP_qt-;lX?j}GVVb9vQ!#y#Gpd^K0fUCSMw8fm9`-8vf597- z=fHp9Ezocp2IA-NU7QL=uUX$bSuVs`Y>BHas-!$%ujM>8fl~6M@OMALRb7$PeK2-_#jf^9Hsa5A}XX0 z^(K0OLWUgoK8aXCcN)jayogn>uz4}7WwmBCtDshB{B)(+z@}1<(LjxCwb{mIAn;<= z#*iCpXOEc~7E;z;Xv%3Rn`Jf8T%}p4Jo{O~dJ;Z4>&@1SY(4wAb&@qQ&EG_wIiEDM z{ZFziYxYNZKjaEt%X<6`e1r}AXYvCo^kIeFDp0qoYm6TBAJWE1UKC>_FNmY?Swenx z*guW>*)e~ozM6ikZ>9lyS>Fznm3J%6pwieRZwH&wGDJUn&VP?SsGNSN@)`#IPJfk+ z`(M>hA@u9|X;u~Zn=TjEmG>T|te|OukEw#q4@8YICgo!Gl2K|%oM`w}x()PQy2@&x z0va*)ddl)`K)dymcIN3|usls=-5>G&EpUNZ;iPWm+( z>lJEYSFp#}L6*lK*ZTAUeXBmIAJKgooJ(A{Oup0~zQuD)=uS=OOZ{!SxWuVur^HI9 zvZ|T2(nD-Lo?EGzZB@_jsg)M%BY0YASU*6!#7~_4A`x9U`fODAL}#>Sbb0Ac7PzTz zaOL;=QmMWH@p0K_qo0-sIg5^36|ZUekN>51C2u^k_{Yyb`sB%zebCB6R>bx}5tg7F>@Lw+)y8_oeN}7M*c0qN#L#0D$z-_^ z(u~MDlXxhyP7b5UIz7N5nH{Ezm)W5c;}IJy^MD$~S!q#SECiQq#14gcm~+qejW5w# zT`lgat`Fo=ycsdXbJb-9wjtwYb_5Iz+b<<9tQyzq^`eYkQnQUQTRiLDUSwM;m!Zf| zS;UUy@|WW1O|?^{&#t=FwjJ?*X_Vrq9bd!i@sBM&wdJKqB=GE6fTy15>W;Y`mBoX> ze9!LV8(T|?9u15A_323WLg}CT+bHE&w!-0S7iKF8M^`oMVx!?HO&Y$r+M1u` P_skfzr+&b)Q_Oz@If%DG delta 3871 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 F{{ZvmtE2z` diff --git a/src/AutoCollectScienceContainer.cs b/src/AutoCollectScienceContainer.cs index 4292b1f..2f243d2 100644 --- 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 index ba8f5ab..9e477ef 100644 --- a/src/ScienceContainer.cs +++ b/src/ScienceContainer.cs @@ -8,7 +8,7 @@ namespace ScienceContainer { public class ScienceContainer : PartModule, IScienceDataContainer { - protected List storedData = new List(); + protected List storedData = new List(); /* Overriden PartModule Methods */ public override void OnStart(StartState state) { @@ -17,7 +17,7 @@ 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(); @@ -25,9 +25,9 @@ public class ScienceContainer : PartModule, IScienceDataContainer { 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().Count > 0 && ModuleScienceLab.IsLabData(data), new Callback(onDiscardData), new Callback(onKeepData), new Callback(onTransmitData),