Fix wrong order of ifs

cesarBLG · cesarBLG · commit d2fae0f11f9d · 2025-06-03T07:39:01.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2575,14 +2575,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
`@@ -2575,14 +2575,14 @@ public virtual float GetAvailableTractionForceN(float t)`
`2575`	`2575`	`if (TractiveForceCurves == null)`
`2576`	`2576`	`{`
`2577`	`2577`	`powerW = Math.Min(powerW, MaxPowerW * t * t * (1 - PowerReduction));`
`2578`		`-`
`2579`		`- if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)`
	`2578`	`+`
	`2579`	`+ if (AbsTractionSpeedMpS > MaxSpeedMpS)`
`2580`	`2580`	`{`
`2581`		`- forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);`
	`2581`	`+ forceN = 0;`
`2582`	`2582`	`}`
`2583`		`- else if (AbsTractionSpeedMpS > MaxSpeedMpS)`
	`2583`	`+ else if (AbsTractionSpeedMpS > MaxSpeedMpS - 0.05f)`
`2584`	`2584`	`{`
`2585`		`- forceN = 0;`
	`2585`	`+ forceN = 20 * (MaxSpeedMpS - AbsTractionSpeedMpS) * MaxForceN * (1 - PowerReduction);`
`2586`	`2586`	`}`
`2587`	`2587`	`else`
`2588`	`2588`	`{`