Fix blending issue

cesarBLG · cesarBLG · commit 24519914ca7f · 2023-04-19T20:26:29.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -1837,8 +1837,8 @@ public void DynamicBrakeBlending(float elapsedClockSeconds)
                         float threshold = 100;
                         if (diff > threshold && DynamicBrakeIntervention < 1)
                             DynamicBrakeIntervention = Math.Min(DynamicBrakeIntervention + elapsedClockSeconds, 1);
-                        else if (diff < -threshold)
-                            DynamicBrakeIntervention -= elapsedClockSeconds;
+                        else if (diff < -threshold && DynamicBrakeIntervention > 0.01f)
+                            DynamicBrakeIntervention = Math.Max(DynamicBrakeIntervention - elapsedClockSeconds, 0.01f);
                     }
                     else
                     {
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
@@ -603,7 +603,7 @@ public override void Update(float elapsedClockSeconds)
                         {
                             var requiredBrakeForceN = Math.Min(AutoCylPressurePSI / MaxCylPressurePSI, 1) * Car.MaxBrakeForceN;
                             var localBrakeForceN = loco.DynamicBrakeForceN + Math.Min(CylPressurePSI / MaxCylPressurePSI, 1) * Car.MaxBrakeForceN;
-                            if (localBrakeForceN > requiredBrakeForceN * 0.85f)
+                            if (localBrakeForceN > requiredBrakeForceN - 0.15f * Car.MaxBrakeForceN)
                             {
                                 isolateAutoBrake = true;
                                 if (loco.DynamicBrakePartialBailOff)

Original file line number	Diff line number	Diff line change
`@@ -1837,8 +1837,8 @@ public void DynamicBrakeBlending(float elapsedClockSeconds)`
`1837`	`1837`	`float threshold = 100;`
`1838`	`1838`	`if (diff > threshold && DynamicBrakeIntervention < 1)`
`1839`	`1839`	`DynamicBrakeIntervention = Math.Min(DynamicBrakeIntervention + elapsedClockSeconds, 1);`
`1840`		`- else if (diff < -threshold)`
`1841`		`- DynamicBrakeIntervention -= elapsedClockSeconds;`
	`1840`	`+ else if (diff < -threshold && DynamicBrakeIntervention > 0.01f)`
	`1841`	`+ DynamicBrakeIntervention = Math.Max(DynamicBrakeIntervention - elapsedClockSeconds, 0.01f);`
`1842`	`1842`	`}`
`1843`	`1843`	`else`
`1844`	`1844`	`{`
Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ public override void Update(float elapsedClockSeconds)`
`603`	`603`	`{`
`604`	`604`	`var requiredBrakeForceN = Math.Min(AutoCylPressurePSI / MaxCylPressurePSI, 1) * Car.MaxBrakeForceN;`
`605`	`605`	`var localBrakeForceN = loco.DynamicBrakeForceN + Math.Min(CylPressurePSI / MaxCylPressurePSI, 1) * Car.MaxBrakeForceN;`
`606`		`- if (localBrakeForceN > requiredBrakeForceN * 0.85f)`
	`606`	`+ if (localBrakeForceN > requiredBrakeForceN - 0.15f * Car.MaxBrakeForceN)`
`607`	`607`	`{`
`608`	`608`	`isolateAutoBrake = true;`
`609`	`609`	`if (loco.DynamicBrakePartialBailOff)`