Add warning if no brake valve defined in wag file

Author: cesarBLG

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -222,10 +222,16 @@ public class MSTSWagon : TrainCar
         /// True if vehicle is equipped with an additional emergency brake reservoir
         /// </summary>
         public bool EmergencyReservoirPresent;
+        public enum BrakeValveType
+        {
+            None,
+            TripleValve, // Plain triple valve
+            Distributor, // Triple valve with graduated release
+        }
         /// <summary>
-        /// True if triple valve is capable of releasing brake gradually
+        /// Type of brake valve in the car
         /// </summary>
-        public bool DistributorPresent;
+        public BrakeValveType BrakeValve;
         /// <summary>
         /// True if equipped with handbrake. (Not common for older steam locomotives.)
         /// </summary>
@@ -1151,11 +1157,15 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                     {
                         switch (equipment)
                         {
+                            case "triple_valve": BrakeValve = BrakeValveType.TripleValve; break;
                             case "distributor":
-                            case "graduated_release_triple_valve": DistributorPresent = true; break;
+                            case "graduated_release_triple_valve": BrakeValve = BrakeValveType.Distributor; break;
                             case "emergency_brake_reservoir": EmergencyReservoirPresent = true; break;
                             case "handbrake": HandBrakePresent = true; break;
-                            case "auxiliary_reservoir": AuxiliaryReservoirPresent = true; break;
+                            case "auxilary_reservoir": // MSTS legacy parameter - use is discouraged
+                            case "auxiliary_reservoir":
+                                AuxiliaryReservoirPresent = true;
+                                break;
                             case "manual_brake": ManualBrakePresent = true; break;
                             case "retainer_3_position": RetainerPositions = 3; break;
                             case "retainer_4_position": RetainerPositions = 4; break;
@@ -1550,7 +1560,7 @@ public virtual void Copy(MSTSWagon copy)
             CarBrakeSystemType = copy.CarBrakeSystemType;
             BrakeSystem = MSTSBrakeSystem.Create(CarBrakeSystemType, this);
             EmergencyReservoirPresent = copy.EmergencyReservoirPresent;
-            DistributorPresent = copy.DistributorPresent;
+            BrakeValve = copy.BrakeValve;
             HandBrakePresent = copy.HandBrakePresent;
             ManualBrakePresent = copy.ManualBrakePresent;
             AuxiliaryReservoirPresent = copy.AuxiliaryReservoirPresent;

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

@@ -91,7 +91,7 @@ public AirSinglePipe(TrainCar car)
             DebugType = "1P";
 
             // Force graduated releasable brakes. Workaround for MSTS with bugs preventing to set eng/wag files correctly for this.
-            (Car as MSTSWagon).DistributorPresent |= Car.Simulator.Settings.GraduatedRelease;
+            if (Car.Simulator.Settings.GraduatedRelease) (Car as MSTSWagon).BrakeValve = MSTSWagon.BrakeValveType.Distributor;
 
             if (Car.Simulator.Settings.RetainersOnAllCars && !(Car is MSTSLocomotive))
                 (Car as MSTSWagon).RetainerPositions = 4;
@@ -312,6 +312,12 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
             if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && Car.CarLengthM <= 1)
             EmergResVolumeM3 = Math.Min (0.02f, EmergResVolumeM3);
 
+            if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && (Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.None)
+            {
+                (Car as MSTSWagon).BrakeValve = MSTSWagon.BrakeValveType.TripleValve;
+                Trace.TraceWarning("{0} does not define a brake valve, defaulting to a plain triple valve", (Car as MSTSWagon).WagFilePath);
+            }
+
             // In simple brake mode set emergency reservoir volume, override high volume values to allow faster brake release.
             if (Car.Simulator.Settings.SimpleControlPhysics && EmergResVolumeM3 > 2.0)
                 EmergResVolumeM3 = 0.7f;
@@ -358,7 +364,7 @@ public override void LocoInitializeMoving() // starting conditions when starting
 
         public void UpdateTripleValveState(float elapsedClockSeconds)
         {
-            if ((Car as MSTSWagon).DistributorPresent)
+            if ((Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.Distributor)
             {
                 float targetPressurePSI = (ControlResPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio;
                 if (targetPressurePSI > AutoCylPressurePSI && EmergencyValveActuationRatePSIpS > 0 && (prevBrakePipePressurePSI - BrakeLine1PressurePSI) > Math.Max(elapsedClockSeconds, 0.0001f) * EmergencyValveActuationRatePSIpS)
@@ -391,7 +397,7 @@ public void UpdateTripleValveState(float elapsedClockSeconds)
 
         public override void Update(float elapsedClockSeconds)
         {
-            float threshold = (Car as MSTSWagon).DistributorPresent ? (ControlResPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio : 0;
+            float threshold = ((Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.Distributor) ? (ControlResPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio : 0;
 
             if (BleedOffValveOpen)
             {
@@ -425,7 +431,7 @@ public override void Update(float elapsedClockSeconds)
                 float dp = elapsedClockSeconds * MaxApplicationRatePSIpS;
                 if (AuxResPressurePSI - dp / AuxCylVolumeRatio < AutoCylPressurePSI + dp)
                     dp = (AuxResPressurePSI - AutoCylPressurePSI) * AuxCylVolumeRatio / (1 + AuxCylVolumeRatio);
-                if ((Car as MSTSWagon).DistributorPresent && TripleValveState != ValveState.Emergency && dp > threshold - AutoCylPressurePSI)
+                if (((Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.Distributor) && TripleValveState != ValveState.Emergency && dp > threshold - AutoCylPressurePSI)
                     dp = threshold - AutoCylPressurePSI;
                 if (AutoCylPressurePSI + dp > MaxCylPressurePSI)
                     dp = MaxCylPressurePSI - AutoCylPressurePSI;
@@ -471,7 +477,7 @@ public override void Update(float elapsedClockSeconds)
 						AuxResPressurePSI -= dp * EmergAuxVolumeRatio;
 					}
 				}
-                if (AuxResPressurePSI < BrakeLine1PressurePSI && (!TwoPipes || !MRPAuxResCharging || !(Car as MSTSWagon).DistributorPresent || BrakeLine2PressurePSI < BrakeLine1PressurePSI) && !BleedOffValveOpen)
+                if (AuxResPressurePSI < BrakeLine1PressurePSI && (!TwoPipes || !MRPAuxResCharging || ((Car as MSTSWagon).BrakeValve != MSTSWagon.BrakeValveType.Distributor) || BrakeLine2PressurePSI < BrakeLine1PressurePSI) && !BleedOffValveOpen)
                 {
                     float dp = elapsedClockSeconds * MaxAuxilaryChargingRatePSIpS; // Change in pressure for train brake pipe.
                     if (AuxResPressurePSI + dp > BrakeLine1PressurePSI - dp * AuxBrakeLineVolumeRatio)
@@ -504,7 +510,7 @@ public override void Update(float elapsedClockSeconds)
             // Charge Auxiliary reservoir for MRP
             if (TwoPipes
                 && MRPAuxResCharging
-                && (Car as MSTSWagon).DistributorPresent
+                && ((Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.Distributor)
                 && AuxResPressurePSI < BrakeLine2PressurePSI
                 && AuxResPressurePSI < ControlResPressurePSI
                 && (BrakeLine2PressurePSI > BrakeLine1PressurePSI || TripleValveState != ValveState.Release) && !BleedOffValveOpen)