Skip to content

Commit 0dd962f

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-1000-gd75170a62c and 19 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 58b659d: Blueprint/train car operations UI window - Pull request #885 at 56c17fb: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at 359cfee: New Triple Valve Features Vol. 2 - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #949 at ce2bbe1: Oil Burning Locomotive - Pull request #950 at a98ff62: Ctrl-F5 showing yellow rectangles where mouse left button is active - Pull request #951 at 486081b: fix: Fix watchdog process state name - Pull request #952 at b2af1f5: Investigation - Pulsing graphics part 1 - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles
21 parents b5cd6cc + d75170a + dfc715e + d00beb9 + f92de76 + 58b659d + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + abe2e52 + 66f836c + ce2bbe1 + a98ff62 + 486081b + b2af1f5 + a519452 + 84c2f4b commit 0dd962f

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
@@ -8011,7 +8011,6 @@ public override string GetDebugStatus()
80118011
}
80128012
else
80138013
{
8014-
80158014
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",
80168015
Simulator.Catalog.GetString("Fire:"),
80178016
Simulator.Catalog.GetString("Ideal"),
@@ -8021,7 +8020,7 @@ public override string GetDebugStatus()
80218020
Simulator.Catalog.GetString("MaxFireR"),
80228021
FormatStrings.FormatMass(pS.TopH(DisplayMaxFiringRateKGpS), IsMetric),
80238022
Simulator.Catalog.GetString("FeedRate"),
8024-
FormatStrings.FormatMass(pS.TopH(FuelFeedRateSmoothedKGpS), IsMetric),
8023+
FormatStrings.FormatMass(pS.TopH(FuelFeedRateKGpS), IsMetric), // Check why not a smoothed value?
80258024
Simulator.Catalog.GetString("BurnRate"),
80268025
FormatStrings.FormatMass(pS.TopH(FuelBurnRateSmoothedKGpS), IsMetric),
80278026
Simulator.Catalog.GetString("Combust"),
@@ -8126,6 +8125,22 @@ public override string GetDebugStatus()
81268125
FormatStrings.FormatMass(Kg.FromLb(CummulativeTotalSteamConsumptionLbs), IsMetric)
81278126
);
81288127
}
8128+
else if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
8129+
{
8130+
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",
8131+
Simulator.Catalog.GetString("Tender:"),
8132+
Simulator.Catalog.GetString("Wood"),
8133+
FormatStrings.FormatFuelVolume(L.FromGUK(OilSpecificGravity * (Kg.ToLb(TenderCoalMassKG) / WaterLBpUKG)), IsMetric, IsUK),
8134+
TenderCoalMassKG / MaxTenderCoalMassKG * 100,
8135+
Simulator.Catalog.GetString("Water"),
8136+
FormatStrings.FormatFuelVolume(L.FromGUK(CombinedTenderWaterVolumeUKG), IsMetric, IsUK),
8137+
CombinedTenderWaterVolumeUKG / MaxTotalCombinedWaterVolumeUKG * 100,
8138+
Simulator.Catalog.GetString("Steam"),
8139+
FormatStrings.FormatMass(Kg.FromLb(CumulativeCylinderSteamConsumptionLbs), IsMetric),
8140+
Simulator.Catalog.GetString("TotSteam"),
8141+
FormatStrings.FormatMass(Kg.FromLb(CummulativeTotalSteamConsumptionLbs), IsMetric)
8142+
);
8143+
}
81298144
else // default to coal
81308145
{
81318146
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",
@@ -8146,7 +8161,6 @@ public override string GetDebugStatus()
81468161

81478162
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Oil)
81488163
{
8149-
81508164
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",
81518165
Simulator.Catalog.GetString("Status:"),
81528166
Simulator.Catalog.GetString("OilOut"),
@@ -8169,6 +8183,30 @@ public override string GetDebugStatus()
81698183
AIFireOverride ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No")
81708184
);
81718185
}
8186+
else if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
8187+
{
8188+
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",
8189+
Simulator.Catalog.GetString("Status:"),
8190+
Simulator.Catalog.GetString("WoodOut"),
8191+
CoalIsExhausted ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8192+
Simulator.Catalog.GetString("WaterOut"),
8193+
WaterIsExhausted ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8194+
Simulator.Catalog.GetString("FireOut"),
8195+
FireIsExhausted ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8196+
Simulator.Catalog.GetString("Stoker"),
8197+
StokerIsMechanical ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8198+
Simulator.Catalog.GetString("Boost"),
8199+
FuelBoost ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8200+
Simulator.Catalog.GetString("GrLimit"),
8201+
IsGrateLimit ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8202+
Simulator.Catalog.GetString("FireOn"),
8203+
SetFireOn ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8204+
Simulator.Catalog.GetString("FireOff"),
8205+
SetFireOff ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
8206+
Simulator.Catalog.GetString("AIOR"),
8207+
AIFireOverride ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No")
8208+
);
8209+
}
81728210
else
81738211
{
81748212

0 commit comments

Comments
 (0)