Skip to content

Commit ce56f6e

Browse files
committed
Automatic merge of T1.5.1-922-g0a17d985e and 16 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 3ca0eb1: Blueprint/train car operations UI window - Pull request #885 at 03d4a52: 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 #903 at 29f3d1a: Downloading route content (Github, zip) - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #923 at e0f3c55: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements - Pull request #925 at e3b1688: Fix brakeshoe force bug - Pull request #927 at cf687d4: AI Train Power Supply/Lights Fix - Pull request #928 at 1f23512: Fix Missing Initializations From Copy in MSTSLocomotive
18 parents fda6310 + 0a17d98 + 3539862 + d00beb9 + f92de76 + 3ca0eb1 + 03d4a52 + 6c0785b + 1f5ba4c + 5866028 + 29f3d1a + f7b85e4 + 26cc6a8 + e0f3c55 + 6c2c3cd + e3b1688 + cf687d4 + 1f23512 commit ce56f6e

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,16 +1275,28 @@ public override void Copy(MSTSWagon copy)
12751275
CompressorRestartPressurePSI = locoCopy.CompressorRestartPressurePSI;
12761276
CompressorIsMUControlled = locoCopy.CompressorIsMUControlled;
12771277
TrainBrakePipeLeakPSIorInHgpS = locoCopy.TrainBrakePipeLeakPSIorInHgpS;
1278+
BrakePipeTimeFactorS = locoCopy.BrakePipeTimeFactorS;
1279+
BrakeServiceTimeFactorPSIpS = locoCopy.BrakeServiceTimeFactorPSIpS;
1280+
BrakeEmergencyTimeFactorPSIpS = locoCopy.BrakeEmergencyTimeFactorPSIpS;
1281+
BrakePipeChargingRatePSIorInHgpS = locoCopy.BrakePipeChargingRatePSIorInHgpS;
1282+
BrakePipeQuickChargingRatePSIpS = locoCopy.BrakePipeQuickChargingRatePSIpS;
12781283
MaxMainResPressurePSI = locoCopy.MaxMainResPressurePSI;
12791284
MainResPressurePSI = locoCopy.MaxMainResPressurePSI;
12801285
MaximumMainReservoirPipePressurePSI = locoCopy.MaximumMainReservoirPipePressurePSI;
12811286
MainResVolumeM3 = locoCopy.MainResVolumeM3;
12821287
MainResChargingRatePSIpS = locoCopy.MainResChargingRatePSIpS;
1288+
EngineBrakeApplyRatePSIpS = locoCopy.EngineBrakeApplyRatePSIpS;
1289+
EngineBrakeReleaseRatePSIpS = locoCopy.EngineBrakeReleaseRatePSIpS;
12831290
BrakePipeDischargeTimeFactor = locoCopy.BrakePipeDischargeTimeFactor;
12841291
DriveWheelOnlyBrakes = locoCopy.DriveWheelOnlyBrakes;
12851292
DynamicBrakeBlendingEnabled = locoCopy.DynamicBrakeBlendingEnabled;
12861293
DynamicBrakeAvailable = locoCopy.DynamicBrakeAvailable;
12871294
airPipeSystem = locoCopy.airPipeSystem;
1295+
DoesVacuumBrakeCutPower = locoCopy.DoesBrakeCutPower;
1296+
DoesBrakeCutPower = locoCopy.DoesBrakeCutPower;
1297+
BrakeCutsPowerAtBrakeCylinderPressurePSI = locoCopy.BrakeCutsPowerAtBrakeCylinderPressurePSI;
1298+
BrakeCutsPowerAtBrakePipePressurePSI = locoCopy.BrakeCutsPowerAtBrakePipePressurePSI;
1299+
BrakeRestoresPowerAtBrakePipePressurePSI = locoCopy.BrakeRestoresPowerAtBrakePipePressurePSI;
12881300
DynamicBrakeCommandStartTime = locoCopy.DynamicBrakeCommandStartTime;
12891301
DynamicBrakeBlendingOverride = locoCopy.DynamicBrakeBlendingOverride;
12901302
DynamicBrakeBlendingForceMatch = locoCopy.DynamicBrakeBlendingForceMatch;
@@ -1293,6 +1305,7 @@ public override void Copy(MSTSWagon copy)
12931305
MainPressureUnit = locoCopy.MainPressureUnit;
12941306
BrakeSystemPressureUnits = locoCopy.BrakeSystemPressureUnits;
12951307
IsDriveable = copy.IsDriveable;
1308+
EngineOperatingProcedures = locoCopy.EngineOperatingProcedures;
12961309

12971310
ThrottleController = (MSTSNotchController)locoCopy.ThrottleController.Clone();
12981311
SteamHeatController = (MSTSNotchController)locoCopy.SteamHeatController.Clone();
@@ -1310,9 +1323,14 @@ public override void Copy(MSTSWagon copy)
13101323
}
13111324
else
13121325
DPDynamicBrakeController = null;
1326+
DPSyncTrainApplication = locoCopy.DPSyncTrainApplication;
1327+
DPSyncTrainRelease = locoCopy.DPSyncTrainRelease;
1328+
DPSyncEmergency = locoCopy.DPSyncEmergency;
1329+
DPSyncIndependent = locoCopy.DPSyncIndependent;
13131330

13141331
LocomotivePowerSupply.Copy(locoCopy.LocomotivePowerSupply);
13151332
TrainControlSystem.Copy(locoCopy.TrainControlSystem);
1333+
VigilanceMonitor = locoCopy.VigilanceMonitor;
13161334
LocomotiveName = locoCopy.LocomotiveName;
13171335
MaxVaccuumMaxPressurePSI = locoCopy.MaxVaccuumMaxPressurePSI;
13181336
VacuumBrakeEQFitted = locoCopy.VacuumBrakeEQFitted;
@@ -1326,6 +1344,8 @@ public override void Copy(MSTSWagon copy)
13261344
WaterScoopWidthM = locoCopy.WaterScoopWidthM;
13271345
CruiseControl = locoCopy.CruiseControl?.Clone(this);
13281346
MultiPositionControllers = locoCopy.CloneMPC(this);
1347+
OnLineCabRadio = locoCopy.OnLineCabRadio;
1348+
OnLineCabRadioURL = locoCopy.OnLineCabRadioURL;
13291349
}
13301350

13311351
/// <summary>

0 commit comments

Comments
 (0)