Skip to content

Commit cc1b5b6

Browse files
committed
Extra curve squeal variables
1 parent 5489025 commit cc1b5b6

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Source/Orts.Formats.Msts/SoundManagmentFile.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public Discrete_Trigger(STFReader f)
346346
public class Variable_Trigger : Trigger
347347
{
348348
public enum Events { Speed_Inc_Past, Speed_Dec_Past, Distance_Inc_Past, Distance_Dec_Past,
349-
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
349+
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, AngleofAttack_Inc_Past, AngleofAttack_Dec_Past
350350
};
351351

352352
public Events Event;
@@ -392,6 +392,8 @@ public Variable_Trigger(STFReader f)
392392
case "brakecyl_dec_past": Event = Events.BrakeCyl_Dec_Past; break;
393393
case "curveforce_inc_past": Event = Events.CurveForce_Inc_Past; break;
394394
case "curveforce_dec_past": Event = Events.CurveForce_Dec_Past; break;
395+
case "angleofattack_inc_past": Event = Events.AngleofAttack_Inc_Past; break;
396+
case "angleofattack_dec_past": Event = Events.AngleofAttack_Dec_Past; break;
395397
}
396398

397399

Source/RunActivity/Viewer3D/Sound.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,6 +1951,7 @@ public override void TryTrigger( )
19511951
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_Dec_Past:
19521952
case Orts.Formats.Msts.Variable_Trigger.Events.BrakeCyl_Dec_Past:
19531953
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Dec_Past:
1954+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Dec_Past:
19541955
if (newValue < SMS.Threshold)
19551956
{
19561957
Signaled = true;
@@ -1968,6 +1969,7 @@ public override void TryTrigger( )
19681969
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_Inc_Past:
19691970
case Orts.Formats.Msts.Variable_Trigger.Events.BrakeCyl_Inc_Past:
19701971
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Inc_Past:
1972+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Inc_Past:
19711973
if (newValue > SMS.Threshold)
19721974
{
19731975
Signaled = true;
@@ -2051,6 +2053,9 @@ private float ReadValue()
20512053
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Dec_Past:
20522054
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Inc_Past:
20532055
return car.CurveForceNFiltered;
2056+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Dec_Past:
2057+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Inc_Past:
2058+
return car.CurveSquealAoAmRadFiltered;
20542059
default:
20552060
return 0;
20562061
}

0 commit comments

Comments
 (0)