Skip to content

Commit 764a1f1

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-797-gabb8eb9a4 and 13 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 8794ec0: Duplex steam engines - Booster Engine addition - 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 #909 at c3a572a: Correct Control Car crash bug
15 parents 7a8df6f + abb8eb9 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 0a9d939 + 8794ec0 + 9b0b04f + 4b4afe3 + c3a572a commit 764a1f1

File tree

4 files changed

+89
-67
lines changed

4 files changed

+89
-67
lines changed

‎Source/Orts.Formats.Msts/SoundManagmentFile.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public struct CurvePoint
198198

199199
public class VolumeCurve
200200
{
201-
public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable2_1Controlled, Variable3_1Controlled, Variable4_1Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
201+
public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
202202

203203
public Controls Control = Controls.None;
204204
public float Granularity = 1.0f;
@@ -214,9 +214,9 @@ public VolumeCurve(STFReader stf)
214214
case "distancecontrolled": Control = Controls.DistanceControlled; break;
215215
case "speedcontrolled": Control = Controls.SpeedControlled; break;
216216
case "variable1controlled": Control = Controls.Variable1Controlled; break;
217-
case "variable2_1controlled": Control = Controls.Variable2_1Controlled; break;
218-
case "variable3_1controlled": Control = Controls.Variable3_1Controlled; break;
219-
case "variable4_1controlled": Control = Controls.Variable4_1Controlled; break;
217+
case "variable1_2controlled": Control = Controls.Variable1_2Controlled; break;
218+
case "variable1_3controlled": Control = Controls.Variable1_3Controlled; break;
219+
case "variable1_4controlled": Control = Controls.Variable1_4Controlled; break;
220220
case "variable2controlled": Control = Controls.Variable2Controlled; break;
221221
case "variable2boostercontrolled": Control = Controls.Variable2BoosterControlled; break;
222222
case "variable3controlled": Control = Controls.Variable3Controlled; break;
@@ -343,7 +343,7 @@ public Discrete_Trigger(STFReader f)
343343
public class Variable_Trigger : Trigger
344344
{
345345
public enum Events { Speed_Inc_Past, Speed_Dec_Past, Distance_Inc_Past, Distance_Dec_Past,
346-
Variable1_Inc_Past, Variable2_1_Inc_Past, Variable3_1_Inc_Past, Variable4_1_Inc_Past, Variable1_Dec_Past, Variable2_1_Dec_Past, Variable3_1_Dec_Past, Variable4_1_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past
346+
Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past
347347
};
348348

349349
public Events Event;
@@ -374,13 +374,13 @@ public Variable_Trigger(STFReader f)
374374
break;
375375
}
376376
case "variable1_inc_past": Event = Events.Variable1_Inc_Past; break;
377-
case "variable2_1_inc_past": Event = Events.Variable2_1_Inc_Past; break;
378-
case "variable3_1_inc_past": Event = Events.Variable3_1_Inc_Past; break;
379-
case "variable4_1_inc_past": Event = Events.Variable4_1_Inc_Past; break;
377+
case "variable1_2_inc_past": Event = Events.Variable1_2_Inc_Past; break;
378+
case "variable1_3_inc_past": Event = Events.Variable1_3_Inc_Past; break;
379+
case "variable1_4_inc_past": Event = Events.Variable1_4_Inc_Past; break;
380380
case "variable1_dec_past": Event = Events.Variable1_Dec_Past; break;
381-
case "variable2_1_dec_past": Event = Events.Variable2_1_Dec_Past; break;
382-
case "variable3_1_dec_past": Event = Events.Variable3_1_Dec_Past; break;
383-
case "variable4_1_dec_past": Event = Events.Variable4_1_Dec_Past; break;
381+
case "variable1_2_dec_past": Event = Events.Variable1_2_Dec_Past; break;
382+
case "variable1_3_dec_past": Event = Events.Variable1_3_Dec_Past; break;
383+
case "variable1_4_dec_past": Event = Events.Variable1_4_Dec_Past; break;
384384
case "variable2_inc_past": Event = Events.Variable2_Inc_Past; break;
385385
case "variable2_dec_past": Event = Events.Variable2_Dec_Past; break;
386386
case "variable3_inc_past": Event = Events.Variable3_Inc_Past; break;

‎Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs‎

Lines changed: 51 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3067,7 +3067,7 @@ private void UpdateFX(float elapsedClockSeconds)
30673067
BoosterCylinderSteamExhaust02SteamVolumeM3pS = BoosterCylinderSteamExhaustOn && BoosterCylinderSteamExhaust02On ? (10.0f * BoosterSteamFraction) : 0.0f;
30683068
BoosterCylinderSteamExhaust02SteamVelocityMpS = 100.0f;
30693069

3070-
// Trace.TraceInformation("Booster Exhaust - ExhaustOn {0} Exhaust01On {1} Exhaust02On {2} ExhaustVolume01 {3} ExhaustVolume02 {4} SteamFraction {5} Speed {6}", BoosterCylinderSteamExhaustOn, BoosterCylinderSteamExhaust01On, BoosterCylinderSteamExhaust02On, BoosterCylinderSteamExhaust01SteamVolumeM3pS, BoosterCylinderSteamExhaust02SteamVolumeM3pS, BoosterSteamFraction, BoosterEngineSpeedRpM);
3070+
// Trace.TraceInformation("Booster Exhaust - ExhaustOn {0} Exhaust01On {1} Exhaust02On {2} ExhaustVolume01 {3} ExhaustVolume02 {4} SteamFraction {5} Speed {6}", BoosterCylinderSteamExhaustOn, BoosterCylinderSteamExhaust01On, BoosterCylinderSteamExhaust02On, BoosterCylinderSteamExhaust01SteamVolumeM3pS, BoosterCylinderSteamExhaust02SteamVolumeM3pS, BoosterSteamFraction, BoosterEngineSpeedRpM);
30713071

30723072
// Booster Cylinder Steam Cylinder Cocks (automatic)
30733073
BoosterCylinderCockSteam11VolumeMpS = BoosterCylinderCocksOn && BoosterCylinderCock11On ? (10.0f * BoosterSteamFraction) : 0.0f;
@@ -3216,6 +3216,8 @@ private void UpdateFX(float elapsedClockSeconds)
32163216
for (int i = 0; i < SteamEngines.Count; i++)
32173217
{
32183218

3219+
variable[i] = 0;
3220+
32193221
// Variable is proportional to angular speed, value of 10 means 1 rotation/second.
32203222
// If wheel is not slipping then use normal wheel speed, this reduces oscillations in variable1 which causes issues with sounds.
32213223

@@ -3231,17 +3233,28 @@ private void UpdateFX(float elapsedClockSeconds)
32313233
variable[i] = ThrottlePercent == 0 ? 0 : variable[i];
32323234

32333235
// overwrite Booster variable if in Idle or Run mode - gears not engaged
3234-
if (SteamEngines[i].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster && (SteamBoosterRunMode && !BoosterGearsEngaged) || SteamBoosterIdleMode)
3236+
if (SteamEngines[i].AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)
32353237
{
3236-
variable[i] = BoosterEngineSpeedRpM / MathHelper.Pi * 5;
3238+
if (!SteamBoosterAirOpen || BoosterAirisLow) // Booster is off
3239+
{
3240+
variable[i] = 0;
3241+
}
3242+
else if ((SteamBoosterRunMode && !BoosterGearsEngaged) || SteamBoosterIdleMode) // Run mode - gears not engaged, and Idle mode
3243+
{
3244+
variable[i] = pS.FrompM(BoosterEngineSpeedRpM) * 5;
3245+
}
3246+
else if (SteamBoosterRunMode && BoosterGearsEngaged) // Run mode - gears engaged, runs in similar fashion to main engine.
3247+
{
3248+
variable[i] = variable[i];
3249+
}
32373250
}
32383251
}
32393252

32403253
// Set variables for each engine
32413254
Variable1 = variable[0];
3242-
Variable2_1 = variable[1];
3243-
Variable3_1 = variable[2];
3244-
Variable4_1 = variable[3];
3255+
Variable1_2 = variable[1];
3256+
Variable1_3 = variable[2];
3257+
Variable1_4 = variable[3];
32453258

32463259
Variable2 = MathHelper.Clamp((CylinderCocksPressureAtmPSI - OneAtmospherePSI) / BoilerPressurePSI * 100f, 0, 100);
32473260

@@ -3251,11 +3264,12 @@ private void UpdateFX(float elapsedClockSeconds)
32513264
}
32523265
else if ((SteamBoosterRunMode && !BoosterGearsEngaged) || SteamBoosterIdleMode) // Run mode - gears not engaged, and Idle mode
32533266
{
3254-
Variable2_Booster = CabSteamBoosterPressurePSI / MaxBoilerPressurePSI;
3267+
Variable2_Booster = (CabSteamBoosterPressurePSI / MaxBoilerPressurePSI) * 100f;
32553268
}
3256-
else if (SteamBoosterRunMode && BoosterGearsEngaged) // Run mode - gears engaged
3269+
else if (SteamBoosterRunMode && BoosterGearsEngaged) // Run mode - gears engaged, runs in similar fashion to main engine.
32573270
{
3258-
Variable2_Booster = CabSteamChestPressurePSI / MaxBoilerPressurePSI;
3271+
// Variable2_Booster = CabSteamChestPressurePSI / MaxBoilerPressurePSI;
3272+
Variable2_Booster = Variable2;
32593273
}
32603274

32613275
Variable3 = FuelRateSmoothed * 100;
@@ -6045,7 +6059,6 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
60456059
SteamEngines[numberofengine].TractiveForceN = N.FromLbf((SteamEngines[numberofengine].MaxIndicatedHorsePowerHP * 375.0f) / pS.TopH(Me.ToMi(SpeedMpS)));
60466060
SteamEngines[numberofengine].IndicatedHorsePowerHP = SteamEngines[numberofengine].MaxIndicatedHorsePowerHP; // Set IHP to maximum value
60476061
IsCritTELimit = true; // Flag if limiting TE
6048-
60496062
}
60506063
else
60516064
{
@@ -6102,8 +6115,6 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
61026115

61036116
SteamEngines[i].CompareIndicatedHorsePower = (N.ToLbf(SteamEngines[i].TractiveForceN) * pS.TopH(Me.ToMi(absSpeedMpS))) / 375.0f;
61046117

6105-
6106-
61076118
// Set Max Power equal to max IHP
61086119
MaxPowerW += W.FromHp(SteamEngines[i].MaxIndicatedHorsePowerHP);
61096120

@@ -6148,7 +6159,6 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
61486159
{
61496160
TractiveForceN = 0;
61506161
}
6151-
61526162
}
61536163

61546164

@@ -7508,7 +7518,7 @@ public override string GetDebugStatus()
75087518
);
75097519

75107520
// Temporary debug script.
7511-
status.AppendFormat("{0}\t{1}\t{2:N2}\t{3}\t{4:N2}\t{5}\t{6:N2}\t{7}\t{8}\t{9}\t{10}\n",
7521+
status.AppendFormat("{0}\t{1}\t{2:N2}\t{3}\t{4:N2}\t{5}\t{6:N2}\t{7}\t{8}\t{9}\t{10:N2}\n",
75127522
Simulator.Catalog.GetString("Boost:"),
75137523
Simulator.Catalog.GetString("GearT"),
75147524
BoosterGearEngageTimerS,
@@ -7573,6 +7583,33 @@ public override string GetDebugStatus()
75737583
Train.LastCar.CarNetHeatFlowRateW);
75747584
}
75757585

7586+
#if DEBUG_STEAM_SOUND_VARIABLES
7587+
7588+
status.AppendFormat("\n\t\t === {0} === \n", Simulator.Catalog.GetString("Sound Variables"));
7589+
status.AppendFormat("{0}\t{1:N2}\t{2}\t{3:N2}\t{4}\t{5:N2}\t{6}\t{7:N2}\t{8}\t{9:N2}\t{10}\t{11:N2}\t{12}\t{13:N2}\n",
7590+
Simulator.Catalog.GetString("V1:"),
7591+
Variable1,
7592+
Simulator.Catalog.GetString("V2:"),
7593+
Variable2,
7594+
Simulator.Catalog.GetString("V3:"),
7595+
Variable3,
7596+
7597+
7598+
Simulator.Catalog.GetString("V1_2:"),
7599+
Variable1_2,
7600+
Simulator.Catalog.GetString("V1_3:"),
7601+
Variable1_3,
7602+
Simulator.Catalog.GetString("V1_4:"),
7603+
Variable1_4,
7604+
7605+
Simulator.Catalog.GetString("V2_B:"),
7606+
Variable2_Booster
7607+
7608+
7609+
);
7610+
7611+
#endif
7612+
75767613
status.AppendFormat("\n\t\t === {0} === \n", Simulator.Catalog.GetString("Fireman"));
75777614
status.AppendFormat("{0}\t{1}\t{2}\t\t{3}\t{4}\t\t{5}\t{6:N0}/{13}\t\t{7}\t{8:N0}/{13}\t\t{9}\t{10:N0}/{13}\t\t{11}\t{12}/{14}{13}\t{15}\t{16}/{18}{17}\t\t{19}\t{20:N0}\n",
75787615
Simulator.Catalog.GetString("Fire:"),
@@ -7988,21 +8025,6 @@ public override string GetDebugStatus()
79888025
);
79898026

79908027

7991-
#endif
7992-
7993-
7994-
#if DEBUG_STEAM_SOUND_VARIABLES
7995-
7996-
status.AppendFormat("\n\t\t === {0} === \n", Simulator.Catalog.GetString("Sound Variables"));
7997-
status.AppendFormat("{0}\t{1:N2}\t{2}\t{3:N2}\t{4}\t{5:N2}\n",
7998-
Simulator.Catalog.GetString("V1:"),
7999-
Variable1,
8000-
Simulator.Catalog.GetString("V2:"),
8001-
Variable2,
8002-
Simulator.Catalog.GetString("V3:"),
8003-
Variable3
8004-
);
8005-
80068028
#endif
80078029

80088030
// If vacuum braked display information on ejectors

‎Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ public enum WindowState
112112
public float Variable2;
113113
public float Variable3;
114114
// additional engines
115-
public float Variable2_1;
116-
public float Variable3_1;
117-
public float Variable4_1;
115+
public float Variable1_2;
116+
public float Variable1_3;
117+
public float Variable1_4;
118118
public float Variable2_Booster;
119119

120120
// wag file data
@@ -1823,9 +1823,9 @@ public override void Save(BinaryWriter outf)
18231823
outf.Write(Variable2);
18241824
outf.Write(Variable2_Booster);
18251825
outf.Write(Variable3);
1826-
outf.Write(Variable2_1);
1827-
outf.Write(Variable3_1);
1828-
outf.Write(Variable4_1);
1826+
outf.Write(Variable1_2);
1827+
outf.Write(Variable1_3);
1828+
outf.Write(Variable1_4);
18291829
outf.Write(IsDavisFriction);
18301830
outf.Write(IsRollerBearing);
18311831
outf.Write(IsLowTorqueRollerBearing);
@@ -1888,9 +1888,9 @@ public override void Restore(BinaryReader inf)
18881888
Variable2 = inf.ReadSingle();
18891889
Variable2_Booster = inf.ReadSingle();
18901890
Variable3 = inf.ReadSingle();
1891-
Variable2_1 = inf.ReadSingle();
1892-
Variable3_1 = inf.ReadSingle();
1893-
Variable4_1 = inf.ReadSingle();
1891+
Variable1_2 = inf.ReadSingle();
1892+
Variable1_3 = inf.ReadSingle();
1893+
Variable1_4 = inf.ReadSingle();
18941894
IsDavisFriction = inf.ReadBoolean();
18951895
IsRollerBearing = inf.ReadBoolean();
18961896
IsLowTorqueRollerBearing = inf.ReadBoolean();

‎Source/RunActivity/Viewer3D/Sound.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,9 +1494,9 @@ private float ReadValue(Orts.Formats.Msts.VolumeCurve.Controls control, MSTSWago
14941494
case Orts.Formats.Msts.VolumeCurve.Controls.DistanceControlled: return SoundSource.DistanceSquared;
14951495
case Orts.Formats.Msts.VolumeCurve.Controls.SpeedControlled: return car.AbsSpeedMpS;
14961496
case Orts.Formats.Msts.VolumeCurve.Controls.Variable1Controlled: return car.Variable1;
1497-
case Orts.Formats.Msts.VolumeCurve.Controls.Variable2_1Controlled: return car.Variable2_1;
1498-
case Orts.Formats.Msts.VolumeCurve.Controls.Variable3_1Controlled: return car.Variable3_1;
1499-
case Orts.Formats.Msts.VolumeCurve.Controls.Variable4_1Controlled: return car.Variable4_1;
1497+
case Orts.Formats.Msts.VolumeCurve.Controls.Variable1_2Controlled: return car.Variable1_2;
1498+
case Orts.Formats.Msts.VolumeCurve.Controls.Variable1_3Controlled: return car.Variable1_3;
1499+
case Orts.Formats.Msts.VolumeCurve.Controls.Variable1_4Controlled: return car.Variable1_4;
15001500
case Orts.Formats.Msts.VolumeCurve.Controls.Variable2BoosterControlled: return car.Variable2_Booster;
15011501
case Orts.Formats.Msts.VolumeCurve.Controls.Variable2Controlled: return car.Variable2;
15021502
case Orts.Formats.Msts.VolumeCurve.Controls.Variable3Controlled: return car.Variable3;
@@ -1929,9 +1929,9 @@ public override void TryTrigger( )
19291929
case Orts.Formats.Msts.Variable_Trigger.Events.Distance_Dec_Past:
19301930
case Orts.Formats.Msts.Variable_Trigger.Events.Speed_Dec_Past:
19311931
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_Dec_Past:
1932-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_1_Dec_Past:
1933-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_1_Dec_Past:
1934-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable4_1_Dec_Past:
1932+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_2_Dec_Past:
1933+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_3_Dec_Past:
1934+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_4_Dec_Past:
19351935
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_Dec_Past:
19361936
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_Dec_Past:
19371937
case Orts.Formats.Msts.Variable_Trigger.Events.BrakeCyl_Dec_Past:
@@ -1946,9 +1946,9 @@ public override void TryTrigger( )
19461946
case Orts.Formats.Msts.Variable_Trigger.Events.Distance_Inc_Past:
19471947
case Orts.Formats.Msts.Variable_Trigger.Events.Speed_Inc_Past:
19481948
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_Inc_Past:
1949-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_1_Inc_Past:
1950-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_1_Inc_Past:
1951-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable4_1_Inc_Past:
1949+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_2_Inc_Past:
1950+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_3_Inc_Past:
1951+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_4_Inc_Past:
19521952
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_Inc_Past:
19531953
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_Inc_Past:
19541954
case Orts.Formats.Msts.Variable_Trigger.Events.BrakeCyl_Inc_Past:
@@ -2015,15 +2015,15 @@ private float ReadValue()
20152015
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_Dec_Past:
20162016
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_Inc_Past:
20172017
return car.Variable1;
2018-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_1_Dec_Past:
2019-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_1_Inc_Past:
2020-
return car.Variable2_1;
2021-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_1_Dec_Past:
2022-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_1_Inc_Past:
2023-
return car.Variable3_1;
2024-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable4_1_Dec_Past:
2025-
case Orts.Formats.Msts.Variable_Trigger.Events.Variable4_1_Inc_Past:
2026-
return car.Variable4_1;
2018+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_2_Dec_Past:
2019+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_2_Inc_Past:
2020+
return car.Variable1_2;
2021+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_3_Dec_Past:
2022+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_3_Inc_Past:
2023+
return car.Variable1_3;
2024+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_4_Dec_Past:
2025+
case Orts.Formats.Msts.Variable_Trigger.Events.Variable1_4_Inc_Past:
2026+
return car.Variable1_4;
20272027
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_Dec_Past:
20282028
case Orts.Formats.Msts.Variable_Trigger.Events.Variable2_Inc_Past:
20292029
return car.Variable2;

0 commit comments

Comments
 (0)