Add proper brake initialization code

Author: cesarBLG

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs

@@ -86,11 +86,11 @@ public abstract class BrakeSystem
         /// but for vacuum brakes it is a conversion to an internally used equivalent pressure.
         /// </summary>
         public abstract float InternalPressure(float realPressure);
-
         public abstract void Initialize(bool handbrakeOn, float maxPressurePSI, float fullServPressurePSI, bool immediateRelease);
         public abstract void SetHandbrakePercent(float percent);
         public abstract bool GetHandbrakeStatus();
         public abstract void SetRetainer(RetainerSetting setting);
+        public virtual void Initialize() {}
         public abstract void InitializeMoving(); // starting conditions when starting speed > 0
         public abstract void LocoInitializeMoving(); // starting conditions when starting speed > 0
         public abstract bool IsBraking(); // return true if the wagon is braking above a certain threshold

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

@@ -310,25 +310,6 @@ public override void Restore(BinaryReader inf)
 
         public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fullServPressurePSI, bool immediateRelease)
         {
-            // reducing size of Emergency Reservoir for short (fake) cars
-            if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && Car.CarLengthM <= 1)
-            EmergResVolumeM3 = Math.Min (0.02f, EmergResVolumeM3);
-
-            // Install a plain triple valve if no brake valve defined
-            // Do not install it for tenders if not defined, to allow tenders with straight brake only
-            if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && (Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.None && (Car as MSTSWagon).WagonType != TrainCar.WagonTypes.Tender)
-            {
-                (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;
-
-            if (MaxTripleValveCylPressurePSI == 0) MaxTripleValveCylPressurePSI = MaxCylPressurePSI / RelayValveRatio;
-            if (EngineRelayValveRatio == 0) EngineRelayValveRatio = RelayValveRatio;
-
             BrakeLine1PressurePSI = Car.Train.EqualReservoirPressurePSIorInHg;
             BrakeLine2PressurePSI = Car.Train.BrakeLine2PressurePSI;
             BrakeLine3PressurePSI = 0;
@@ -344,11 +325,32 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
             HoldingValve = ValveState.Release;
             HandbrakePercent = handbrakeOn & (Car as MSTSWagon).HandBrakePresent ? 100 : 0;
             SetRetainer(RetainerSetting.Exhaust);
-            MSTSLocomotive loco = Car as MSTSLocomotive;
-            if (loco != null) 
+            if (Car is MSTSLocomotive loco) 
             {
                 loco.MainResPressurePSI = loco.MaxMainResPressurePSI;
             }
+        }
+
+        public override void Initialize()
+        {
+            // reducing size of Emergency Reservoir for short (fake) cars
+            if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && Car.CarLengthM <= 1)
+            EmergResVolumeM3 = Math.Min (0.02f, EmergResVolumeM3);
+
+            // Install a plain triple valve if no brake valve defined
+            // Do not install it for tenders if not defined, to allow tenders with straight brake only
+            if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && (Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.None && (Car as MSTSWagon).WagonType != TrainCar.WagonTypes.Tender)
+            {
+                (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;
+
+            if (MaxTripleValveCylPressurePSI == 0) MaxTripleValveCylPressurePSI = MaxCylPressurePSI / RelayValveRatio;
+            if (EngineRelayValveRatio == 0) EngineRelayValveRatio = RelayValveRatio;
 
             if (EmergResVolumeM3 > 0 && EmergAuxVolumeRatio > 0 && BrakePipeVolumeM3 > 0)
                 AuxBrakeLineVolumeRatio = EmergResVolumeM3 / EmergAuxVolumeRatio / BrakePipeVolumeM3;
@@ -357,7 +359,7 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
 
             if (CylVolumeM3 == 0) CylVolumeM3 = EmergResVolumeM3 / EmergAuxVolumeRatio / AuxCylVolumeRatio;
 
-            RelayValveFitted |= (loco != null && (loco.DynamicBrakeAutoBailOff || loco.DynamicBrakePartialBailOff)) || (Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.DistributingValve;
+            RelayValveFitted |= (Car is MSTSLocomotive loco && (loco.DynamicBrakeAutoBailOff || loco.DynamicBrakePartialBailOff)) || (Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.DistributingValve;
         }
 
         /// <summary>

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -700,6 +700,7 @@ public struct CarTunnelInfoData
 
         public virtual void Initialize()
         {
+            BrakeSystem.Initialize();
             CurveSpeedDependent = Simulator.Settings.CurveSpeedDependent;
 
             //CurveForceFilter.Initialize();