Adjustments to power displays for DM

Author: peternewell

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

@@ -419,13 +419,10 @@ public string GetStatus()
 
             if (Locomotive.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
             {
-                result.AppendFormat("\t{0}\t{1}", Simulator.Catalog.GetParticularString("HUD", "Power"), Simulator.Catalog.GetString(" "));
+                result.AppendFormat("\t{0}\t{1}", Simulator.Catalog.GetParticularString("HUD", "Power"), Simulator.Catalog.GetString(" "));  // Leave maximum power out
                 foreach (var eng in DEList)
                 {
-                    //   Power(Watts) = Torque(Nm) * rpm / 9.54.
-                    var tempPowerDisplay = eng.GearBox.torqueCurveMultiplier * eng.DieselTorqueTab[eng.RealRPM] * eng.RealRPM / 9.54f;
-                    tempPowerDisplay = MathHelper.Clamp(tempPowerDisplay, 0, MaxOutputPowerW);  // Clamp throttle setting within bounds
-                    result.AppendFormat("\t{0}", FormatStrings.FormatPower(tempPowerDisplay, Locomotive.IsMetric, false, false));
+                    result.AppendFormat("\t{0}", FormatStrings.FormatPower(eng.CurrentDieselOutputPowerW, Locomotive.IsMetric, false, false));
                 }
             }
             else
@@ -923,14 +920,7 @@ public float LoadPercent
         {
             get
             {
-                if (Locomotive.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
-                {
-                    return CurrentDieselOutputPowerW <= 0f ? 0f : (((Locomotive.MotiveForceN * Locomotive.SpeedMpS) + (Locomotive.DieselEngines.NumOfActiveEngines > 0 ? Locomotive.LocomotivePowerSupply.ElectricTrainSupplyPowerW / Locomotive.DieselEngines.NumOfActiveEngines : 0f)) * 100f / CurrentDieselOutputPowerW);
-                }
-                else
-                {
-                    return CurrentDieselOutputPowerW <= 0f ? 0f : ((OutputPowerW + (Locomotive.DieselEngines.NumOfActiveEngines > 0 ? Locomotive.LocomotivePowerSupply.ElectricTrainSupplyPowerW / Locomotive.DieselEngines.NumOfActiveEngines : 0f)) * 100f / CurrentDieselOutputPowerW);
-                }
+                return CurrentDieselOutputPowerW <= 0f ? 0f : ((OutputPowerW + (Locomotive.DieselEngines.NumOfActiveEngines > 0 ? Locomotive.LocomotivePowerSupply.ElectricTrainSupplyPowerW / Locomotive.DieselEngines.NumOfActiveEngines : 0f)) * 100f / CurrentDieselOutputPowerW);
             }
         }
         /// <summary>
@@ -1440,7 +1430,9 @@ public void Update(float elapsedClockSeconds)
             // so set output power based upon throttle demanded power
             if (HasGearBox && Locomotive.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
             {
-                CurrentDieselOutputPowerW = (ThrottleRPMTab[demandedThrottlePercent] - IdleRPM) / (MaxRPM - IdleRPM) * MaximumDieselPowerW * (1 - Locomotive.PowerReduction);
+                //   Power(Watts) = Torque(Nm) * rpm / 9.54.
+                CurrentDieselOutputPowerW = GearBox.torqueCurveMultiplier * DieselTorqueTab[RealRPM] * RealRPM / 9.54f;
+                CurrentDieselOutputPowerW = MathHelper.Clamp(CurrentDieselOutputPowerW, 0, MaximumDieselPowerW);  // Clamp throttle setting within bounds
             }
 
             if (Locomotive.DieselEngines.NumOfActiveEngines > 0)

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -310,20 +310,8 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime, bo
                 LocomotiveGraphsThrottle.AddSample(loco.ThrottlePercent * 0.01f);
                 if (locoD != null)
                 {
-                    if (locoD.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
-                    {
-                        // Power for a DM is different to a DE, the following adjusts the display accordingly.
-                        // If multiple diesel engines then this code may not work
-                        //   Power(Watts) = Torque(Nm) * rpm / 9.54.
-                        var tempPowerDisplay = locoD.DieselEngines[0].GearBox.torqueCurveMultiplier * locoD.DieselEngines[0].DieselTorqueTab[locoD.DieselEngines[0].RealRPM] * locoD.DieselEngines[0].RealRPM / 9.54f;
                         LocomotiveGraphsInputPower.AddSample(locoD.DieselEngines.MaxOutputPowerW / locoD.DieselEngines.MaxPowerW);
                         LocomotiveGraphsOutputPower.AddSample(locoD.DieselEngines.PowerW / locoD.DieselEngines.MaxPowerW);
-                    }
-                    else
-                    {
-                        LocomotiveGraphsInputPower.AddSample(locoD.DieselEngines.MaxOutputPowerW / locoD.DieselEngines.MaxPowerW);
-                        LocomotiveGraphsOutputPower.AddSample(locoD.DieselEngines.PowerW / locoD.DieselEngines.MaxPowerW);
-                    }
                 }
                 if (locoE != null)
                 {