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-870-ge0bf062eb and 17 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting
- 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 9c456aa: Blueprint/train car operations UI window
- Pull request #885 at 8f94333: feat: Add notifications to Menu
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- 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 #897 at 42f1dd9: feat: Improved system information collection
- Pull request #903 at 9bead33: Downloading route content (Github, zip)
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #912 at d595703: New Triple Valve Features Vol. 2
- Pull request #914 at 476d67b: Adjustments to Duplex steam
- Pull request #915 at 6d911d7: Correct calculation error with curve friction
- Pull request #917 at fde18cf: Lighting Configuration Enhancements
- Pull request #918 at f7ba507: Manual - News topics updated since 1.5.1
Copy file name to clipboardExpand all lines: Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
+58-25Lines changed: 58 additions & 25 deletions
Original file line number
Diff line number
Diff line change
@@ -656,8 +656,6 @@ public float TenderCoalMassKG // Decreased by firing and increased
656
656
657
657
float ReciprocatingWeightLb = 580.0f; // Weight of reciprocating parts of the rod driving gears
658
658
float ConnectingRodWeightLb = 600.0f; // Weignt of connecting rod
659
-
float ConnectingRodBalanceWeightLb = 300.0f; // Balance weight for connecting rods
660
-
float ExcessBalanceFactor = 400.0f; // Factor to be included in excess balance formula
661
659
float CrankRadiusFt = 1.08f; // Assume crank and rod lengths to give a 1:10 ratio - a reasonable av for steam locomotives?
662
660
float ConnectRodLengthFt = 10.8f;
663
661
float RodCoGFt = 4.32f; // 0.4 from crank end of rod
@@ -1229,25 +1227,6 @@ public override void Initialize()
1229
1227
if (ZeroError(BoilerVolumeFT3, "BoilerVolume"))
1230
1228
BoilerVolumeFT3 = 1;
1231
1229
1232
-
// For light locomotives reduce the weight of the various connecting rods, as the default values are for larger locomotives. This will reduce slip on small locomotives
1233
-
// It is not believed that the weight reduction on the connecting rods is linear with the weight of the locmotive. However this requires futher research, and this section is a
1234
-
// work around until any further research is undertaken
1235
-
// "The following code provides a simple 2-step adjustment, as not enough information is currently available for a more flexible one."
1236
-
if (MassKG < Kg.FromTUS(10))
1237
-
{
1238
-
const float reductionfactor = 0.2f;
1239
-
ReciprocatingWeightLb = 580.0f * reductionfactor; // Weight of reciprocating parts of the rod driving gears
1240
-
ConnectingRodWeightLb = 600.0f * reductionfactor; // Weignt of connecting rod
@@ -2020,6 +1999,26 @@ public override void Initialize()
2020
1999
SteamEngines[i].MaxIndicatedHorsePowerHP = MaxSpeedFactor * (SteamEngines[i].MaxTractiveEffortLbf * MaxLocoSpeedMpH) / 375.0f; // To be checked what MaxTractive Effort is for the purposes of this formula.
SteamEngines[i].ExcessWheelBalanceLbs = 440f; // set to a default value.
2006
+
}
2007
+
2008
+
// For light locomotives reduce the weight of the various connecting rods, as the default values are for larger locomotives. This will reduce slip on small locomotives
2009
+
// It is not believed that the weight reduction on the connecting rods is linear with the weight of the locmotive. However this requires futher research, and this section is a
2010
+
// work around until any further research is undertaken
2011
+
// "The following code provides a simple 2-step adjustment, as not enough information is currently available for a more flexible one."
0 commit comments