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

Release 0.5.2
post-kerbin-mining-corporation · Aug 11, 2021 · d089c79 · d089c79
2 parents ed02152 + fd20c1e
commit d089c79
Show file tree

Hide file tree

Showing 20 changed files with 113 additions and 29 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -8,7 +8,7 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
+    version: 4.2.1
     location: s3
   CommunityResourcePack:
     version: 1.4.2

diff --git a/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-125-1.cfg b/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-125-1.cfg
@@ -15,7 +15,7 @@
   !MODULE[ModuleActiveRadiator] {}
   !MODULE[RadioactiveStorageContainer] {}
 
-  @MODULE[ModuleEngines*] 
+  @MODULE[ModuleEngines*],*
   {
     @heatProduction = 0
   }

diff --git a/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-125-2.cfg b/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-125-2.cfg
@@ -8,7 +8,7 @@
   !MODULE[ModuleActiveRadiator] {}
   !MODULE[RadioactiveStorageContainer] {}
 
-  @MODULE[ModuleEngines*] 
+  @MODULE[ModuleEngines*],*
   {
     @heatProduction = 0
   }

diff --git a/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-25-1.cfg b/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-25-1.cfg
@@ -15,7 +15,8 @@
   !MODULE[ModuleActiveRadiator] {}
   !MODULE[RadioactiveStorageContainer] {}
 
-  @MODULE[ModuleEnginesFX] {
+  @MODULE[ModuleEngines*],* 
+  {
     @heatProduction = 0
   }
   RESOURCE

diff --git a/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-375-1.cfg b/Extras/SystemHeatFissionEngines/KerbalAtomics/ntr-sc-375-1.cfg
@@ -15,7 +15,7 @@
   !MODULE[ModuleActiveRadiator] {}
   !MODULE[RadioactiveStorageContainer] {}
 
-  @MODULE[ModuleEngines*] 
+  @MODULE[ModuleEngines*],*
   {
     @heatProduction = 0
   }

diff --git a/Extras/SystemHeatFissionEngines/RestockPlus/restock-engine-cherenkov.cfg b/Extras/SystemHeatFissionEngines/RestockPlus/restock-engine-cherenkov.cfg
@@ -4,10 +4,11 @@
   !MODULE[ModuleSystemHeatEngine] {}
   !MODULE[ModuleAlternator] {}
   !MODULE[RadioactiveStorageContainer] {}
-  @MODULE[ModuleEngines*] 
+
+  @MODULE[ModuleEngines*],*
   {
     @heatProduction = 0
-    }
+  }
 
   MODULE
   {

diff --git a/Extras/SystemHeatFissionEngines/Squad/nuclearEngine.cfg b/Extras/SystemHeatFissionEngines/Squad/nuclearEngine.cfg
@@ -7,7 +7,7 @@
   !MODULE[ModuleAlternator] {}
   !MODULE[RadioactiveStorageContainer] {}
 
-  @MODULE[ModuleEngines*] 
+  @MODULE[ModuleEngines*],*
   {
     @heatProduction = 0
   }

diff --git a/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatGridded.cfg b/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatGridded.cfg
@@ -8,7 +8,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {
@@ -44,7 +47,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {
@@ -80,7 +86,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {

diff --git a/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatHall.cfg b/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatHall.cfg
@@ -9,7 +9,10 @@
     iconName = Icon_Engine
   }
 
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
   MODULE
   {
     name = ModuleSystemHeatEngine
@@ -43,7 +46,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {
@@ -80,7 +86,10 @@
     iconName = Icon_Engine
   }
 
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
   MODULE
   {
     name = ModuleSystemHeatEngine

diff --git a/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatMPDT.cfg b/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatMPDT.cfg
@@ -9,7 +9,10 @@
     iconName = Icon_Engine
   }
 
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
   MODULE
   {
     name = ModuleSystemHeatEngine
@@ -43,7 +46,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+   @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {
@@ -79,7 +85,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+ @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {

diff --git a/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatPIT.cfg b/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatPIT.cfg
@@ -8,7 +8,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
-
+  @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
   MODULE
   {
@@ -43,6 +46,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
+  @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
 
   MODULE
@@ -79,6 +86,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
+  @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
 
   MODULE

diff --git a/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatVASIMR.cfg b/Extras/SystemHeatIonEngines/NearFuturePropulsion/NFPSystemHeatVASIMR.cfg
@@ -8,6 +8,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
+  @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
 
   MODULE
@@ -67,6 +71,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
+  @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
 
   MODULE
@@ -127,6 +135,10 @@
     moduleID = engine
     iconName = Icon_Engine
   }
+  @MODULE[ModuleEngines*],*
+  {
+    @heatProduction = 0
+  }
 
 
   MODULE

diff --git a/GameData/SystemHeat/Plugin/SystemHeat.dll b/GameData/SystemHeat/Plugin/SystemHeat.dll
diff --git a/GameData/SystemHeat/Versioning/SystemHeat.version b/GameData/SystemHeat/Versioning/SystemHeat.version
@@ -6,14 +6,14 @@
     {
         "MAJOR":0,
         "MINOR":5,
-        "PATCH":1,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":12,
-        "PATCH":1
+        "PATCH":2
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Your job, as the spacecraft engineer, is to construct Heat Loops such that they
 
 ### Required
 These components are required for the mod to function and are bundled as part of any download:
-* [ModuleManager (4.1.4)](https://github.com/sarbian/ModuleManager)
+* [ModuleManager (4.2.1)](https://github.com/sarbian/ModuleManager)
 * [Community Resource Pack (1.4.2)](https://github.com/BobPalmer/CommunityResourcePack)
 
 

diff --git a/SystemHeat/SystemHeat/Modules/ModuleSystemHeat.cs b/SystemHeat/SystemHeat/Modules/ModuleSystemHeat.cs
@@ -270,7 +270,7 @@ public void AddFlux(string id, float sourceTemperature, float flux, bool useForN
       {
         fluxes[id] = flux;
 
-        // If the flux is > 0, heat is being added to the system and we should track the temperature
+        // Add if used for nominal
         if (useForNominal)
         {
           temperatures[id] = sourceTemperature;
@@ -281,13 +281,25 @@ public void AddFlux(string id, float sourceTemperature, float flux, bool useForN
         }
 
         totalSystemFlux = fluxes.Sum(x => x.Value) * (float)(PhysicsGlobals.InternalHeatProductionFactor / 0.025d);
+
         totalSystemTemperature = temperatures.Sum(x => x.Value);
 
         float denom = (temperatures.Values.ToList().Where(x => x > 0f).Count());
+
         if (denom > 0)
           systemNominalTemperature = totalSystemTemperature / denom;
         else
           systemNominalTemperature = 0f;
+
+        totalSystemTemperature = systemNominalTemperature;
+        if (totalSystemTemperature == 0f)
+        {
+          ignoreTemperature = true;
+        }
+        else
+        {
+          ignoreTemperature = false;
+        }
       }
     }
 
@@ -314,8 +326,17 @@ public void UpdateSimulationValues(float nominalTemp, float currentTemp, float c
     protected void FixedUpdate()
     {
       SystemFluxUI = String.Format("{0:F0} kW", totalSystemFlux);
-      SystemTemperatureUI = String.Format("{0:F0} / {1:F0} K", LoopTemperature, nominalLoopTemperature);
-
+      if (totalSystemFlux > 0f)
+      {
+        Fields["SystemTemperatureUI"].guiActive = true;
+        Fields["SystemTemperatureUI"].guiActiveEditor = true;
+        SystemTemperatureUI = String.Format("{0:F0} / {1:F0} K", totalSystemTemperature, nominalLoopTemperature);
+      }
+      else
+      {
+        Fields["SystemTemperatureUI"].guiActive = false;
+        Fields["SystemTemperatureUI"].guiActiveEditor = false;
+      }
       if (simulator == null)
       {
         if (HighLogic.LoadedSceneIsFlight)

diff --git a/SystemHeat/SystemHeat/Modules/ModuleSystemHeatExchanger.cs b/SystemHeat/SystemHeat/Modules/ModuleSystemHeatExchanger.cs
@@ -212,6 +212,7 @@ protected void GenerateHeatEditor()
     {
       if (Enabled)
       {
+
         Fields["PowerStatus"].guiActive = true;
         Fields["PowerStatus"].guiActiveEditor = true;
         float outputHeat = HeatRate;
@@ -252,8 +253,9 @@ protected void GenerateHeatEditor()
         Fields["PowerStatus"].guiActive = false;
         Fields["PowerStatus"].guiActiveEditor = false;
         Status = Localizer.Format("#LOC_SystemHeat_ModuleSystemHeatExchanger_Field_Status_Disabled");
-        destModule.AddFlux(moduleID, 0f, 0f, false);
-        sourceModule.AddFlux(moduleID, 0f, 0f, false);
+
+        destModule.ignoreTemperature = true;
+        sourceModule.ignoreTemperature = true;
       }
     }
 

diff --git a/SystemHeat/SystemHeat/Modules/ModuleSystemHeatFissionEngine.cs b/SystemHeat/SystemHeat/Modules/ModuleSystemHeatFissionEngine.cs
@@ -53,7 +53,7 @@ public override string GetInfo()
         if (inputs[i].ResourceName == FuelName)
           baseRate = inputs[i].Ratio;
       }
-      if (HeatGeneration.Evaluate(0f) == 0)
+      if (HeatGeneration.Evaluate(100f) == 0)
       {
         return
           Localizer.Format("#LOC_SystemHeat_ModuleSystemHeatFissionEngine_PartInfo_Basic",

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+v0.5.2
+------
+- Updated ModuleManager to 4.2.1
+- Fixed NTR configs not removing stock heat generation from all engine mode
+- Ion engine configs now also remove all excess heat generation
+- Fixed System Temperature PAW field actually displaying loop temperature 
+- System Temperature PAW field is now hidden if system flux <= 0 kW as it is meaningless
+- Fixed loop integrator to handle cases with producers that are off better
+
 v0.5.1
 ------
 - Hotfix reactor configs

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ================
-SystemHeat 0.5.1
+SystemHeat 0.5.2
 ================
 
 A mod for Kerbal Space Program, intended to provide a better experience for heat management, particularly geared towards resource extraction, high energy engines, and nuclear reactors.
@@ -11,7 +11,7 @@ DEPENDENCIES
 
 Required:
 - Community Resource Pack (1.4.2)
-- ModuleManager (4.1.4)
+- ModuleManager (4.2.1)
 
 ============
 INSTALLATION