Skip to content

Commit 0400e6d

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 11 pull requests
- Pull request #1104 at f15bb6b: Handle simple adhesion within the axle module - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2391bc0: Automatic speed control - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1114 at 9a4a873: Fix color of DB in DrivingInfo when in setup with DPU fenced. (r1.6) - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1116 at 721d118: Fix Potential Hang in AnimatedPart.SetFrameWrap - Pull request #1118 at f1e0f35: Fix DPMode when last remote is moved to front. (r1.6) - Pull request #1119 at 57243f0: Re-add missing PR #1103 - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
13 parents 6f78429 + acd7144 + f15bb6b + e10390b + 2391bc0 + 387388e + 9a4a873 + 270f22f + 721d118 + f1e0f35 + 57243f0 + 5845a1a + 689494b commit 0400e6d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2580,13 +2580,13 @@ public virtual float GetAvailableTractionForceN(float t)
25802580
{
25812581
powerW = Math.Min(powerW, MaxPowerW * t * t * (1 - PowerReduction));
25822582

2583-
if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)
2583+
if (AbsTractionSpeedMpS > MaxSpeedMpS)
25842584
{
2585-
forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);
2585+
forceN = 0;
25862586
}
2587-
else if (AbsTractionSpeedMpS > MaxSpeedMpS)
2587+
else if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)
25882588
{
2589-
forceN = 0;
2589+
forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);
25902590
}
25912591
else
25922592
{

0 commit comments

Comments
 (0)