Fix science transmit value

src/kOS/Suffixed/PartModuleField/ScienceExperimentFields.cs

@@ -11,10 +11,12 @@ namespace kOS.Suffixed.PartModuleField
     [kOS.Safe.Utilities.KOSNomenclature("ScienceExperimentModule")]
     public abstract class ScienceExperimentFields : PartModuleFields
     {
+        protected global::Part part;
         protected IScienceDataContainer container;
         public ScienceExperimentFields(PartModule module, SharedObjects shared) : base(module, shared)
         {
             this.container = module as IScienceDataContainer;
+            part = module.part;
 
             if (container == null)
             {
@@ -54,7 +56,7 @@ public virtual bool HasData()
 
         public virtual ListValue Data()
         {
-            return new ListValue(container.GetData().Select(s => new ScienceDataValue(s)).Cast<Structure>());
+            return new ListValue(container.GetData().Select(s => new ScienceDataValue(s, part)).Cast<Structure>());
         }
 
         public virtual void DumpData()

src/kOS/Suffixed/ScienceDataValue.cs

@@ -8,10 +8,12 @@ namespace kOS.Suffixed
     public class ScienceDataValue : Structure
     {
         private ScienceData scienceData;
+        private global::Part hostPart;
 
-        public ScienceDataValue(ScienceData scienceData)
+        public ScienceDataValue(ScienceData scienceData, global::Part hostPart)
         {
             this.scienceData = scienceData;
+            this.hostPart = hostPart;
 
             InitializeSuffixes();
         }
@@ -27,18 +29,29 @@ private void InitializeSuffixes()
         public float ScienceValue()
         {
             ScienceSubject subjectByID = ResearchAndDevelopment.GetSubjectByID(scienceData.subjectID);
-
-            return ResearchAndDevelopment.GetScienceValue(scienceData.dataAmount, subjectByID, 1) *
-                HighLogic.CurrentGame.Parameters.Career.ScienceGainMultiplier;
+
+            if (subjectByID != null) // fix return values in sandbox mode
+            {
+                return ResearchAndDevelopment.GetScienceValue(scienceData.dataAmount, subjectByID, 1) *
+                    HighLogic.CurrentGame.Parameters.Career.ScienceGainMultiplier;
+            }
+            else
+            {
+                return 0;
+            }
         }
 
         public float TransmitValue()
         {
-            ScienceSubject subjectByID = ResearchAndDevelopment.GetSubjectByID(scienceData.subjectID);
-
-            // TODO: make sure transmitValue became transmitBonus
-            return ResearchAndDevelopment.GetScienceValue(scienceData.dataAmount, subjectByID, scienceData.transmitBonus) *
-                HighLogic.CurrentGame.Parameters.Career.ScienceGainMultiplier;
+            // By using ExperimentResultDialogPage we ensure that the logic calculating the value is exactly the same
+            // as that used KSP's dialog.  The page type doesn't include any UI code itself, it just does the math to
+            // confirm the values, and stores some callbacks for the UI to call when buttons are pressed.
+            ExperimentResultDialogPage page = new ExperimentResultDialogPage(
+                hostPart, scienceData, scienceData.baseTransmitValue, scienceData.transmitBonus, // the parameters with data we care aboue
+                false, "", false, // disable transmit warning and reset option, these are used for the UI only
+                new ScienceLabSearch(hostPart.vessel, scienceData), // this is used to calculate the transmit bonus, I think...
+                null, null, null, null); // null callbacks, no sense in creating objects when we won't actually perform the callback.
+            return page.baseTransmitValue * page.TransmitBonus;
         }
 
         public new string ToString()