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

quick fix
post-kerbin-mining-corporation · Aug 11, 2021 · c6bf46f · c6bf46f
2 parents d089c79 + fc12ff1
commit c6bf46f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 deletions.
diff --git a/GameData/SystemHeat/Localization/en-us.cfg b/GameData/SystemHeat/Localization/en-us.cfg
@@ -83,6 +83,7 @@ Localization
     #LOC_SystemHeat_ModuleSystemHeat_Field_LoopID = Loop ID
     #LOC_SystemHeat_ModuleSystemHeat_Field_SystemFlux = System Flux
     #LOC_SystemHeat_ModuleSystemHeat_Field_SystemTemperature = System Temperature
+    #LOC_SystemHeat_ModuleSystemHeat_Field_LoopTemperature = Loop Temperature
 
     // ModuleSystemHeatRadiator
     /// =================================

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,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":5,
-        "PATCH":2,
+        "PATCH":3,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/SystemHeat/SystemHeat/Modules/ModuleSystemHeat.cs b/SystemHeat/SystemHeat/Modules/ModuleSystemHeat.cs
@@ -76,6 +76,10 @@ public class ModuleSystemHeat : PartModule
     [KSPField(isPersistant = false, guiActive = true, guiActiveEditor = true, guiName = "#LOC_SystemHeat_ModuleSystemHeat_Field_SystemTemperature", groupName = "sysheatinfo", groupDisplayName = "#LOC_SystemHeat_ModuleSystemHeat_GroupName", groupStartCollapsed = false)]
     public string SystemTemperatureUI = "-";
 
+    // Current total system flux of all associated modules
+    [KSPField(isPersistant = false, guiActive = true, guiActiveEditor = true, guiName = "#LOC_SystemHeat_ModuleSystemHeat_Field_LoopTemperature", groupName = "sysheatinfo", groupDisplayName = "#LOC_SystemHeat_ModuleSystemHeat_GroupName", groupStartCollapsed = false)]
+    public string LoopTemperatureUI = "-";
+
     public HeatLoop Loop
     {
       get {
@@ -326,11 +330,12 @@ public void UpdateSimulationValues(float nominalTemp, float currentTemp, float c
     protected void FixedUpdate()
     {
       SystemFluxUI = String.Format("{0:F0} kW", totalSystemFlux);
+      LoopTemperatureUI = String.Format("{0:F0} / {1:F0} K", currentLoopTemperature, nominalLoopTemperature);
       if (totalSystemFlux > 0f)
       {
         Fields["SystemTemperatureUI"].guiActive = true;
         Fields["SystemTemperatureUI"].guiActiveEditor = true;
-        SystemTemperatureUI = String.Format("{0:F0} / {1:F0} K", totalSystemTemperature, nominalLoopTemperature);
+        SystemTemperatureUI = String.Format("{0:F0} K", totalSystemTemperature);
       }
       else
       {

diff --git a/SystemHeat/SystemHeat/Modules/ModuleSystemHeatFissionEngine.cs b/SystemHeat/SystemHeat/Modules/ModuleSystemHeatFissionEngine.cs
@@ -68,7 +68,7 @@ public override string GetInfo()
           Localizer.Format("#LOC_SystemHeat_ModuleSystemHeatFissionEngine_PartInfo",
           ElectricalGeneration.Evaluate(100f).ToString("F0"),
           FindTimeRemaining(this.part.Resources.Get(PartResourceLibrary.Instance.GetDefinition(FuelName).id).amount, baseRate),
-          HeatGeneration.Evaluate(100f).ToString("F0"),
+          (HeatGeneration.Evaluate(100f) - ElectricalGeneration.Evaluate(100f)).ToString("F0"),
           NominalTemperature.ToString("F0"),
           NominalTemperature.ToString("F0"),
           CriticalTemperature.ToString("F0"),

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+v0.5.3
+------
+- Fixed ModuleFissionEngine displaying total heat instead of waste heat in part info
+- Changed display of temperatures in PAW - new 'Loop Temperatures' shows loop info, tuned the other fields
+
 v0.5.2
 ------
 - Updated ModuleManager to 4.2.1

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ================
-SystemHeat 0.5.2
+SystemHeat 0.5.3
 ================
 
 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.