Skip to content

Commit 832df59

Browse files
committed
Automatic merge of T1.5.1-997-gb5992851e and 17 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 b3f83ed: 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 9305062: 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 e1d8f1f: 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
19 parents 8bac2b3 + b599285 + dfc715e + d00beb9 + f92de76 + b3f83ed + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 9305062 + abe2e52 + 66f836c + e1d8f1f + a98ff62 + 486081b + b2af1f5 commit 832df59

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3880,10 +3880,14 @@ private void UpdateFirebox(float elapsedClockSeconds, float absSpeedMpS)
38803880

38813881
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Oil)
38823882
{
3883-
// var oilburnrate = throttle * MaxFuelBurnGrateKGpS;
3884-
// OilBurnRateSmoothKGpS.Update(elapsedClockSeconds, oilburnrate);
3883+
var oilburnrate = BurnRateRawKGpS;
38853884

3886-
OilBurnRateSmoothKGpS.Update(elapsedClockSeconds, BurnRateRawKGpS);
3885+
if (BurnRateRawKGpS > MaxFiringRateKGpS)
3886+
{
3887+
oilburnrate = MaxFiringRateKGpS; // burning rate can never be more then the max firing rate
3888+
}
3889+
3890+
OilBurnRateSmoothKGpS.Update(elapsedClockSeconds, oilburnrate);
38873891
FuelBurnRateSmoothedKGpS = OilBurnRateSmoothKGpS.SmoothedValue;
38883892
}
38893893
else
@@ -7485,7 +7489,18 @@ public override string GetStatus()
74857489
status.AppendFormat("{0} = {1:F0}%\n", Simulator.Catalog.GetString("Fire Heat Loss"), FireHeatLossPercent * 100);
74867490
}
74877491

7492+
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Oil)
7493+
{
7494+
status.AppendFormat("{0}{5} = {3:F0}% {1}, {4:F0}% {2}{5}\n", Simulator.Catalog.GetString("Fuel levels"), Simulator.Catalog.GetString("oil"), Simulator.Catalog.GetString("water"), 100 * coalPercent, 100 * waterPercent, fuelSafety);
7495+
}
7496+
else if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
7497+
{
7498+
status.AppendFormat("{0}{5} = {3:F0}% {1}, {4:F0}% {2}{5}\n", Simulator.Catalog.GetString("Fuel levels"), Simulator.Catalog.GetString("wood"), Simulator.Catalog.GetString("water"), 100 * coalPercent, 100 * waterPercent, fuelSafety);
7499+
}
7500+
else
7501+
{
74887502
status.AppendFormat("{0}{5} = {3:F0}% {1}, {4:F0}% {2}{5}\n", Simulator.Catalog.GetString("Fuel levels"), Simulator.Catalog.GetString("coal"), Simulator.Catalog.GetString("water"), 100 * coalPercent, 100 * waterPercent, fuelSafety);
7503+
}
74897504

74907505
return status.ToString();
74917506
}
@@ -7964,7 +7979,7 @@ public override string GetDebugStatus()
79647979
{
79657980
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Oil)
79667981
{
7967-
status.AppendFormat("{0}\t{1}\t{2:N0}\t{3:N0}%\t{4}\t{5}\t\t{6:N0}%\t{7}\t{8:N0}\t{9}\t\t{10:N0}\n",
7982+
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",
79687983
Simulator.Catalog.GetString("Tender:"),
79697984
Simulator.Catalog.GetString("Oil"),
79707985
FormatStrings.FormatFuelVolume(L.FromGUK(OilSpecificGravity * (Kg.ToLb(TenderCoalMassKG) / WaterLBpUKG)), IsMetric, IsUK),

0 commit comments

Comments
 (0)