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

Release 0.2.0
post-kerbin-mining-corporation · Nov 25, 2020 · a2c26e9 · a2c26e9
2 parents 71fda9a + 79b5729
commit a2c26e9
Show file tree

Hide file tree

Showing 14 changed files with 276 additions and 33 deletions.
diff --git a/GameData/SpaceDust/Localization/en-us.cfg b/GameData/SpaceDust/Localization/en-us.cfg
@@ -119,12 +119,15 @@ Localization
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Instrument_DisplayName = Telescope Instrument
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Instrument_Info = Instrument Slot
 
+    #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Modifier_Title = Atmosphere
+    #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Modifier_InAtmo = Path Length <<1>>
+
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Status_Title = Status
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Status_NoTarget = No body targeted
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Status_NoPower = Not enough Electric Charge!
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Status_Disabled = Disabled
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Status_Observing = Observing <<1>>
-
+    #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Status_Blocked = Blocked by <<1>>
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Instrument_None = Not Installed
 
     #LOC_SpaceDust_ModuleSpaceDustTelescope_Field_Instrument_Title = Instrument
@@ -159,6 +162,8 @@ Localization
     #LOC_SpaceDust_ModuleSpaceDustHarvester_Info_Header = Harvests atmospheric and/or exospheric resources. \n\n<b>Harvester Type:</b> <<1>>\n<b>Static Intake Speed:</b> <<2>> m/s\n<b>Power Cost:</b> <<3>> kW\n\n<b>Harvestable Resources</b>:\n
     #LOC_SpaceDust_ModuleSpaceDustHarvester_Info_Resource = <b><color=#99ff00><<1>></color>: </b><<2>>% Efficiency\n
 
+    #LOC_SpaceDust_ModuleSpaceDustHarvester_Info_Header_SystemHeat = Harvests atmospheric and/or exospheric resources. \n\n<b>Harvester Type:</b> <<1>>\n<b>Static Intake Speed:</b> <<2>> m/s\n<b>Power Cost:</b> <<3>> kW\n\n<b>Thermal Parameters</b>\n<b><color=#ff730d>Thermal Output:</color></b> <<4>> kW\n<b><color=#ff730d>System Temperature:</color></b> <<5>> K\n<b><color=#ff730d>Maximum Temperature:</color></b> <<6>> K \n\n<b>Harvestable Resources</b>:\n
+
     #LOC_SpaceDust_ModuleSpaceDustHarvester_Event_EnableScanner = Start Harvesting
     #LOC_SpaceDust_ModuleSpaceDustHarvester_Event_DisableScanner = Stop Harvesting
 
@@ -178,5 +183,7 @@ Localization
     #LOC_SpaceDust_ModuleSpaceDustHarvester_Field_Scoop_NeedsVacuum =  Cannot harvest in atmosphere!
     #LOC_SpaceDust_ModuleSpaceDustHarvester_Field_Scoop_Resource = <b><<1>></b>: <<2>> u/s
 
+    #LOC_SpaceDust_ModuleSpaceDustHarvester_Field_Thermal = Efficiency
+    #LOC_SpaceDust_ModuleSpaceDustHarvester_Field_Thermal_Running = <<1>>%
   }
 }
diff --git a/GameData/SpaceDust/Patches/SpaceDustHarvestersSystemHeat.cfg b/GameData/SpaceDust/Patches/SpaceDustHarvestersSystemHeat.cfg
@@ -0,0 +1,56 @@
+// Adds SystemHeat support
+
+@PART[spacedust-atmosphere-processor-125-1]:FOR[SpaceDust]:NEEDS[SystemHeat]
+{
+  MODULE
+  {
+    name = ModuleSystemHeat
+    // Cubic metres
+    volume = 2
+    moduleID = isru
+    iconName = Icon_Gears
+  } 
+
+  @MODULE[ModuleSpaceDustHarvester]
+  {
+    ModuleID = harvester
+    HeatModuleID = isru
+    SystemOutletTemperature = 400
+    ShutdownTemperature = 600
+    SystemPower = 25
+    SystemEfficiency
+    {
+      key = 0 1.0
+      key = 400 1.0
+      key = 600 0.0
+    }
+  }
+}
+
+@PART[spacedust-atmosphere-processor-25-1]:FOR[SpaceDust]:NEEDS[SystemHeat]
+{
+  MODULE
+  {
+    name = ModuleSystemHeat
+    // Cubic metres
+    volume = 6
+    moduleID = isru
+    iconName = Icon_Gears
+  }
+
+  @MODULE[ModuleSpaceDustHarvester]
+  {
+    ModuleID = harvester
+    HeatModuleID = isru
+    SystemOutletTemperature = 400
+    ShutdownTemperature = 600
+
+    SystemPower = 75
+    SystemEfficiency
+    {
+      key = 0 1.0
+      key = 400 1.0
+      key = 600 0.0
+    }
+  }
+}
diff --git a/GameData/SpaceDust/Plugins/SpaceDust.dll b/GameData/SpaceDust/Plugins/SpaceDust.dll
diff --git a/GameData/SpaceDust/SpaceDustInstruments.cfg b/GameData/SpaceDust/SpaceDustInstruments.cfg
@@ -16,6 +16,14 @@ SPACEDUST_INSTRUMENT
     Wavelength = 500 
     // Controls the base discovery rate (%)
     Sensitivity = 20
+
+    // Maps atmosphere mass to effect on discovery rate
+    AtmosphereEffect
+    {
+        key = 0 1.0
+        key = 70000 0.5
+        key = 500000 0.0
+    }
 }
 
 SPACEDUST_INSTRUMENT
@@ -35,6 +43,13 @@ SPACEDUST_INSTRUMENT
 
     // Controls the base discovery rate (%)
     Sensitivity = 75
+    // Maps atmosphere mass to effect on discovery rate
+    AtmosphereEffect
+    {
+        key = 0 1.0
+        key = 70000 0.5
+        key = 500000 0.0
+    }
 }
 
 SPACEDUST_INSTRUMENT
@@ -54,6 +69,13 @@ SPACEDUST_INSTRUMENT
 
     // Controls the base discovery rate (%)
     Sensitivity = 50
+    // Maps atmosphere mass to effect on discovery rate
+    AtmosphereEffect
+    {
+        key = 0 1.0
+        key = 70000 0.5
+        key = 500000 0.0
+    }
 }
 
 SPACEDUST_INSTRUMENT
@@ -73,6 +95,13 @@ SPACEDUST_INSTRUMENT
 
     // Controls the base discovery rate (%)
     Sensitivity = 50
+    // Maps atmosphere mass to effect on discovery rate
+    AtmosphereEffect
+    {
+        key = 0 1.0
+        key = 70000 0.5
+        key = 500000 0.0
+    }
 }
 
 
@@ -93,6 +122,14 @@ SPACEDUST_INSTRUMENT
 
     // Controls the base discovery rate (%)
     Sensitivity = 50
+    // Maps atmosphere mass to effect on discovery rate
+    // 70,000 ~= kerbin at a zenith of 0 degrees at sea level
+    AtmosphereEffect
+    {
+        key = 0 1.0
+        key = 70000 0.5
+        key = 500000 0.0
+    }
 }
 
 SPACEDUST_INSTRUMENT
@@ -112,4 +149,11 @@ SPACEDUST_INSTRUMENT
 
     // Controls the base discovery rate (%)
     Sensitivity = 50
+    // Maps atmosphere mass to effect on discovery rate
+    AtmosphereEffect
+    {
+        key = 0 1.0
+        key = 70000 0.5
+        key = 500000 0.0
+    }
 }
diff --git a/GameData/SpaceDust/Versioning/SpaceDust.version b/GameData/SpaceDust/Versioning/SpaceDust.version
@@ -5,8 +5,8 @@
     "VERSION":
     {
         "MAJOR":0,
-        "MINOR":1,
-        "PATCH":5,
+        "MINOR":2,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":