Add information about available power

Author: cesarBLG

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

@@ -50,6 +50,7 @@ public DieselEngineState CurrentDieselEngineState(int id)
                 return DieselEngineState.Unavailable;
             }
         }
+        protected float DieselEngineOutputPowerW => DieselEngines.MaxOutputPowerW;
 
         public float DieselEngineMinRpmForElectricTrainSupply => DpsHost.DieselEngineMinRpmForElectricTrainSupply;
 

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

@@ -98,6 +98,15 @@ protected float MaximumPowerW
             set => LpsHost.MaximumPowerW = value;
         }
 
+        /// <summary>
+        /// Power limit for traction motors
+        /// </summary>
+        protected float AvailableTractionPowerW
+        {
+            get => LpsHost.AvailableTractionPowerW;
+            set => LpsHost.AvailableTractionPowerW = value;
+        }
+
         /// <summary>
         /// Current availability of the dynamic brake
         /// </summary>

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -683,6 +683,13 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
                     }
                 }
 
+                float supplyPowerLimitW = float.MaxValue;
+                if (!DieselEngines.HasGearBox)
+                {
+                    supplyPowerLimitW = DieselPowerSupply.AvailableTractionPowerW;
+                    if (DieselPowerSupply.MaximumPowerW > 0)
+                        supplyPowerLimitW = Math.Min(supplyPowerLimitW, DieselPowerSupply.MaximumPowerW * t);
+                }
                 if (TractiveForceCurves == null)
                 {
                     if (DieselEngines.HasGearBox)
@@ -697,8 +704,7 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
                         // Maximum rail power is reduced by apparent throttle factor and the number of engines running (power ratio)
                         float maxPowerW = LocomotiveMaxRailOutputPowerW * DieselEngineFractionPower * LocomotiveApparentThrottleSetting;
 
-                        if (DieselPowerSupply.MaximumPowerW > 0)
-                            maxPowerW = Math.Min(maxPowerW, DieselPowerSupply.MaximumPowerW * LocomotiveApparentThrottleSetting);
+                        maxPowerW = Math.Min(maxPowerW, supplyPowerLimitW);
 
                         // If unloading speed is in ENG file, and locomotive speed is greater then unloading speed, and less then max speed, then apply a decay factor to the power/force
                         if (UnloadingSpeedMpS != 0 && AbsTractionSpeedMpS > UnloadingSpeedMpS && AbsTractionSpeedMpS < MaxSpeedMpS && !WheelSlip)
@@ -726,13 +732,9 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
                     else
                     {
                         // Tractive force is read from Table using the apparent throttle setting, and then reduced by the number of engines running (power ratio)
-                        TractiveForceN = TractiveForceCurves.Get(LocomotiveApparentThrottleSetting, AbsTractionSpeedMpS) * DieselEngineFractionPower * (1 - PowerReduction);
-                        if (DieselPowerSupply.MaximumPowerW > 0)
-                        {
-                            float maxPowerW = DieselPowerSupply.MaximumPowerW * t;
-                            if (TractiveForceN * AbsTractionSpeedMpS > maxPowerW)
-                                TractiveForceN = maxPowerW / AbsTractionSpeedMpS;
-                        }
+                        TractiveForceN = TractiveForceCurves.Get(LocomotiveApparentThrottleSetting, AbsTractionSpeedMpS) * DieselEngineFractionPower * (1 - PowerReduction);  
+                        if (TractiveForceN * AbsTractionSpeedMpS > supplyPowerLimitW)
+                            TractiveForceN = supplyPowerLimitW / AbsTractionSpeedMpS;
                     }
 
                     if (TractiveForceN < 0 && !TractiveForceCurves.AcceptsNegativeValues())

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

@@ -2508,14 +2508,21 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds, float t, f
                         AbsTractionSpeedMpS = AbsSpeedMpS;
                     }
                 }
+                
+                float supplyPowerLimitW = float.MaxValue;
+                if (this is MSTSElectricLocomotive electric)
+                {
+                    supplyPowerLimitW = electric.ElectricPowerSupply.AvailableTractionPowerW;
+                    if (electric.ElectricPowerSupply.MaximumPowerW > 0)
+                        supplyPowerLimitW = Math.Min(supplyPowerLimitW, electric.ElectricPowerSupply.MaximumPowerW * t);
+                }
 
                 if (TractiveForceCurves == null)
                 {
                     float maxForceN = MaxForceN * t * (1 - PowerReduction);
                     float maxPowerW = MaxPowerW;
                     maxPowerW *= t * t * (1 - PowerReduction);
-                    if (this is MSTSElectricLocomotive electric && electric.ElectricPowerSupply.MaximumPowerW > 0)
-                        maxPowerW = Math.Min(maxPowerW, electric.ElectricPowerSupply.MaximumPowerW * t);
+                    maxPowerW = Math.Min(maxPowerW, supplyPowerLimitW);
 
                     if (maxForceN * AbsTractionSpeedMpS > maxPowerW)
                         maxForceN = maxPowerW / AbsTractionSpeedMpS;
@@ -2530,12 +2537,8 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds, float t, f
                 else
                 {
                     TractiveForceN = TractiveForceCurves.Get(t, AbsTractionSpeedMpS) * (1 - PowerReduction);
-                    if (this is MSTSElectricLocomotive electric && electric.ElectricPowerSupply.MaximumPowerW > 0)
-                    {
-                        float maxPowerW = electric.ElectricPowerSupply.MaximumPowerW * t;
-                        if (TractiveForceN * AbsTractionSpeedMpS > maxPowerW)
-                            TractiveForceN = maxPowerW / AbsTractionSpeedMpS;
-                    }
+                    if (TractiveForceN * AbsTractionSpeedMpS > supplyPowerLimitW)
+                        TractiveForceN = supplyPowerLimitW / AbsTractionSpeedMpS;
                     if (TractiveForceN < 0 && !TractiveForceCurves.AcceptsNegativeValues())
                         TractiveForceN = 0;
                 }

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

@@ -47,6 +47,7 @@ public abstract class ScriptedLocomotivePowerSupply : ILocomotivePowerSupply
         public PowerSupplyState MainPowerSupplyState { get; set; } = PowerSupplyState.PowerOff;
         public bool MainPowerSupplyOn => MainPowerSupplyState == PowerSupplyState.PowerOn;
         public float MaximumPowerW;
+        public float AvailableTractionPowerW = float.MaxValue;
         public bool DynamicBrakeAvailable { get; set; } = false;
         public float PowerSupplyDynamicBrakePercent { get; set; } = -1;
         public float MaximumDynamicBrakePowerW { get; set; } = 0;