Merge pull request #1042 from SteelFill/triplevalve-improvements-2

Fix Emergency Brake Pressure Being Overridden

Author: SteelFill

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

@@ -1308,7 +1308,7 @@ public override void Update(float elapsedClockSeconds)
                         AutoCylPressurePSI += dp;
                     }
 
-                    if (EmergencyDumpValveTimerS == 0)
+                    if (EmergencyDumpValveTimerS == 0 && EmergencyDumpStartTime != null)
                     {
                         if (BrakeLine1PressurePSI < 1) EmergencyDumpStartTime = null;
                     }
@@ -1395,8 +1395,8 @@ public override void Update(float elapsedClockSeconds)
                     AutoCylPressurePSI -= dp;
             }
             // Special cases for equipment which bypasses triple valve
-            else if ((TwoStageLowSpeedActive && AutoCylPressurePSI > TwoStageLowPressurePSI) ||
-                (!TwoStageLowSpeedActive && AutoCylPressurePSI > ServiceMaxCylPressurePSI)) // Two stage braking
+            else if (TwoStageSpeedDownMpS > 0 && (TwoStageLowSpeedActive && AutoCylPressurePSI > TwoStageLowPressurePSI) ||
+                (TripleValveState != ValveState.Emergency && !TwoStageLowSpeedActive && AutoCylPressurePSI > ServiceMaxCylPressurePSI)) // Two stage braking
             {
                 float target = TwoStageLowSpeedActive ? TwoStageLowPressurePSI : ServiceMaxCylPressurePSI;
                 float dp = elapsedClockSeconds * ReleaseRatePSIpS;