Adjust Diesel Power

Author: peternewell

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

@@ -978,7 +978,7 @@ public virtual void Parse(STFReader stf)
                     case "exhaustdynamicsdown": ExhaustDecelReduction = stf.ReadFloatBlock(STFReader.UNITS.None, null); initLevel |= SettingsFlags.ExhaustDynamics; break;
                     case "exhaustcolor":    ExhaustSteadyColor = stf.ReadColorBlock(Color.Gray); initLevel |= SettingsFlags.ExhaustColor; break;
                     case "exhausttransientcolor": ExhaustTransientColor = stf.ReadColorBlock(Color.Black);initLevel |= SettingsFlags.ExhaustTransientColor; break;
-                    case "dieselpowertab": DieselPowerTab = new Interpolator(stf);initLevel |= SettingsFlags.DieselPowerTab; break;
+                    case "dieselpowertab": DieselPowerTab = new Interpolator(stf); initLevel |= SettingsFlags.DieselPowerTab; break;
                     case "dieselconsumptiontab": DieselConsumptionTab = new Interpolator(stf);initLevel |= SettingsFlags.DieselConsumptionTab; break;
                     case "throttlerpmtab":
                         ThrottleRPMTab = new Interpolator(stf);
@@ -1688,7 +1688,6 @@ public void Save(BinaryWriter outf)
         /// </summary>
         public void InitFromMSTS()
         {
-
             if (MaximumRailOutputPowerW == 0 && Locomotive.MaxPowerW != 0)
             {
                 MaximumRailOutputPowerW = Locomotive.MaxPowerW; // set rail power to a default value on the basis that of the value specified in the MaxPowerW parameter
@@ -2141,7 +2140,6 @@ public void InitDieselRailPowers(MSTSDieselLocomotive loco)
         {
             // Set up the reverse ThrottleRPM table. This is used to provide an apparent throttle setting to the Tractive Force calculation, and allows the diesel engine to control the up/down time of 
             // tractive force. This table should be creeated with all locomotives, as they will either use (create) a default ThrottleRPM table, or the user will enter one. 
-
             if (ThrottleRPMTab != null)
             {
                 var size = ThrottleRPMTab.GetSize();

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/GearBox.cs

@@ -70,7 +70,7 @@ public void Parse(string lowercasetoken, STFReader stf)
             switch (lowercasetoken)
             {
                 case "engine(gearboxnumberofgears": GearBoxNumberOfGears = stf.ReadIntBlock(1); initLevel++; break;
-                case "engine(ortsreversegearboxindication": int tempIndication = stf.ReadIntBlock(1); if (tempIndication == 1) { ReverseGearBoxIndication = true; } Trace.TraceInformation("Read Indication {0}",ReverseGearBoxIndication); break;
+                case "engine(ortsreversegearboxindication": int tempIndication = stf.ReadIntBlock(1); if (tempIndication == 1) { ReverseGearBoxIndication = true; }; break;
                 case "engine(gearboxdirectdrivegear": GearBoxDirectDriveGear = stf.ReadIntBlock(1); break;
                 case "engine(ortsgearboxfreewheel":
                     var freeWheel = stf.ReadIntBlock(null);
@@ -661,11 +661,12 @@ public float TractiveForceN
 
                             if (CurrentSpeedMpS > 0)
                             {
-                                if (tractiveForceN > (DieselEngine.RailPowerTab[DieselEngine.RealRPM] / CurrentSpeedMpS))
+                                var tractiveEffortLimitN = (DieselEngine.DieselPowerTab[DieselEngine.RealRPM] * (DieselEngine.LoadPercent / 100f)) / CurrentSpeedMpS;
+
+                                if (tractiveForceN > tractiveEffortLimitN )
                                 {
-                                    tractiveForceN = DieselEngine.RailPowerTab[DieselEngine.RealRPM] / CurrentSpeedMpS;
+                                    tractiveForceN = tractiveEffortLimitN;
                                 }
-
                             }
 
                             // Set TE to zero if gear change happening && type B gear box