Don't clobber fuelFlowGUI, instead set it properly the way stock does…

…, and show a new massFlowGUI instead. Also cache whether we're displaying in kg/s or ton/s so we don't clobber strings we don't have to.
KSP-RO · May 24, 2021 · 1b79a1c · 1b79a1c
1 parent 1d90c97
commit 1b79a1c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/GameData/SolverEngines/Plugins/SolverEngines.dll b/GameData/SolverEngines/Plugins/SolverEngines.dll
diff --git a/SolverEngines/EngineModule.cs b/SolverEngines/EngineModule.cs
@@ -20,6 +20,9 @@ public abstract class ModuleEnginesSolver : ModuleEnginesFX, IModuleInfo, IEngin
         [KSPField(isPersistant = false, guiActive = true, guiName = "Current Throttle", guiFormat = "N2", guiUnits = "%")]
         public float actualThrottle;
 
+        [KSPField(guiActive = true, guiName = "Mass Flow", guiUnits = " kg/s", guiFormat = "F5")]
+        public float massFlowGui;
+
         [KSPField(isPersistant = false)]
         public double thrustUpperLimit = double.MaxValue;
 
@@ -74,6 +77,8 @@ public abstract class ModuleEnginesSolver : ModuleEnginesFX, IModuleInfo, IEngin
 
         protected const double invg0 = 1d / 9.80665d;
 
+        protected bool flowKG = true;
+
         #region Properties
 
         public virtual string EnginePartName => part.name;
@@ -105,7 +110,9 @@ virtual public void Start()
             currentThrottle = 0f;
             flameout = false;
             SetUnflameout();
-            Fields["fuelFlowGui"].guiUnits = " kg/sec";
+            Fields["fuelFlowGui"].guiActive = false;
+            Fields["massFlowGui"].guiUnits = " kg/s";
+            flowKG = true;
         }
 
         public override void OnStart(PartModule.StartState state)
@@ -231,6 +238,7 @@ protected void InitializeThrustTransforms()
             realIsp = 0f;
             finalThrust = 0f;
             fuelFlowGui = 0f;
+            massFlowGui = 0f;
             requestedThrottle = 0f;
 
             SetUnflameout();
@@ -377,6 +385,7 @@ virtual public void CalculateEngineParams()
                 }
                 realIsp = 0f;
                 fuelFlowGui = 0f;
+                massFlowGui = 0f;
                 producedThrust = 0d;
 
                 // If engine is not ignited, then UpdatePropellantStatus() will not be called so no point in updating propellant fraction
@@ -429,14 +438,25 @@ virtual public void CalculateEngineParams()
                     producedThrust = thrustUpperLimit + (producedThrust - thrustUpperLimit) * 0.1d;
 
                 // set fuel flow
+                fuelFlowGui = (float)(fuelFlow * mixtureDensityRecip / ratioSum);
                 if (fuelFlow > 1000d)
                 {
                     fuelFlow *= 0.001d;
-                    Fields["fuelFlowGui"].guiUnits = " ton/s";
+                    if (flowKG)
+                    {
+                        Fields["massFlowGui"].guiUnits = " ton/s";
+                        flowKG = false;
+                    }
                 }
                 else
-                    Fields["fuelFlowGui"].guiUnits = " kg/s";
-                fuelFlowGui = (float)fuelFlow;
+                {
+                    if (!flowKG)
+                    {
+                        Fields["massFlowGui"].guiUnits = " kg/s";
+                        flowKG = true;
+                    }
+                }
+                massFlowGui = (float)fuelFlow;
 
 
                 realIsp = (float)isp;