Skip to content

Commit

Permalink
Automatic merge of T1.5.1-155-g6cf0e6461 and 11 pull requests
Browse files Browse the repository at this point in the history
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #744 at 3c2dc07: Fixed and improved cabview control conditions related to power supply state
- Pull request #746 at b6acfde: Website release 1.5.1
- Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111
- Pull request #749 at db5764c: OpenRailway Map
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at ed72cdb: Steam wheel slip#1
  • Loading branch information
openrails-bot committed Dec 29, 2022
13 parents 0e5f318 + 6cf0e64 + 91bcfa2 + 13a1638 + fb9079e + aac9b67 + 3c2dc07 + b6acfde + 4f0e878 + db5764c + ab8fe32 + 70a1325 + ed72cdb commit 022656d
Show file tree
Hide file tree
Showing 7 changed files with 929 additions and 583 deletions.
29 changes: 20 additions & 9 deletions Source/Documentation/Manual/physics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2022,13 +2022,22 @@ of a relevant wagon (including diesel, steam or electric locomotives.

OR supports the following special visual effects in a steam locomotive:

- Steam cylinders (named ``CylindersFX`` and ``Cylinders2FX``) -- two effects
are provided which will represent the steam exhausted when the steam
cylinder cocks are opened. Two effects are provided to represent the steam
exhausted at the front and rear of each piston stroke. These effects will
appear whenever the cylinder cocks are opened, and there is sufficient
steam pressure at the cylinder to cause the steam to exhaust, typically the
regulator is open (> 0%).
- Steam cylinder cocks (named ``Cylinders11FX``, ``Cylinders12FX``, ``Cylinders21FX``,
``Cylinders22FX``, ``Cylinders31FX``, ``Cylinders32FX``, ``Cylinders41FX``,
``Cylinders42FX``) -- these effects are provided which will represent the steam
exhausted when the steam cylinder cocks are opened. The effects are provided to
represent the steam exhausted at the front and rear of each piston stroke. The
numbers in the value names represent firstly the cylinder and the second the
cylinder position, ie "11" = cylinder 1, front stroke, "12" = cylinder 1, backward
stroke. These effects will appear whenever the cylinder cocks are opened, and
there is sufficient steam pressure at the cylinder to cause the steam to exhaust,
typically when the regulator is open (> 0%). Note: ``CylindersFX`` and ``Cylinders2FX``
should now be considered legacy parameters and ideally should not be used.
- Cylinder Exhaust (named ``CylinderSteamExhaust1FX``, ``CylinderSteamExhaust2FX``,
``CylinderSteamExhaust3FX``, ``CylinderSteamExhaust4FX``) -- these effects represent
the steam exhausted from the cylinders at the end of each stroke. Typically this
steam is feed back through a blast pipe up the smoke stack to improve draught in the
firebox and bolier. The above parameters represent up to 4 individual steam cylinders.
- Stack (named ``StackFX``) -- represents the smoke stack emissions. This
effect will appear all the time in different forms depending upon the firing
and steaming conditions of the locomotive.
Expand Down Expand Up @@ -2085,7 +2094,7 @@ Similarly if any of the co-ordinates are zero, then the effect will not be displ
Each effect is defined by inserting a code block into the ENG/WAG file similar to
the one shown below::

CylindersFX (
Cylinders11FX (
-1.0485 1.0 2.8
-1 0 0
0.1
Expand Down Expand Up @@ -2698,7 +2707,9 @@ Typically this happens with lightly loaded vehicles at lower speeds, and hence t

When a vehicle experiences wheel skid, an indication is provided in the FORCES INFORMATION HUD. To correct the problem the brakes must be released, and then applied slowly to ensure that the wheels are not *locked* up. Wheel skid will only occur if ADVANCED adhesion is selected in the options menu.

(Ref to *Wheel Skidding due to Excessive Brake Force* for additional information)
On some steam locomotives brakes are not applied to all the wheels, possibly only the drive wheels have braking, and the other wheels do not. The following parameter can be set to reflect this for the calculation of skidding.

``ORTSLocomotiveDriveWheelOnlyBraking ( x )`` - where x = 1 if brakes are only fitted to the drive wheels, set to 0 or leave blank if all wheels are braked.

Using the F5 HUD Expanded Braking Information
---------------------------------------------
Expand Down

0 comments on commit 022656d

Please sign in to comment.