Skip to content

Commit f5d196e

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 #1124 at e241a0d: Built-in PBL2 brake controller - 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 #1128 at 1d7643d: Particle Emitter Overhaul - Pull request #1157 at 805221e: Dynamic brake authorization by TCS
17 parents f1ffbf6 + a5be129 + e10390b + 2e06f85 + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + e241a0d + 8ae6bb7 + ba9e40a + 66dfd09 + 40f8c34 + 5845a1a + 689494b + 1d7643d + 805221e commit f5d196e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,8 @@ public override void Update(float elapsedClockSeconds)
17801780
}
17811781
}
17821782
}
1783-
if (loco.LocomotivePowerSupply.DynamicBrakeAvailable && loco.MaxDynamicBrakePercent > 0 && loco.DynamicBrakePercent > 0 && Car.FrictionBrakeBlendingMaxForceN > 0)
1783+
{
1784+
if (loco.LocomotivePowerSupply.DynamicBrakeAvailable && loco.MaxDynamicBrakePercent > 0 && loco.DynamicBrakePercent > 0 && Car.FrictionBrakeBlendingMaxForceN > 0)
17841785
{
17851786
if (loco.DynamicBrakePartialBailOff)
17861787
{
@@ -1818,7 +1819,7 @@ public override void Update(float elapsedClockSeconds)
18181819
}
18191820
}
18201821
}
1821-
}
1822+
}
18221823
if (loco.DynamicBrakeEngineBrakeReplacement && loco.RemoteControlGroup == 0 && loco.AbsTractionSpeedMpS < loco.DynamicBrakeEngineBrakeReplacementSpeed && loco.Train.LeadLocomotive is MSTSLocomotive lead && lead.TrainBrakeController.TrainDynamicBrakeIntervention > 0)
18231824
{
18241825
var requiredBrakeForceN = loco.MaxDynamicBrakeForceN * lead.TrainBrakeController.TrainDynamicBrakeIntervention;
@@ -1829,6 +1830,7 @@ public override void Update(float elapsedClockSeconds)
18291830
}
18301831
}
18311832
}
1833+
}
18321834
if (RelayValveFitted)
18331835
{
18341836
if (EmergencySolenoidValve)

Source/Orts.Simulation/Simulation/Simulator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
18421842

18431843
train.UncoupledFrom = train2;
18441844
train2.UncoupledFrom = train;
1845-
1845+
18461846
train2.SpeedMpS = train.SpeedMpS;
18471847

18481848
train.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;

0 commit comments

Comments
 (0)