Skip to content

Commit 32c1767

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 9 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 35f0051: Automatic speed control - Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front. - Pull request #1108 at 343c792: Fix Horn, Bell, and MU light conditions on AI trains - Pull request #1109 at 0190043: Fix Erroneous Detection of Departure Before Passenger Boarding Completed - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1104 at f40920a: Handle simple adhesion within the axle module - Pull request #1081 at 689494b: Brake cuts power unification
11 parents f77a5b8 + acd7144 + e10390b + 35f0051 + f5eb3dc + 343c792 + 0190043 + 387388e + 5845a1a + f40920a + 689494b commit 32c1767

File tree

1 file changed

+6
-1
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions

1 file changed

+6
-1
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,12 @@ public void UpdateSimpleAdhesion(float elapsedClockSeconds)
14351435

14361436
float adhesionForceN = AxleWeightN * AdhesionLimit;
14371437
SlipPercent = Math.Abs(axleOutForceN) / adhesionForceN * 100;
1438-
if (SlipPercent > 100)
1438+
if (Car is MSTSSteamLocomotive steam && !steam.AdvancedAdhesionModel)
1439+
{
1440+
// Do not allow wheelslip on steam locomotives if simple adhesion is selected
1441+
SlipPercent = 0;
1442+
}
1443+
else if (SlipPercent > 100)
14391444
{
14401445
axleOutForceN = MathHelper.Clamp(axleOutForceN, -adhesionForceN, adhesionForceN);
14411446
// Simple adhesion, simple wheelslip conditions

0 commit comments

Comments
 (0)