Skip to content

Commit 3e47e5b

Browse files
committed
Automatic merge of T1.5.1-1806-g5522fc5fa and 10 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at 6a5b9f5: Add Train Info tab to Help window (F1) - Pull request #1067 at f385422: Traction and dynamic brake retardation - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
12 parents 0012032 + 5522fc5 + 362e4e7 + bbc0013 + 6a5b9f5 + f385422 + 1f5ba4c + e9a66c1 + 3bbd537 + 37e2817 + 5845a1a + 689494b commit 3e47e5b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -2629,9 +2629,16 @@ protected virtual void UpdateDynamicBrakeForce(float elapsedClockSeconds)
26292629
{
26302630
DynamicBrakeCommandStartTime = Simulator.ClockTime;
26312631
}
2632-
if (!DynamicBrake && DynamicBrakeCommandStartTime + DynamicBrakeDelayS < Simulator.ClockTime)
2632+
if (!DynamicBrake)
26332633
{
2634-
DynamicBrake = true;
2634+
if (DynamicBrakeCommandStartTime + DynamicBrakeDelayS < Simulator.ClockTime)
2635+
{
2636+
DynamicBrake = true;
2637+
if (IsLeadLocomotive() && DynamicBrakeController?.CurrentValue > 0)
2638+
Simulator.Confirmer.ConfirmWithPerCent(CabControl.DynamicBrake, DynamicBrakeController.CurrentValue * 100);
2639+
}
2640+
else if (IsLeadLocomotive() && DynamicBrakeController?.CurrentValue > 0)
2641+
Simulator.Confirmer.Confirm(CabControl.DynamicBrake, CabSetting.On); // Keeping status string on screen so user knows what's happening
26352642
}
26362643
}
26372644
else if (DynamicBrakeForceN == 0 || !LocomotivePowerSupply.DynamicBrakeAvailable || Direction == Direction.N)

0 commit comments

Comments
 (0)