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.6-108-g8fb3285d6 and 13 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler
- Pull request #1162 at 2516cce: specifies precedence of DDS over ACE
- Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9.
- Pull request #1164 at 1ad9889: Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
- Pull request #1082 at 5d1572f: Allow variable water level in glass gauge
- Pull request #1128 at 086d502: Particle Emitter Overhaul
- Pull request #1160 at 9dc6b3b: Route Based TTrack Sounds
Copy file name to clipboardExpand all lines: Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
+2-4Lines changed: 2 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -464,7 +464,7 @@ public float TenderFuelMassKG // Decreased by firing and increased
464
464
float MSTSSteamGaugeGlassHeightM;
465
465
float WaterGlassLengthM;
466
466
float waterGlassFractionLevel; // Water glass level as a fraction
467
-
// bool WaterGlassLevelGradientEnabled = false;
467
+
468
468
float MEPFactor = 0.7f; // Factor to determine the MEP
469
469
float GrateAreaDesignFactor = 500.0f; // Design factor for determining Grate Area
470
470
float EvapAreaDesignFactor = 10.0f; // Design factor for determining Evaporation Area
@@ -1572,11 +1572,10 @@ public override void Initialize()
1572
1572
WaterGlassMaxLevel = ((WaterGlassLengthM + BoilerCrownCoverageHeightM + BoilerCrownHeightM) + (BoilerDiameterM / 2.0f)) / BoilerDiameterM; // max height of water gauge as a fraction of boiler level
1573
1573
WaterGlassMinLevel = referenceBoilerLevelFraction; // min height of water gauge as a fraction of boiler level
1574
1574
1575
-
BoilerWaterFractionAbs = (WaterMinLevel + WaterMaxLevel) / 2; // Initialise current boiler water level
1575
+
BoilerWaterFractionAbs = (WaterGlassMinLevel + WaterGlassMaxLevel) / 2; // Initialise current boiler water level to halfway up glass
1576
1576
1577
1577
float MaxWaterFraction = BoilerWaterFractionAbs; // Initialise the max water fraction when the boiler starts
1578
1578
1579
-
1580
1579
if (BoilerEvapRateLbspFt2 == 0) // If boiler evaporation rate is not in ENG file then set a default value
1581
1580
{
1582
1581
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
0 commit comments