Skip to content

Commit d202f62

Browse files
committed
Automatic merge of T1.5.1-1004-g6fd841761e and 19 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 8f695a4: Blueprint/train car operations UI window - Pull request #885 at 2728d6d: 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 0d3e70b: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #949 at 2a3bfc5: Oil Burning Locomotive - 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 6adc5a3: Map settings saved - Pull request #960 at c8e2a28: Fix draw state name in scripts
21 parents ee40f03 + 6fd8417 + dfc715e + d00beb9 + f92de76 + 8f695a4 + 2728d6d + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + 0d3e70b + 66f836c + 2a3bfc5 + b2af1f5 + a519452 + 84c2f4b + 6adc5a3 + c8e2a28 commit d202f62

File tree

3 files changed

+736
-104
lines changed

3 files changed

+736
-104
lines changed

Source/Orts.Simulation/Common/Events.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ public enum Event
147147
WaterInjector1On,
148148
WaterInjector2Off,
149149
WaterInjector2On,
150+
WaterMotionPump1Off,
151+
WaterMotionPump1On,
152+
WaterMotionPump2Off,
153+
WaterMotionPump2On,
150154
BlowdownValveToggle,
151155
SteamHeatChange,
152156
SteamPulse1,
@@ -378,7 +382,13 @@ public static Event From(Source source, int eventID)
378382
case 66: return Event.Pantograph2Up;
379383
case 67: return Event.Pantograph2Down;
380384

385+
381386
// ORTS only Events
387+
case 90: return Event.WaterMotionPump1On;
388+
case 91: return Event.WaterMotionPump1Off;
389+
case 92: return Event.WaterMotionPump2On;
390+
case 93: return Event.WaterMotionPump2Off;
391+
382392
case 101: return Event.GearUp; // for gearbox based engines
383393
case 102: return Event.GearDown; // for gearbox based engines
384394
case 103: return Event.ReverserToForwardBackward; // reverser moved to forward or backward position

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,25 @@ public float CurrentLocomotiveSteamHeatBoilerWaterCapacityL
239239
//float DebugSpeed = 5.0f; // Initialise at 5 mph
240240
//float DebugTimer = 0.0f;
241241

242+
public enum SteamLocomotiveFuelTypes
243+
{
244+
Unknown,
245+
Oil,
246+
Wood, // not used at the moment
247+
Coal, // defaults to coal
248+
}
249+
250+
public SteamLocomotiveFuelTypes SteamLocomotiveFuelType;
251+
252+
public enum SteamLocomotiveFeedWaterSystemTypes
253+
{
254+
Unknown,
255+
MotionPump,
256+
SteamInjector, // not used at the moment
257+
}
258+
259+
public SteamLocomotiveFeedWaterSystemTypes SteamLocomotiveFeedWaterType;
260+
242261
// Adhesion parameters
243262
public enum SlipControlType
244263
{

0 commit comments

Comments
 (0)