Skip to content

Commit 18ff734

Browse files
committed
Fix improved by Sharpe49
1 parent c285678 commit 18ff734

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -982,20 +982,14 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
982982
switch (loadUnits)
983983
{
984984
case CABViewControlUnits.AMPS:
985-
if (ThrottlePercent > 0)
985+
if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)
986986
{
987987
data = (data / MaxForceN) * MaxCurrentA;
988988
}
989-
if (DynamicBrakePercent > 0)
989+
if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)
990990
{
991991
data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
992992
}
993-
if (ThrottlePercent == 0 && data > 0)
994-
{
995-
data = DynamicBrakePercent == -1? (data / MaxForceN) * MaxCurrentA
996-
: DynamicBrakePercent == 0? (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA
997-
: data;
998-
}
999993
status.AppendFormat("{0:F0} A", data);
1000994
break;
1001995

0 commit comments

Comments
 (0)