From 4bf37b9210219acd304caf3b9beb3eb6130fca2d Mon Sep 17 00:00:00 2001 From: Anthony Bachler Date: Tue, 3 Apr 2018 04:07:16 -0500 Subject: [PATCH 1/2] now gathers zero science experiments if and only if there is a scientist on board. Prevents science labs from ignoring valid data containing experiments just because there is no more science directly available from them. --- Source/ForScience.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Source/ForScience.cs b/Source/ForScience.cs index 54497e6..aad4a4b 100644 --- a/Source/ForScience.cs +++ b/Source/ForScience.cs @@ -129,17 +129,21 @@ void TransferScience() // automaticlly find, transer and consolidate science dat Debug.Log("[ForScience!] Skipping: Experiment is not available for this situation/atmosphere."); } - else if (CurrentScienceValue(currentExperiment) < 0.1) // this experiment has no more value so we skip it + // TODO - Science Labs can use zero value science , so do not skip it if there is a lab on board + // as a temporary workaround, if there is a scientist on board it will still gather the data. + + else if (CurrentScienceValue(currentExperiment) >= 0.1 || IsScientistOnBoard()) { - Debug.Log("[ForScience!] Skipping: No more science is available: "); + Debug.Log("[ForScience!] Running experiment: " + CurrentScienceSubject(currentExperiment.experiment).id); + + //manually add data to avoid deployexperiment state issues + ActiveContainer().AddData(NewScienceData(currentExperiment)); } - else + else // this experiment has no more value so we skip it { - Debug.Log("[ForScience!] Running experiment: " + CurrentScienceSubject(currentExperiment.experiment).id); - - ActiveContainer().AddData(NewScienceData(currentExperiment)); //manually add data to avoid deployexperiment state issues + Debug.Log("[ForScience!] Skipping: No more science is available: "); } } @@ -265,4 +269,4 @@ List GetContainerList() // a list of all science contain else return GameDatabase.Instance.GetTexture("ForScience/Icons/FS_inactive", false); } } -} \ No newline at end of file +} From 6d43f1a0a80f43d5c0fbc80968dbc5da9185aacd Mon Sep 17 00:00:00 2001 From: Anthony Bachler Date: Tue, 3 Apr 2018 12:10:33 -0500 Subject: [PATCH 2/2] Add files via upload --- ForScience/ChangeLog.txt | 51 ++++++++++++++++++ ForScience/Icons/FS_active.png | Bin 0 -> 655 bytes ForScience/Icons/FS_inactive.png | Bin 0 -> 514 bytes ForScience/Plugins/ForScience.dll | Bin 0 -> 9728 bytes .../ForScience.dll.CodeAnalysisLog.xml | 34 ++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 ForScience/ChangeLog.txt create mode 100644 ForScience/Icons/FS_active.png create mode 100644 ForScience/Icons/FS_inactive.png create mode 100644 ForScience/Plugins/ForScience.dll create mode 100644 ForScience/Plugins/ForScience.dll.CodeAnalysisLog.xml diff --git a/ForScience/ChangeLog.txt b/ForScience/ChangeLog.txt new file mode 100644 index 0000000..8223dca --- /dev/null +++ b/ForScience/ChangeLog.txt @@ -0,0 +1,51 @@ +v 1.5.1 - KSP v1.3 support +- Performance improvements + +v 1.5.0 - KSP v1.3 support +- Fixed signature for GetExperimentSubject + +v 1.4.1 - KSP v1.2 Support +- Fixed ScienceData signature + +v 1.4 - Bugfixapaloosa +- Fixed surface sample being improperly run without the correct unlocks in career +- Fixed for probe shenanigan. +- Removed the now unnecessary biome detection throttling. +- Fixed an issue where the button (color) could get out of sync with the logic state +- Fixed an issue with switching to other vessels in range. +- Fixed an issue with flickering buttons on probes and when a vessel is destroyed + +v 1.3 - Support for KSP v 1.1 +- Fixed an issue with experiments running before the vessel was fully loaded. + +v 1.2 - Science value filtering adjustment +- Increased the minimum value to run an experiment to .1 science. + +v 1.1 - EVA science support +- Science will be automaticly gathered while EVA. + +v 1.0 - Release Version! +- Reset goo/scijr when scientist is onboard +- Much improved biome detection and throttling. +- Suppressed (actually bypassed altogether) experiment result windows +- Suppressed duplicate results. +- consolidated data on docking. +- Many code improvements + +v 0.24.2-1 Bug fixes +- Science mode support +- Disabled when no science container is found. (temporary) + +v 0.24-1 - Experiment Filtering +- Experiments without available science will no longer run automatically. (Usually.) +- Plugin and window are disabled in sandbox mode. + +v 0.23.5-2 - Experiment Automation + + - Experiments will now run automatically when enabled. + +v0.23.5-1 - Initial WIP release. + +- Automatic science container selection. +- Automatic science experiment collection. +- Temporary user interface to toggle automatic science data collection \ No newline at end of file diff --git a/ForScience/Icons/FS_active.png b/ForScience/Icons/FS_active.png new file mode 100644 index 0000000000000000000000000000000000000000..5c148c9c5b000c0d3738a06c7b2a47c16e94877e GIT binary patch literal 655 zcmV;A0&x9_P)9I&|RYdy{@!4R$lQ%hhbCxIGw(g9JYDXX9vC2#$ z9BSN#`Vo3AlMe25&#@5#ZrWiYIR*Nmz9q5=(cAdu0ohuE;&H5+DQ^o29Y9C|Nrb+t z6Q@bp>+v^#GqMPK%x*+4A(AZBb%s>fAFnXq%pt4+Adr3z1T%HdJ*JOd^Q|=N7D(F_ zarfAp^2*b3jyL$m60@};T8MwZs@_B7a48xlV{)9-D=dcZ`OPnu^{!=UID{}!@z#s( z3|Qaz2&vY7gaV=LWH5La|F|gFV<^vB5H*kLNVTZ=gbgvzOPfOVC=rt=Ur`FcACy^C pr-?YnqTR?qm~+=+hr{7;z+Y4$uBZ392K@j4002ovPDHLkV1m5d8Cw7V literal 0 HcmV?d00001 diff --git a/ForScience/Icons/FS_inactive.png b/ForScience/Icons/FS_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..4d3abb145eebc2b1aaa0501b74ff38a3ea84ee49 GIT binary patch literal 514 zcmV+d0{#7oP)*kG9ZofGYN#e74oms9LRW8#-JSKcyv z;9WUsZenSVV($e{5_c=kX4x*9{;5)Hxi3k#bA}0#EoVnj1XMu(#a;)D)!Tf zJHeyiOFKVtGfR!_N0-hH7lYT0ReLvev0!VMS1~_oT%WmySic>gnZj@O&G2TH`>P}7 zIKr96TJPbDfoW};i=ipUhsn1+F`4$R=Lg6>R0AMHGL}zWug8%>k07*qoM6N<$ Ef*cOsy#N3J literal 0 HcmV?d00001 diff --git a/ForScience/Plugins/ForScience.dll b/ForScience/Plugins/ForScience.dll new file mode 100644 index 0000000000000000000000000000000000000000..c72205ad3c964aaf4dd72f6e7ff969fea36399a5 GIT binary patch literal 9728 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 BDGC4p literal 0 HcmV?d00001 diff --git a/ForScience/Plugins/ForScience.dll.CodeAnalysisLog.xml b/ForScience/Plugins/ForScience.dll.CodeAnalysisLog.xml new file mode 100644 index 0000000..a924c53 --- /dev/null +++ b/ForScience/Plugins/ForScience.dll.CodeAnalysisLog.xml @@ -0,0 +1,34 @@ + + + + + Category + Certainty + Collapse All + Check Id + Error + error(s) + Expand All + Help + Line + message(s) + [Location not stored in Pdb] + Project + Resolution + Rule + Rule File + Rule Description + Source + Status + Target + Warning + warning(s) + Code Analysis Report + + + + Microsoft.FxCop.Sdk.FxCopException + Debug information could not be found for target assembly 'ForScience.dll'. For best analysis results, include the .pdb file with debug information for 'ForScience.dll' in the same directory as the target assembly. + + +