Automatic merge of T1.6-rc2-41-gacd714487 and 10 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 #1116 at 721d118: Fix Potential Hang in AnimatedPart.SetFrameWrap
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1104 at 128520d: 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

@@ -241,10 +241,14 @@ public float CurrentLocomotiveSteamHeatBoilerWaterCapacityL
         // Adhesion parameters
         public enum SlipControlType
         {
+            Unknown,
             None,
+            CutPower,
+            ReduceForce,
             Full
         }
         public SlipControlType SlipControlSystem;
+        public bool[] SlipControlActive;
         float BaseFrictionCoefficientFactor;  // Factor used to adjust Curtius formula depending upon weather conditions
         float SlipFrictionCoefficientFactor;
         public float SteamStaticWheelForce;
@@ -928,10 +932,10 @@ public override void Parse(string lowercasetoken, STFReader stf)
                 case "engine(ortsunloadingspeed": UnloadingSpeedMpS = stf.ReadFloatBlock(STFReader.UNITS.Speed, null); break;
                 case "engine(ortsslipcontrolsystem":
                     stf.MustMatch("(");
-                    string slipControlType = stf.ReadString().ToLowerInvariant();
+                    string slipControlType = stf.ReadString();
                     try
                     {
-                        SlipControlSystem = (SlipControlType)Enum.Parse(typeof(SlipControlType), slipControlType.First().ToString().ToUpper() + slipControlType.Substring(1));
+                        SlipControlSystem = (SlipControlType)Enum.Parse(typeof(SlipControlType), slipControlType, true);
                     }
                     catch
                     {
@@ -1684,6 +1688,13 @@ public override void Initialize()
                 }
             }
             }
+            SlipControlActive = new bool[LocomotiveAxles.Count];
+            if (SlipControlSystem == SlipControlType.Unknown)
+            {
+                if (AntiSlip) SlipControlSystem = SlipControlType.ReduceForce;
+                else if (WheelslipCausesThrottleDown) SlipControlSystem = SlipControlType.CutPower;
+                else SlipControlSystem = SlipControlType.None;
+            }
 
             // Calculate minimum speed to pickup water
             const float Aconst = 2;
@@ -2722,8 +2733,9 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
             UpdateDynamicBrakeForce(elapsedClockSeconds);
             TractiveForceN -= Math.Sign(WheelSpeedMpS) * DynamicBrakeForceN;
 
-            foreach (var axle in LocomotiveAxles)
+            for (int i=0; i<LocomotiveAxles.Count; i++)
             {
+                var axle = LocomotiveAxles[i];
                 if (axle.DriveType == AxleDriveType.ForceDriven)
                 {
                     float prevForceN = axle.DriveForceN;
@@ -2739,17 +2751,46 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
                         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)
+                    else if (SlipControlSystem == SlipControlType.CutPower)
+                    {
+                        if (TractionForceN > 0)
+                        {
+                            if (axle.HuDIsWheelSlip) SlipControlActive[i] = true;
+                        }
+                        else
+                        {
+                            // Only restore traction when throttle is set to 0
+                            SlipControlActive[i] = false;
+                        }
+                        // Disable traction in the axle if slipping
+                        if (SlipControlActive[i]) axle.DriveForceN = 0;
+                    }
+                    else if (SlipControlSystem == SlipControlType.ReduceForce)
                     {
-                        if (WheelslipCausesThrottleDown && WheelSlip)
+                        if (TractionForceN > 0 && axle.DriveForceN != 0 && AdvancedAdhesionModel)
                         {
-                            // Disable traction in the axle if slipping
-                            axle.DriveForceN = 0;
+                            if (axle.SlipPercent > axle.SlipWarningTresholdPercent) SlipControlActive[i] = true;
                         }
-                        else if (AntiSlip && AdvancedAdhesionModel && WheelSlipWarning)
+                        else
                         {
-                            // 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);
+                            SlipControlActive[i] = false;
+                        }
+                        if (SlipControlActive[i])
+                        {
+                            float absForceN = Math.Abs(axle.DriveForceN);
+                            float newForceN;
+                            if (axle.SlipPercent < axle.SlipWarningTresholdPercent * 0.9f)
+                            {
+                                // If well below slip threshold, restore full power in 10 seconds
+                                newForceN = Math.Min(Math.Abs(prevForceN) + absForceN * elapsedClockSeconds / 10, absForceN);
+
+                                // If full force is restored, disengage slip control
+                                if (newForceN / absForceN > 0.95f) SlipControlActive[i] = false;
+                            }
+                            else
+                            {
+                                newForceN = Math.Max(Math.Abs(prevForceN) - absForceN * elapsedClockSeconds / 3, 0);
+                            }
                             if (axle.DriveForceN > 0 && prevForceN >= 0) axle.DriveForceN = newForceN;
                             else if (axle.DriveForceN < 0 && prevForceN <= 0) axle.DriveForceN = -newForceN;
                         }