You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Automatic merge of T1.5.1-1000-gd75170a62c and 20 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 aac0de8: 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
- Pull request #956 at 25193a8: Map settings saved
Copy file name to clipboardExpand all lines: Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
+34-12Lines changed: 34 additions & 12 deletions
Original file line number
Diff line number
Diff line change
@@ -294,9 +294,11 @@ public class MSTSSteamLocomotive : MSTSLocomotive
294
294
SmoothedData FuelRateOil = new SmoothedData(3); // Oil Stoker is more responsive and only takes x seconds to fully react to changing needs.
295
295
SmoothedData FuelRateStoker = new SmoothedData(15); // Stoker is more responsive and only takes x seconds to fully react to changing needs.
296
296
SmoothedData FuelRateCoal = new SmoothedData(45); // Automatic fireman takes x seconds to fully react to changing needs for coal firing.
297
-
SmoothedData CoalBurnRateSmoothKGpS = new SmoothedData(150); // Changes in BurnRate take x seconds to fully react to changing needs - models increase and decrease in heat.
298
-
SmoothedData OilBurnRateSmoothKGpS = new SmoothedData(6); // Changes in Oil BurnRate take x seconds to fully react to changing needs - models increase and decrease in heat. Oil faster then steam
299
-
SmoothedData OilBurnRateReductionSmoothKGpS = new SmoothedData(0.25f); // When in reduction we would expect the heat to drop off rapidly for an oil fire
297
+
SmoothedData BurnRateCoalSmoothKGpS = new SmoothedData(150); // Changes in BurnRate take x seconds to fully react to changing needs - models increase and decrease in heat.
298
+
SmoothedData BurnRateOilSmoothKGpS = new SmoothedData(6); // Changes in Oil BurnRate take x seconds to fully react to changing needs - models increase and decrease in heat. Oil faster then steam
299
+
SmoothedData BurnRateWoodSmoothKGpS = new SmoothedData(20); // Changes in Wood BurnRate take x seconds to fully react to changing needs - models increase and decrease in heat.
300
+
301
+
SmoothedData BurnRateOilReductionSmoothKGpS = new SmoothedData(0.25f); // When in reduction we would expect the heat to drop off rapidly for an oil fire
FuelBurnRateSmoothedKGpS = MathHelper.Clamp(FuelBurnRateSmoothedKGpS, 0.0f, MaxFuelBurnGrateKGpS); // clamp burnrate to max fuel that can be burnt within grate limit
if (!StokerIsMechanical && IsPlayerTrain) // Don't display message if stoker in operation
4015
4023
{
4024
+
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
4025
+
{
4026
+
Simulator.Confirmer.Message(ConfirmLevel.Warning, Simulator.Catalog.GetString("FireMass is getting low. Your fireman will add fuel faster, but don't wear him out."));
4027
+
}
4028
+
else
4029
+
{
4016
4030
Simulator.Confirmer.Message(ConfirmLevel.Warning, Simulator.Catalog.GetString("FireMass is getting low. Your fireman will shovel faster, but don't wear him out."));
4017
4031
}
4018
4032
}
4019
4033
}
4020
4034
}
4035
+
}
4021
4036
else if (FireMassKG >= IdealFireMassKG) // If firemass has returned to normal - turn boost off
4022
4037
{
4023
4038
if (FuelBoost)
4024
4039
{
4025
4040
FuelBoost = false; // disable boost shoveling
4026
4041
if (!StokerIsMechanical && IsPlayerTrain) // Don't display message if stoker in operation
4027
4042
{
4043
+
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
4044
+
{
4045
+
Simulator.Confirmer.Message(ConfirmLevel.Warning, Simulator.Catalog.GetString("FireMass is back within limits. Your fireman will add fuel as normal."));
4046
+
}
4047
+
else
4048
+
{
4028
4049
Simulator.Confirmer.Message(ConfirmLevel.Warning, Simulator.Catalog.GetString("FireMass is back within limits. Your fireman will shovel as per normal."));
4029
4050
}
4030
4051
}
4031
4052
}
4053
+
}
4032
4054
if (FuelBoost && !FuelBoostReset) // if fuel boost is still on, and hasn't been reset - needs further refinement as this shouldn't be able to be maintained indefinitely
4033
4055
{
4034
4056
DisplayMaxFiringRateKGpS = MaxTheoreticalFiringRateKgpS; // Set display value with temporary higher shovelling level
0 commit comments