Skip to content

Commit 573c251

Browse files
committed
Automatic merge of T1.5.1-799-gb02a6e5d3 and 14 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 a055bca: 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 0a9d939: feat: Improved system information collection - Pull request #899 at 1a49cc4: Duplex steam engines - Booster Engine addition - Pull request #903 at 6c9da3f: 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 #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
16 parents e39b2d8 + b02a6e5 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 0a9d939 + 1a49cc4 + 6c9da3f + 9b0b04f + 4b4afe3 + 6834af0 commit 573c251

File tree

2 files changed

+37
-4
lines changed

2 files changed

+37
-4
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,10 +1268,10 @@ Steam Locomotives with Multiple Engines
12681268

12691269
Some steam locomotives can have multiple steam engines (ie separate steam
12701270
cylinders connected to different wheels), such as the 4-4-4-4 locomotive or
1271-
an articulated Garrat locomotive.
1271+
an articulated Garratt locomotive.
12721272

1273-
To configure these types of locomotives configurations for multiple steam
1274-
engines need to be added to the engine section of the ENG file, would have the
1273+
To configure these types of locomotives configurations, multiple steam
1274+
engines need to be added to the engine section of the ENG file. These should have the
12751275
following format::
12761276

12771277
ORTSSteamEngines ( x
@@ -1290,7 +1290,7 @@ The following parameters can be used to configure the steam engine::
12901290
``MaxIndicatedHorsepower`` - maximum indicated horsepower of steam engine.
12911291
``AttachedAxle`` - the axle wheelset that the steam engine is attached to.
12921292

1293-
To specify the engine as a Booster engine the following additional parameters
1293+
To specify the engine as a Booster engine, the following additional parameters
12941294
can be used::
12951295

12961296
``BoosterCutoff`` - the cutoff point for the Booster steam cylinder.
@@ -1299,6 +1299,30 @@ can be used::
12991299
``AuxiliarySteamEngineType`` - by inserting "Booster" into this parameter the
13001300
engine is defined as a Booster engine.
13011301

1302+
The following steam effects are defined for the 2nd multuple engine:
1303+
1304+
i) Steam Exhausts - these are the exhausts from the two steam cylinders, and would be
1305+
located wherever the steam exhausted out of the cylinders,
1306+
``CylinderSteamExhaust2_1FX``, ``CylinderSteamExhaust2_2FX``, where "x_yFX",
1307+
x = engine number and y = cylinder number.
1308+
1309+
ii) Cylinder Cocks Exhaust - the exhaust out of the cylinder drainage cocks,
1310+
``Cylinders2_11FX``, ``Cylinders2_12FX``, ``Cylinders2_21FX``, ``Cylinders2_22FX``,
1311+
where "x_yzFX", x = engine number, y = cylinder number and z = cylinder position.
1312+
1313+
The following steam effects are defined for the Booster Engine:
1314+
1315+
i) Steam Exhausts - these are the exhausts from the two steam cylinders, and would be
1316+
located wherever the steam exhausted out of the cylinders,
1317+
``BoosterCylinderSteamExhaust01FX``, ``BoosterCylinderSteamExhaust02FX``
1318+
1319+
ii) Cylinder Cocks Exhaust - the exhaust out of the cylinder drainage cocks,
1320+
``BoosterCylinders11FX``, ``BoosterCylinders12FX``, ``BoosterCylinders21FX``,
1321+
``BoosterCylinders22FX``, where "xyFX", x = cylinder number, and y = cylinder position.
1322+
1323+
The following CAB controls have been defined, ``STEAM_BOOSTER_AIR``, ``STEAM_BOOSTER_IDLE``,
1324+
``STEAM_BOOSTER_LATCH``, ``STEAM_BOOSTER_PRESSURE``.
1325+
13021326
Locomotive Types
13031327
................
13041328

Source/Documentation/Manual/sound.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,15 @@ Trigger Function
417417
261 WindowOpening
418418
========= =====================================
419419

420+
The following triggers are related to the steam booster engine:
421+
422+
========= =====================================
423+
Trigger Function
424+
========= =====================================
425+
321 BoosterCylinderCocksOpen
426+
322 BoosterCylinderCocksClose
427+
========= =====================================
428+
420429
Variable Triggers
421430
-----------------
422431

0 commit comments

Comments
 (0)