Skip to content

Commit f77a5b8

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 9 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 35f0051: Automatic speed control - Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front. - Pull request #1108 at 343c792: Fix Horn, Bell, and MU light conditions on AI trains - Pull request #1109 at 0190043: Fix Erroneous Detection of Departure Before Passenger Boarding Completed - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1104 at dc485c5: Handle simple adhesion within the axle module - Pull request #1081 at 689494b: Brake cuts power unification
11 parents a6fa9ee + acd7144 + e10390b + 35f0051 + f5eb3dc + 343c792 + 0190043 + 387388e + 5845a1a + dc485c5 + 689494b commit f77a5b8

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3425,6 +3425,7 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
34253425
}
34263426

34273427
var AdhesionMultiplier = Simulator.Settings.AdhesionFactor / 100.0f; // Convert to a factor where 100% = no change to adhesion
3428+
if (!AdvancedAdhesionModel) AdhesionMultiplier = Math.Max(AdhesionMultiplier, 1.3f);
34283429
var AdhesionRandom = (float)((float)(Simulator.Settings.AdhesionFactorChange) * 0.01f * 2f * (Simulator.Random.NextDouble() - 0.5f));
34293430

34303431
Train.LocomotiveCoefficientFriction = BaseuMax * BaseFrictionCoefficientFactor * AdhesionMultiplier; // Find friction coefficient factor for locomotive

0 commit comments

Comments
 (0)