Merge pull request #1103 from cesarBLG/controller-delays

twpol · web-flow · commit 57243f0535fa · 2025-06-08T14:04:54.000+01:00
Fix diverging force when exceeding max speed
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2547,14 +2547,14 @@ public virtual float GetAvailableTractionForceN(float t)
             if (TractiveForceCurves == null)
             {
                 powerW = Math.Min(powerW, MaxPowerW * t * t * (1 - PowerReduction));
-
-                if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)
+                
+                if (AbsTractionSpeedMpS > MaxSpeedMpS)
                 {
-                    forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);
+                    forceN = 0;
                 }
-                else if (AbsTractionSpeedMpS > MaxSpeedMpS)
+                else if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)
                 {
-                    forceN = 0;
+                    forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -2547,14 +2547,14 @@ public virtual float GetAvailableTractionForceN(float t)`
`2547`	`2547`	`if (TractiveForceCurves == null)`
`2548`	`2548`	`{`
`2549`	`2549`	`powerW = Math.Min(powerW, MaxPowerW * t * t * (1 - PowerReduction));`
`2550`		`-`
`2551`		`- if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)`
	`2550`	`+`
	`2551`	`+ if (AbsTractionSpeedMpS > MaxSpeedMpS)`
`2552`	`2552`	`{`
`2553`		`- forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);`
	`2553`	`+ forceN = 0;`
`2554`	`2554`	`}`
`2555`		`- else if (AbsTractionSpeedMpS > MaxSpeedMpS)`
	`2555`	`+ else if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)`
`2556`	`2556`	`{`
`2557`		`- forceN = 0;`
	`2557`	`+ forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);`
`2558`	`2558`	`}`
`2559`	`2559`	`else`
`2560`	`2560`	`{`