Correct issue with TE calculation

peternewell · peternewell · commit d33a9f6bbdbe · 2024-01-08T21:14:22.000+11:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
@@ -5588,7 +5588,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
             // only set advanced wheel slip when advanced adhesion, and simplecontrols/physics is not set and is in the the player train, AI locomotive will not work to this model. 
             // Don't use slip model when train is in auto pilot
             {
-                if (SteamEngineType != SteamEngineTypes.Geared || SteamEngines[numberofengine].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)
+                if ((SteamEngineType == SteamEngineTypes.Compound || SteamEngineType == SteamEngineTypes.Simple) && SteamEngines[numberofengine].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)
                 {
 
                     float slipCutoffPressureAtmPSI;
@@ -5901,7 +5901,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
 
                     if (SteamEngines[numberofengine].AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)
                     {
-                        GearRatioAdjusted = SteamEngines[numberofengine].BoosterCutoff;
+                        GearRatioAdjusted = SteamEngines[numberofengine].BoosterGearRatio;
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -5588,7 +5588,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv`
`5588`	`5588`	`// only set advanced wheel slip when advanced adhesion, and simplecontrols/physics is not set and is in the the player train, AI locomotive will not work to this model.`
`5589`	`5589`	`// Don't use slip model when train is in auto pilot`
`5590`	`5590`	`{`
`5591`		`- if (SteamEngineType != SteamEngineTypes.Geared \|\| SteamEngines[numberofengine].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)`
	`5591`	`+ if ((SteamEngineType == SteamEngineTypes.Compound \|\| SteamEngineType == SteamEngineTypes.Simple) && SteamEngines[numberofengine].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)`
`5592`	`5592`	`{`
`5593`	`5593`
`5594`	`5594`	`float slipCutoffPressureAtmPSI;`
`@@ -5901,7 +5901,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv`
`5901`	`5901`
`5902`	`5902`	`if (SteamEngines[numberofengine].AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)`
`5903`	`5903`	`{`
`5904`		`- GearRatioAdjusted = SteamEngines[numberofengine].BoosterCutoff;`
	`5904`	`+ GearRatioAdjusted = SteamEngines[numberofengine].BoosterGearRatio;`
`5905`	`5905`	`}`
`5906`	`5906`	`else`
`5907`	`5907`	`{`