Demand train brake if dynamic brake not available

cesarBLG · cesarBLG · commit c00f611bba42 · 2022-10-30T09:52:33.000+01:00
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;

Original file line number	Diff line number	Diff line change
`@@ -1351,7 +1351,8 @@ void SetTrainBrake(ref float brakePercent, float elapsedClockSeconds, float delt`
`1351`	`1351`	`{`
`1352`	`1352`	`if (deltaSpeedMpS > -SpeedDeltaToEnableFullTrainBrake)`
`1353`	`1353`	`{`
`1354`		`- if (!Locomotive.DynamicBrakeAvailable \|\| deltaSpeedMpS < -SpeedDeltaToEnableTrainBrake)`
	`1354`	`+ bool dynamicBrakeAvailable = Locomotive.DynamicBrakeAvailable && Locomotive.LocomotivePowerSupply.DynamicBrakeAvailable && Locomotive.AbsSpeedMpS > Locomotive.DynamicBrakeSpeed1MpS;`
	`1355`	`+ if (!dynamicBrakeAvailable \|\| deltaSpeedMpS < -SpeedDeltaToEnableTrainBrake)`
`1355`	`1356`	`{`
`1356`	`1357`	`CCIsUsingTrainBrake = true;`
`1357`	`1358`	`brakePercent = TrainBrakeMinPercentValue - 3.0f + (-deltaSpeedMpS * 10)/SpeedDeltaToEnableTrainBrake;`