Skip to content

Commit 91b0dc5

Browse files
committed
Automatic merge of T1.6-rc8-48-ga5be12922 and 15 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at ba9e40a: Status in Work Orders popup set too fast - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1155 at 40f8c34: fix for illegal characters in refeerence to Shape file - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at 00407cb: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul - Pull request #1157 at 9d79d0f: Dynamic brake authorization by TCS
17 parents 186d5a9 + a5be129 + e10390b + 2e06f85 + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + ba9e40a + 66dfd09 + 40f8c34 + 5845a1a + 689494b + 00407cb + 1d7643d + 9d79d0f commit 91b0dc5

File tree

1 file changed

+2
-5
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS

1 file changed

+2
-5
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,9 +1780,7 @@ public override void Update(float elapsedClockSeconds)
17801780
}
17811781
}
17821782
}
1783-
if (loco.LocomotivePowerSupply.DynamicBrakeAvailable)
1784-
{
1785-
if (loco.DynamicBrakePercent > 0 && Car.FrictionBrakeBlendingMaxForceN > 0)
1783+
if (loco.LocomotivePowerSupply.DynamicBrakeAvailable && loco.MaxDynamicBrakePercent > 0 && loco.DynamicBrakePercent > 0 && Car.FrictionBrakeBlendingMaxForceN > 0)
17861784
{
17871785
if (loco.DynamicBrakePartialBailOff)
17881786
{
@@ -1820,6 +1818,7 @@ public override void Update(float elapsedClockSeconds)
18201818
}
18211819
}
18221820
}
1821+
}
18231822
if (loco.DynamicBrakeEngineBrakeReplacement && loco.RemoteControlGroup == 0 && loco.AbsTractionSpeedMpS < loco.DynamicBrakeEngineBrakeReplacementSpeed && loco.Train.LeadLocomotive is MSTSLocomotive lead && lead.TrainBrakeController.TrainDynamicBrakeIntervention > 0)
18241823
{
18251824
var requiredBrakeForceN = loco.MaxDynamicBrakeForceN * lead.TrainBrakeController.TrainDynamicBrakeIntervention;
@@ -1830,8 +1829,6 @@ public override void Update(float elapsedClockSeconds)
18301829
}
18311830
}
18321831
}
1833-
}
1834-
}
18351832
if (RelayValveFitted)
18361833
{
18371834
if (EmergencySolenoidValve)

0 commit comments

Comments
 (0)