More initialization tweaks

Author: SteelFill

Source/Documentation/Manual/physics.rst

@@ -3120,10 +3120,10 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
   Relay valves may be installed to achieve higher brake cylinder pressures,
   dynamic brake blending or variable load compensation.
 - ``Wagon(ORTSBrakeRelayValveInshot`` -- Sets the "in-shot" pressure for the relay
-  valve. Relay valves with a ratio less than 1 may not produce sufficient pressure
-  to extend the brake cylinders. In-shot solves this problem by applying additional
-  pressure at a 1:1 ratio, regardless of the actual relay valve ratio. The pressure
-  defined here is the maximum amount of additional pressure to apply.
+  valve. This pressure will be added to the regular output of the relay valve for any
+  application, effectively setting a minimum brake cylinder pressure. Many step down
+  relay valves (ratio less than 1) utilize in-shot to ensure brake cylinders extend
+  fully for light train brake applications.
 - ``Wagon(ORTSEngineBrakeRelayValveRatio`` -- Same as ``ORTSBrakeRelayValveRatio``,
   but for the engine brake.
 - ``Wagon(ORTSEngineBrakeRelayValveInshot`` -- Same as ``ORTSBrakeRelayValveInshot``,

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

@@ -488,13 +488,13 @@ public override void Initialize()
             if (Car.Simulator.Settings.SimpleControlPhysics && EmergResVolumeM3 > 2.0)
                 EmergResVolumeM3 = 0.7f;
 
-            if (ServiceMaxCylPressurePSI == 0)
-                ServiceMaxCylPressurePSI = MaxTripleValveCylPressurePSI;
+            // Set default values for any optional tokens that are unset
             if (MaxTripleValveCylPressurePSI == 0)
                 MaxTripleValveCylPressurePSI = MaxCylPressurePSI / RelayValveRatio;
+            if (ServiceMaxCylPressurePSI == 0)
+                ServiceMaxCylPressurePSI = MaxTripleValveCylPressurePSI;
             if (EngineRelayValveRatio == 0)
                 EngineRelayValveRatio = RelayValveRatio;
-
             if (ServiceApplicationRatePSIpS == 0)
                 ServiceApplicationRatePSIpS = MaxApplicationRatePSIpS;
 
@@ -544,7 +544,7 @@ public override void Initialize()
 
             RelayValveFitted |= (Car is MSTSLocomotive loco && (loco.DynamicBrakeAutoBailOff || loco.DynamicBrakePartialBailOff)) ||
                 (Car as MSTSWagon).BrakeValve == MSTSWagon.BrakeValveType.DistributingValve || (Car as MSTSWagon).SupplyReservoirPresent ||
-                TwoStageRelayValveRatio != 0;
+                TwoStageRelayValveRatio != 0 || RelayValveInshot != 0 || EngineRelayValveInshot != 0;
 
             // If user specified only one two stage speed, set the other to be equal
             if (TwoStageSpeedDownMpS == 0 && TwoStageSpeedUpMpS > 0)