Skip to content

Commit 898d208

Browse files
committed
Automatic merge of T1.6-rc7-43-ge3d1d75f9 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 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - 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 fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
17 parents 9018080 + e3d1d75 + e10390b + 2e06f85 + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + 84f72b8 + 5e59187 + 66dfd09 + d2f2a02 + 5845a1a + 689494b + fab5457 + 1d7643d commit 898d208

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3514,6 +3514,17 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
35143514
axle.CurtiusKnifflerZeroSpeed = ZeroBaseuMax;
35153515
}
35163516
}
3517+
else
3518+
{
3519+
foreach (var axle in LocomotiveAxles)
3520+
{
3521+
if (axle.AdhesionLimit == 0)
3522+
{
3523+
axle.AdhesionLimit = BaseFrictionCoefficientFactor * AdhesionMultiplier;
3524+
axle.CurtiusKnifflerZeroSpeed = ZeroBaseuMax;
3525+
}
3526+
}
3527+
}
35173528

35183529
// Set adhesion conditions for other steam locomotives
35193530
if (EngineType == EngineTypes.Steam && SteamEngineType != MSTSSteamLocomotive.SteamEngineTypes.Geared) // ToDo explore adhesion factors

0 commit comments

Comments
 (0)