Max throttle percent allowed by power supply

Author: cesarBLG

Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs

@@ -103,6 +103,7 @@ protected float MaximumDynamicBrakePowerW
             set => LpsHost.MaximumDynamicBrakePowerW = value;
         }
 
+        /// <summary>
         /// Dynamic brake percent demanded by power supply
         /// </summary>
         protected float PowerSupplyDynamicBrakePercent
@@ -113,7 +114,23 @@ protected float PowerSupplyDynamicBrakePercent
             }
             set
             {
-                LpsHost.PowerSupplyDynamicBrakePercent = value;
+                if (value < 0) LpsHost.PowerSupplyDynamicBrakePercent = -1;
+                else LpsHost.PowerSupplyDynamicBrakePercent = Math.Min(value, 100);
+            }
+        }
+
+        /// <summary>
+        /// Maximum throttle percent allowed by power supply
+        /// </summary>
+        protected float MaxThrottlePercent
+        {
+            get
+            {
+                return LpsHost.MaxThrottlePercent;
+            }
+            set
+            {
+                LpsHost.MaxThrottlePercent = Math.Max(Math.Min(value, 100), 0);
             }
         }
 

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs

@@ -34,6 +34,7 @@ public interface ILocomotivePowerSupply : IPowerSupply
         bool DynamicBrakeAvailable { get; set; }
         float PowerSupplyDynamicBrakePercent { get; set; }
         float MaximumDynamicBrakePowerW { get; set; }
+        float MaxThrottlePercent { get; set; }
 
         PowerSupplyState AuxiliaryPowerSupplyState { get; set; }
         bool AuxiliaryPowerSupplyOn { get; }

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs

@@ -49,6 +49,7 @@ public abstract class ScriptedLocomotivePowerSupply : ILocomotivePowerSupply
         public bool DynamicBrakeAvailable { get; set; } = false;
         public float PowerSupplyDynamicBrakePercent { get; set; } = -1;
         public float MaximumDynamicBrakePowerW { get; set; } = 0;
+        public float MaxThrottlePercent { get; set; } = 100;
 
         public PowerSupplyState AuxiliaryPowerSupplyState { get; set; } = PowerSupplyState.PowerOff;
         public bool AuxiliaryPowerSupplyOn => AuxiliaryPowerSupplyState == PowerSupplyState.PowerOn;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs

@@ -56,6 +56,7 @@ public bool DynamicBrakeAvailable
         }
         public float PowerSupplyDynamicBrakePercent { get; set; } = -1;
         public float MaximumDynamicBrakePowerW { get; set; } = 0;
+        public float MaxThrottlePercent { get; set; } = 100;
 
         public PowerSupplyState AuxiliaryPowerSupplyState
         {

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -431,31 +431,36 @@ public float ThrottlePercent
         {
             get
             {
+                float percent;
                 if (RemoteControlGroup == 0 && Train != null)
                 {
+                    percent = Train.MUThrottlePercent;
                     if (Train.LeadLocomotive is MSTSLocomotive locomotive)
                     {
                         if (!locomotive.TrainControlSystem.TractionAuthorization
-                            || Train.MUThrottlePercent <= 0)
+                            || percent <= 0)
                         {
-                            return 0;
+                            percent = 0;
                         }
-                        else if (Train.MUThrottlePercent > locomotive.TrainControlSystem.MaxThrottlePercent)
+                        else if (percent > locomotive.TrainControlSystem.MaxThrottlePercent)
                         {
-                            return Math.Max(locomotive.TrainControlSystem.MaxThrottlePercent, 0);
+                            percent = Math.Max(locomotive.TrainControlSystem.MaxThrottlePercent, 0);
                         }
                     }
-
-                    return Train.MUThrottlePercent;
                 }
                 else if (RemoteControlGroup == 1 && Train != null)
                 {
-                    return Train.DPThrottlePercent;
+                    percent = Train.DPThrottlePercent;
                 }
                 else
                 {
-                    return LocalThrottlePercent;
+                    percent = LocalThrottlePercent;
                 }
+                if (this is MSTSLocomotive loco)
+                {
+                    if (loco.LocomotivePowerSupply.MaxThrottlePercent < percent) percent = Math.Max(loco.LocomotivePowerSupply.MaxThrottlePercent, 0);
+                }
+                return percent;
             }
             set
             {