Merge pull request #54 from post-kerbin-mining-corporation/dev

Release 0.5.1

GameData/SpaceDust/Patches/VABOrganizer/SpaceDustSubcategoryAssignment.cfg

@@ -0,0 +1,15 @@
+/// Adds the parts added to a new VABOrganizer category
+@PART[spacedust-atmosphere-processor-25-1,spacedust-atmosphere-processor-125-1]:FOR[SystemHeat]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = resources
+  }
+}
+@PART[spacedust-gas-analyzer-1,spacedust-spectrometer-1,spacedust-telescope-1]:FOR[SystemHeat]:NEEDS[VABOrganizer]
+{
+  %VABORGANIZER
+  {
+    %organizerSubcategory = resourceScanners
+  }
+}

GameData/SpaceDust/Versioning/SpaceDust.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":5,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

Source/SpaceDust/Modules/ModuleSpaceDustHarvester.cs

@@ -457,10 +457,10 @@ void DoFocusedHarvesting(double scale)
 
             if (resourceSample > resources[i].MinHarvestValue)
             {
-              double resAmt = (resourceSample * intakeVolume) * (1d / resources[i].density) * resources[i].BaseEfficiency * scale;
-                ScoopUI += "\n ";
+              double resAmt = (resourceSample * intakeVolume) * resources[i].BaseEfficiency * scale;
+              ScoopUI += "\n ";
               ScoopUI += Localizer.Format("#LOC_SpaceDust_ModuleSpaceDustHarvester_Field_Scoop_Resource", resources[i].Name, resAmt.ToString("G5"));
-              part.RequestResource(resources[i].Name, -resAmt * resources[i].density * TimeWarp.fixedDeltaTime, ResourceFlowMode.ALL_VESSEL, false);
+              part.RequestResource(resources[i].Name, -resAmt * (1d / resources[i].density) * TimeWarp.fixedDeltaTime, ResourceFlowMode.ALL_VESSEL, false);
             }
 
           }
@@ -515,13 +515,13 @@ void DoFocusedHarvesting(double scale)
               //  $"speedstatic {IntakeSpeedStatic}," +
               //  $"worldvel {worldVelocity.magnitude}");
 
-              double resAmt = resourceSample * intakeVolume * 1d / resources[i].density * resources[i].BaseEfficiency * scale;
+              double resAmt = resourceSample * intakeVolume * resources[i].BaseEfficiency * scale;
               if (ScoopUI != "")
                 ScoopUI += "\n";
               ScoopUI += Localizer.Format("#LOC_SpaceDust_ModuleSpaceDustHarvester_Field_Scoop_Resource", resources[i].Name, resAmt.ToString("G3"));
 
               //Utils.Log($"[SpaceDustHarveste] sampled {resources[i].Name} @ {resourceSample}. Harvesting {resAmt * TimeWarp.fixedDeltaTime} at step {TimeWarp.fixedDeltaTime}");
-              part.RequestResource(resources[i].Name, -resAmt * TimeWarp.fixedDeltaTime, ResourceFlowMode.ALL_VESSEL, false);
+              part.RequestResource(resources[i].Name, -resAmt * (1d / resources[i].density) * TimeWarp.fixedDeltaTime, ResourceFlowMode.ALL_VESSEL, false);
             }
 
           }

changelog.txt

@@ -1,3 +1,8 @@
+v0.5.1
+------
+- Fixed an issue with density calculations that was not included in the previous release
+- VABOrganizer support
+
 v0.5.0
 ------
 - Updated bundled MM to latest version

readme.txt

@@ -1,5 +1,5 @@
 ================
-SPACE DUST 0.5.0
+SPACE DUST 0.5.1
 ================
 
 This is a KSP mod designed to overhaul the atmospheric and exospheric mining experience in KSP. It functions both as a framework, providing part modules and distributions to others, and an actual gameplay mod designed to provide a set of parts focused around atmospheric ISRU in the stock system.