Skip to content

Commit e8505cb

Browse files
committed
Automatic merge of T1.5.1-553-g4b9199858 and 14 pull requests
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #853 at d05f581: Notify out of focus - Pull request #855 at b39e5d8: Adds new route from TrainSimulations - Pull request #857 at 9afc8c3: Adding Air Flow Meters - Pull request #859 at fff2560: Steam adhesion bug#1 - Pull request #860 at d2b8a52: Changes in the Car Operations Menu for the lines with brake information - Pull request #862 at 489f261: Fix engine leak problem - Pull request #863 at a34b857: Alternate preset 3D cabviewpoints - Pull request #864 at 18c5481: Fixes for Undesired Emergency Applications - Pull request #865 at 9d8513a: Dispatcher window improvements - Pull request #866 at a6cbc52: Fix Articulation For 0-Axle Train Cars
16 parents b812b4d + 4b91998 + 98dd1a7 + 61bbf43 + d00beb9 + 410a585 + d05f581 + b39e5d8 + 9afc8c3 + fff2560 + d2b8a52 + 489f261 + a34b857 + 18c5481 + 9d8513a + a6cbc52 commit e8505cb

File tree

1 file changed

+8
-1
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS

1 file changed

+8
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,13 @@ public override void Initialize()
412412
Trace.TraceWarning("{0} does not define a brake valve, defaulting to a plain triple valve", (Car as MSTSWagon).WagFilePath);
413413
}
414414

415+
// Reducing reservoir charging rates when set unrealistically high
416+
if (Car.Simulator.Settings.CorrectQuestionableBrakingParams && (MaxAuxilaryChargingRatePSIpS > 10 || EmergResChargingRatePSIpS > 10))
417+
{
418+
MaxAuxilaryChargingRatePSIpS = Math.Min(MaxAuxilaryChargingRatePSIpS, 10.0f);
419+
EmergResChargingRatePSIpS = Math.Min(EmergResChargingRatePSIpS, 10.0f);
420+
}
421+
415422
// In simple brake mode set emergency reservoir volume, override high volume values to allow faster brake release.
416423
if (Car.Simulator.Settings.SimpleControlPhysics && EmergResVolumeM3 > 2.0)
417424
EmergResVolumeM3 = 0.7f;
@@ -473,7 +480,7 @@ public void UpdateTripleValveState(float elapsedClockSeconds)
473480
bool disableGradient = !(Car.Train.LeadLocomotive is MSTSLocomotive) && Car.Train.TrainType != Orts.Simulation.Physics.Train.TRAINTYPE.STATIC;
474481
// Small workaround to allow trains to more reliably go into emergency after uncoupling
475482
bool emergencyTripped = (Car.Train.TrainType == Orts.Simulation.Physics.Train.TRAINTYPE.STATIC) ?
476-
BrakeLine1PressurePSI <= EmergResPressurePSI * AuxCylVolumeRatio / (AuxCylVolumeRatio + 1) : Math.Max(-SmoothedBrakePipeChangePSIpS.SmoothedValue, 0) > EmergencyValveActuationRatePSIpS;
483+
BrakeLine1PressurePSI <= 0.75f * EmergResPressurePSI * AuxCylVolumeRatio / (AuxCylVolumeRatio + 1) : Math.Max(-SmoothedBrakePipeChangePSIpS.SmoothedValue, 0) > EmergencyValveActuationRatePSIpS;
477484

478485
if (valveType == MSTSWagon.BrakeValveType.Distributor)
479486
{

0 commit comments

Comments
 (0)