Demand train brake if dynamic brake not available

openrails · Oct 24, 2022 · 65741c7 · 65741c7
1 parent 50d4487
commit 65741c7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
@@ -1351,7 +1351,8 @@ void SetTrainBrake(ref float brakePercent, float elapsedClockSeconds, float delt
         {
             if (deltaSpeedMpS > -SpeedDeltaToEnableFullTrainBrake)
             {
-                if (!Locomotive.DynamicBrakeAvailable || deltaSpeedMpS < -SpeedDeltaToEnableTrainBrake)
+                bool dynamicBrakeAvailable = Locomotive.DynamicBrakeAvailable && Locomotive.LocomotivePowerSupply.DynamicBrakeAvailable && Locomotive.AbsSpeedMpS > Locomotive.DynamicBrakeSpeed1MpS;
+                if (!dynamicBrakeAvailable || deltaSpeedMpS < -SpeedDeltaToEnableTrainBrake)
                 {
                     CCIsUsingTrainBrake = true;
                     brakePercent = TrainBrakeMinPercentValue - 3.0f + (-deltaSpeedMpS * 10)/SpeedDeltaToEnableTrainBrake;