Fix steam emitters for booster engine

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -135,7 +135,7 @@ public class MSTSSteamLocomotive : MSTSLocomotive
         public bool BoosterGearsEngaged = false;
         public bool SteamBoosterLatchedLocked = false;
         public float SteamBoosterPressurePSI;
-        float BoosterGearEngageTimeS;
+        float BoosterGearEngageTimerS;
         float BoosterIdleHeatingTimerS;
         float BoosterIdleHeatingTimePeriodS = 120; // This is the time period that the Booster needs to be idled to heat it up
         bool BoosterIdleHeatingTimerReset = false;
@@ -2301,7 +2301,7 @@ public override void Update(float elapsedClockSeconds)
                         BoosterCylinderSteamExhaustOn = false;
                         BoosterCylinderCocksOn = true;
                         enginethrottle = 0.0f;
-                        BoosterGearEngageTimeS = 0;
+                        BoosterGearEngageTimerS = 0;
 
                         // Allow time for cylinders to heat up
                         if (!BoosterIdleHeatingTimerReset)
@@ -2326,7 +2326,7 @@ public override void Update(float elapsedClockSeconds)
 
 //                        Trace.TraceInformation("Run Mode - Timer {0} GearPeriod {1}", BoosterGearEngageTimeS, BoosterGearEngageTimePeriodS);
 
-                        if (BoosterGearEngageTimeS > BoosterGearEngageTimePeriodS) // Booster gears engaged
+                        if (BoosterGearEngageTimerS > BoosterGearEngageTimePeriodS) // Booster gears engaged
                         {
                             enginethrottle = throttle;
                             BoosterCylinderSteamExhaustOn = true;
@@ -2336,12 +2336,17 @@ public override void Update(float elapsedClockSeconds)
                             BoosterIdleHeatingTimerS = 0;
                           //  Trace.TraceInformation("Run Mode - " );
                         }
-                        else
+                        else // Booster gears have not engaged yet
                         {
                             BoosterCylinderSteamExhaustOn = false;
                             BoosterCylinderCocksOn = true;
-                        }
-                        BoosterGearEngageTimeS += elapsedClockSeconds;                        
+                            BoosterGearEngageTimerS += elapsedClockSeconds;
+                        }                     
+                    }
+                    else if (SteamBoosterAirOpen && SteamBoosterIdle) // Move booster to run mode, but not latched
+                    {
+                        BoosterCylinderSteamExhaustOn = false;
+                        BoosterCylinderCocksOn = true;
                     }
                     else if (!SteamBoosterAirOpen || !SteamBoosterLatchedLocked) // Turn Booster off completely
                     {
@@ -2350,7 +2355,7 @@ public override void Update(float elapsedClockSeconds)
                         BoosterCylinderSteamExhaustOn = false;
                         BoosterCylinderCocksOn = false;
                         enginethrottle = 0;
-                        BoosterGearEngageTimeS = 0;
+                        BoosterGearEngageTimerS = 0;
                         BoosterIdleHeatingTimerReset = false;
                         BoosterCylinderSteamExhaustOn = false;
                         BoosterGearsEngaged = false;
@@ -7146,6 +7151,19 @@ public override string GetDebugStatus()
                 BoosterGearsEngaged ? Simulator.Catalog.GetString("On") : Simulator.Catalog.GetString("Off")
                 );
 
+            // Temporary debug script.
+            status.AppendFormat("{0}\t{1}\t{2:N2}\t{3}\t{4:N2}\t{5}\t{6:N2}\t{7}\t{8}\n",
+                Simulator.Catalog.GetString("Boost:"),
+                Simulator.Catalog.GetString("GearT"),
+                BoosterGearEngageTimerS,
+                Simulator.Catalog.GetString("GearP"),
+                BoosterGearEngageTimePeriodS,
+                Simulator.Catalog.GetString("IdleT"),
+                BoosterIdleHeatingTimerS,
+                Simulator.Catalog.GetString("IdleP"),
+                BoosterIdleHeatingTimePeriodS
+                );
+
 #if DEBUG_LOCO_STEAM_USAGE
             status.AppendFormat("{0}\t{1}\t{2:N2}\t{3}\t{4:N2}\t{5}\t{6:N2}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12:N2}\t{13}\t{14:N2}\t{15}\t{16:N2}\t{17}\t{18:N2}\t{19}\t{20:N2}\t{21}\t{22}\n",
                 "DbgUse:",

Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs

@@ -19,6 +19,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Microsoft.Xna.Framework;
 using Orts.Common;
 using Orts.Simulation;
@@ -326,11 +327,12 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                 drawer.SetOutput(car.CylinderSteamExhaustSteamVelocityMpS, car.CylinderSteamExhaust3SteamVolumeM3pS, car.CylinderSteamExhaustParticleDurationS);
 
             foreach (var drawer in BoosterCylinderSteamExhaust01)
-                drawer.SetOutput(car.BoosterCylinderSteamExhaust01SteamVelocityMpS, car.BoosterCylinderSteamExhaust01SteamVolumeM3pS, car.CylinderSteamExhaustParticleDurationS);
+                drawer.SetOutput(car.BoosterCylinderSteamExhaust01SteamVelocityMpS, car.BoosterCylinderSteamExhaust01SteamVolumeM3pS, car.BoosterCylinderCockParticleDurationS);
 
-            foreach (var drawer in BoosterCylinderSteamExhaust02)
-                drawer.SetOutput(car.BoosterCylinderSteamExhaust02SteamVelocityMpS, car.BoosterCylinderSteamExhaust02SteamVolumeM3pS, car.CylinderSteamExhaustParticleDurationS);
 
+            foreach (var drawer in BoosterCylinderSteamExhaust02)
+                drawer.SetOutput(car.BoosterCylinderSteamExhaust02SteamVelocityMpS, car.BoosterCylinderSteamExhaust02SteamVolumeM3pS, car.BoosterCylinderCockParticleDurationS);
+                
             foreach (var drawer in BoosterCylinders11)
                 drawer.SetOutput(car.BoosterCylinderCock11SteamVelocityMpS, car.BoosterCylinderCockSteam11VolumeMpS, car.BoosterCylinderCockParticleDurationS);