Skip to content

Commit ce2bbe1

Browse files
committed
Add some wood parameters
1 parent 5026de6 commit ce2bbe1

File tree

1 file changed

+41
-3
lines changed

1 file changed

+41
-3
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8014,7 +8014,6 @@ public override string GetDebugStatus()
80148014
}
80158015
else
80168016
{
8017-
80188017
status.AppendFormat("{0}\t{1}\t{2}\t\t{3}\t{4}\t\t{5}\t{6:N0}/{13}\t\t{7}\t{8:N0}/{13}\t\t{9}\t{10:N0}/{13}\t\t{11}\t{12}/{14}{13}\t{15}\t{16}/{18}{17}\t\t{19}\t{20:N0}\n",
80198018
Simulator.Catalog.GetString("Fire:"),
80208019
Simulator.Catalog.GetString("Ideal"),
@@ -8024,7 +8023,7 @@ public override string GetDebugStatus()
80248023
Simulator.Catalog.GetString("MaxFireR"),
80258024
FormatStrings.FormatMass(pS.TopH(DisplayMaxFiringRateKGpS), IsMetric),
80268025
Simulator.Catalog.GetString("FeedRate"),
8027-
FormatStrings.FormatMass(pS.TopH(FuelFeedRateSmoothedKGpS), IsMetric),
8026+
FormatStrings.FormatMass(pS.TopH(FuelFeedRateKGpS), IsMetric), // Check why not a smoothed value?
80288027
Simulator.Catalog.GetString("BurnRate"),
80298028
FormatStrings.FormatMass(pS.TopH(FuelBurnRateSmoothedKGpS), IsMetric),
80308029
Simulator.Catalog.GetString("Combust"),
@@ -8129,6 +8128,22 @@ public override string GetDebugStatus()
81298128
FormatStrings.FormatMass(Kg.FromLb(CummulativeTotalSteamConsumptionLbs), IsMetric)
81308129
);
81318130
}
8131+
else if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
8132+
{
8133+
status.AppendFormat("{0}\t{1}\t{2:N0}\t\t{3:N0}%\t{4}\t{5}\t\t{6:N0}%\t{7}\t{8:N0}\t{9}\t\t{10:N0}\n",
8134+
Simulator.Catalog.GetString("Tender:"),
8135+
Simulator.Catalog.GetString("Wood"),
8136+
FormatStrings.FormatFuelVolume(L.FromGUK(OilSpecificGravity * (Kg.ToLb(TenderCoalMassKG) / WaterLBpUKG)), IsMetric, IsUK),
8137+
TenderCoalMassKG / MaxTenderCoalMassKG * 100,
8138+
Simulator.Catalog.GetString("Water"),
8139+
FormatStrings.FormatFuelVolume(L.FromGUK(CombinedTenderWaterVolumeUKG), IsMetric, IsUK),
8140+
CombinedTenderWaterVolumeUKG / MaxTotalCombinedWaterVolumeUKG * 100,
8141+
Simulator.Catalog.GetString("Steam"),
8142+
FormatStrings.FormatMass(Kg.FromLb(CumulativeCylinderSteamConsumptionLbs), IsMetric),
8143+
Simulator.Catalog.GetString("TotSteam"),
8144+
FormatStrings.FormatMass(Kg.FromLb(CummulativeTotalSteamConsumptionLbs), IsMetric)
8145+
);
8146+
}
81328147
else // default to coal
81338148
{
81348149
status.AppendFormat("{0}\t{1}\t{2}\t{3:N0}%\t{4}\t{5}\t\t{6:N0}%\t{7}\t{8:N0}\t{9}\t\t{10:N0}\n",
@@ -8149,7 +8164,6 @@ public override string GetDebugStatus()
81498164

81508165
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Oil)
81518166
{
8152-
81538167
status.AppendFormat("{0}\t{1}\t{2}\t\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13}\t{14}\t{15}\t{16}\t{17}\t{18}\n",
81548168
Simulator.Catalog.GetString("Status:"),
81558169
Simulator.Catalog.GetString("OilOut"),
@@ -8172,6 +8186,30 @@ public override string GetDebugStatus()
81728186
AIFireOverride ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No")
81738187
);
81748188
}
8189+
else if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
8190+
{
8191+
status.AppendFormat("{0}\t{1}\t{2}\t\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13}\t{14}\t{15}\t{16}\t{17}\t{18}\n",
8192+
Simulator.Catalog.GetString("Status:"),
8193+
Simulator.Catalog.GetString("WoodOut"),
8194+
CoalIsExhausted ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8195+
Simulator.Catalog.GetString("WaterOut"),
8196+
WaterIsExhausted ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8197+
Simulator.Catalog.GetString("FireOut"),
8198+
FireIsExhausted ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8199+
Simulator.Catalog.GetString("Stoker"),
8200+
StokerIsMechanical ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8201+
Simulator.Catalog.GetString("Boost"),
8202+
FuelBoost ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8203+
Simulator.Catalog.GetString("GrLimit"),
8204+
IsGrateLimit ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8205+
Simulator.Catalog.GetString("FireOn"),
8206+
SetFireOn ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8207+
Simulator.Catalog.GetString("FireOff"),
8208+
SetFireOff ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8209+
Simulator.Catalog.GetString("AIOR"),
8210+
AIFireOverride ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No")
8211+
);
8212+
}
81758213
else
81768214
{
81778215

0 commit comments

Comments
 (0)