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 2391bc0: Automatic speed control
- Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front.
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1114 at 9a4a873: Fix color of DB in DrivingInfo when in setup with DPU fenced.
- Pull request #1115 at 01c0838: Do not activate ETS switch if no suitable cars are attached
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1104 at f9691cf: Handle simple adhesion within the axle module
- Pull request #1081 at 689494b: Brake cuts power unification

Author: openrails-bot

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

@@ -250,7 +250,6 @@ public enum SlipControlType
         public float SteamStaticWheelForce;
         public float SteamTangentialWheelForce;
         public float SteamDrvWheelWeightLbs;  // Weight on each drive axle
-        public float PreviousThrottleSetting = 0.0f;  // Holds the value of the previous throttle setting for calculating the correct antislip speed
         float DebugTimer; // Used for debugging adhesion coefficient
         bool DebugSpeedReached = false; // Used for debugging adhesion coefficient
         float DebugSpeedIncrement = 1; // Used for debugging adhesion coefficient
@@ -2267,24 +2266,6 @@ public override void Update(float elapsedClockSeconds)
                     UpdateAxles(elapsedClockSeconds);
 
                     UpdateTrackSander(elapsedClockSeconds);
-
-                    if (this is MSTSDieselLocomotive || this is MSTSElectricLocomotive)  // Antislip and throttle down should only work on diesel or electric locomotives.
-                    {
-
-                        // If wheel slip waring activated, and antislip is set in ENG file then reduce throttle setting to a value below warning power
-                        if (WheelSlipWarning && AntiSlip)
-                        {
-                            ThrottleController.SetValue(PreviousThrottleSetting);
-                        }
-
-
-                        PreviousThrottleSetting = (ThrottlePercent / 100.0f) - 0.005f;
-                        PreviousThrottleSetting = MathHelper.Clamp(PreviousThrottleSetting, 0.0f, 1.0f); // Prevents parameter going outside of bounds 
-
-                        // If wheels slip and WheelslipCausesThrottleDown is set in engine file reduce throttle to 0 setting
-                        if (WheelslipCausesThrottleDown && WheelSlip)
-                            ThrottleController.SetValue(0.0f);
-                    }
                     break;
                 default:
                     break;
@@ -2745,18 +2726,34 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
             {
                 if (axle.DriveType == AxleDriveType.ForceDriven)
                 {
+                    float prevForceN = axle.DriveForceN;
                     axle.DriveForceN = TractiveForceN * axle.TractiveForceFraction;
                     if (SlipControlSystem == SlipControlType.Full)
                     {
                         // Simple slip control
                         // Motive force is reduced to the maximum adhesive force
                         // In wheelslip situations, motive force is set to zero
                         float adhesionLimit;
-                        if (axle.SlipSpeedPercent > 115) adhesionLimit = 0;
-                        else if (axle.SlipSpeedPercent > 95) adhesionLimit = axle.MaximumWheelAdhesion * (115 - axle.SlipSpeedPercent) / 20;
+                        if (axle.SlipPercent > 115) adhesionLimit = 0;
+                        else if (axle.SlipPercent > 95) adhesionLimit = axle.MaximumWheelAdhesion * (115 - axle.SlipSpeedPercent) / 20;
                         else adhesionLimit = axle.MaximumWheelAdhesion;
                         axle.DriveForceN = Math.Sign(axle.DriveForceN) * Math.Min(adhesionLimit * axle.AxleWeightN, Math.Abs(axle.DriveForceN));
                     }
+                    else if (TractionForceN > 0) // only for traction (not for dynamic brake)
+                    {
+                        if (WheelslipCausesThrottleDown && WheelSlip)
+                        {
+                            // Disable traction in the axle if slipping
+                            axle.DriveForceN = 0;
+                        }
+                        else if (AntiSlip && AdvancedAdhesionModel && WheelSlipWarning)
+                        {
+                            // Reduce tractive force to 0 in 3 seconds until wheel slip warning ends
+                            float newForceN = Math.Max(Math.Abs(prevForceN) - TractiveForceN * axle.TractiveForceFraction * elapsedClockSeconds / 3, 0);
+                            if (axle.DriveForceN > 0 && prevForceN >= 0) axle.DriveForceN = newForceN;
+                            else if (axle.DriveForceN < 0 && prevForceN <= 0) axle.DriveForceN = -newForceN;
+                        }
+                    }
                 }
             }
         }