Skip to content

Commit 30f6ab8

Browse files
authored
Merge pull request #530 from peternewell/steam_adhesion
Steam adhesion not applied to all locomotives in the player train.
2 parents 04375e6 + ea547da commit 30f6ab8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2788,6 +2788,7 @@ public virtual void UpdateWaterTroughRefill(float elapsedClockSeconds, float abs
27882788
/// Dry track = 0.33
27892789
///
27902790
/// The following values are indicatitive values only (sourced from Principles and Applications of Tribology).
2791+
/// https://books.google.com.au/books?id=LtYgBQAAQBAJ&pg=PA312&lpg=PA312&dq=Principles+and+Applications+of+Tribology+table+14.1&source=bl&ots=2hfz1WpEsM&sig=ACfU3U3U9y9Lwov9GORLaKCO10SCFHvjhA&hl=en&sa=X&ved=2ahUKEwi82NCF_Yr0AhWNTX0KHcGfB3QQ6AF6BAgMEAM#v=onepage&q=Principles%20and%20Applications%20of%20Tribology%20table%2014.1&f=false
27912792
/// Wet track (clean) = 0.18 <=> 0.2
27922793
/// Wet track (sand) = 0.22 <=> 0.25
27932794
/// Dew or fog = 0.09 <=> 0.15

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4652,8 +4652,8 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
46524652
// Typically tangential force will be greater at starting then when the locomotive is at speed, as interia and reduce steam pressure will decrease the value.
46534653
// By default this model uses information based upon a "NYC 4-4-2 locomotive", for smaller locomotives this data is changed in the OR initialisation phase.
46544654

4655-
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && this == Simulator.PlayerLocomotive && this.Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
4656-
// only set advanced wheel slip when advanced adhesion, and simplecontrols/physics is not set and is the player locomotive, AI locomotive will not work to this model.
4655+
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && IsPlayerTrain && this.Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
4656+
// 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.
46574657
// Don't use slip model when train is in auto pilot
46584658
{
46594659
float SlipCutoffPressureAtmPSI;

0 commit comments

Comments
 (0)