feat(ale): move control sensing logic to a common handler, incorporat…

…e horn and bell usage
YoRyan · Jul 24, 2024 · 5b792b3 · 5b792b3
1 parent 88a642d
commit 5b792b3
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 141 deletions.
diff --git a/src/lib/alerter.ts b/src/lib/alerter.ts
@@ -37,11 +37,29 @@ export function create({
 }: {
     e: FrpEngine;
     acknowledge: frp.Behavior<boolean>;
-    acknowledgeStream: frp.Stream<any>;
+    acknowledgeStream?: frp.Stream<any>;
     cutIn: frp.Behavior<boolean>;
     countdownS?: number;
     penaltyS?: number;
 }): frp.Stream<AlerterState> {
+    acknowledgeStream ??= frp.compose(
+        e.createOnCvChangeStream(),
+        frp.filter(([name]) => {
+            switch (name) {
+                case "ThrottleAndBrake":
+                case "VirtualThrottle":
+                case "TrainBrakeControl":
+                case "VirtualBrake":
+                case "Horn":
+                case "VirtualHorn":
+                case "Bell":
+                case "VirtualBell":
+                    return true;
+                default:
+                    return false;
+            }
+        })
+    );
     countdownS ??= defaultCountdownS;
     penaltyS ??= defaultPenaltyS;
 

diff --git a/src/lib/shared/multilevel.ts b/src/lib/shared/multilevel.ts
@@ -158,14 +158,7 @@ export function onInit(me: FrpEngine, version: Version) {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/src/lib/shared/p32.ts b/src/lib/shared/p32.ts
@@ -128,14 +128,7 @@ export function onInit(me: FrpEngine, isAmtrak: boolean) {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "TrainBrakeControl")
-    );
-    const alerter$ = frp.compose(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        frp.hub()
-    );
+    const alerter$ = frp.compose(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), frp.hub());
     const alerterState = frp.stepper(alerter$, undefined);
     alerter$(({ alarm }) => {
         me.rv.SetControlValue("AlerterVisual", alarm ? 1 : 0);

diff --git a/src/mod/Assets/DTG/ArrowIIIPack01/RailVehicles/Electric/Scripts/ArrowIII_Engine_Script.ts b/src/mod/Assets/DTG/ArrowIIIPack01/RailVehicles/Electric/Scripts/ArrowIII_Engine_Script.ts
@@ -83,14 +83,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/...od/Assets/DTG/F40PH2Pack01/RailVehicles/Diesel/F40PH/CommonScripts/F40PH2_EngineScript.ts b/...od/Assets/DTG/F40PH2Pack01/RailVehicles/Diesel/F40PH/CommonScripts/F40PH2_EngineScript.ts
@@ -88,14 +88,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/src/mod/Assets/DTG/GP40PHPack01/RailVehicles/Diesel/GP40PH/Scripts/GP40_EngineScript.ts b/src/mod/Assets/DTG/GP40PHPack01/RailVehicles/Diesel/GP40PH/Scripts/GP40_EngineScript.ts
@@ -79,14 +79,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/src/mod/Assets/DTG/HudsonLine/RailVehicles/Electric/M7HudsonLine/Scripts/M7_EngineScript.ts b/src/mod/Assets/DTG/HudsonLine/RailVehicles/Electric/M7HudsonLine/Scripts/M7_EngineScript.ts
@@ -73,11 +73,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = me.createOnCvChangeStreamFor("ThrottleAndBrake");
-    const alerter$ = frp.compose(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        frp.hub()
-    );
+    const alerter$ = frp.compose(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), frp.hub());
     const alerterState = frp.stepper(alerter$, undefined);
     // Safety system sounds
     // Unfortunately, we cannot display the AWS symbol without also playing the

diff --git a/...orristown/RailVehicles/Passengers/Comet/Driving Trailer/Common Scripts/Comet_IV_Engine.ts b/...orristown/RailVehicles/Passengers/Comet/Driving Trailer/Common Scripts/Comet_IV_Engine.ts
@@ -198,14 +198,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/src/mod/Assets/DTG/NJT-Alp46/RailVehicles/Electric/Alp46/CommonScripts/Alp46_EngineScript.ts b/src/mod/Assets/DTG/NJT-Alp46/RailVehicles/Electric/Alp46/CommonScripts/Alp46_EngineScript.ts
@@ -70,14 +70,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/...d/Assets/DTG/NorthJerseyCoast/RailVehicles/Diesel/ALP45DP/Scripts/ALP45DP_EngineScript.ts b/...d/Assets/DTG/NorthJerseyCoast/RailVehicles/Diesel/ALP45DP/Scripts/ALP45DP_EngineScript.ts
@@ -186,14 +186,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),

diff --git a/...oast/RailVehicles/Passengers/Comet/Driving Trailer/CommonScripts/CometCab_EngineScript.ts b/...oast/RailVehicles/Passengers/Comet/Driving Trailer/CommonScripts/CometCab_EngineScript.ts
@@ -190,14 +190,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeSound$ = frp.compose(
         me.createPlayerWithKeyUpdateStream(),
@@ -229,6 +222,9 @@ const me = new FrpEngine(() => {
         me.rv.SetControlValue("AWS", aws ? 1 : 0);
     });
 
+    // Set platform door height.
+    fx.setLowPlatformDoorsForEngine(me, false);
+
     // Manual door control
     njt.createManualDoorsPopup(me);
     const passengerDoors = njt.createManualDoorsBehavior(me);
@@ -631,9 +627,6 @@ const me = new FrpEngine(() => {
         me.rv.ActivateNode("LightsRed", on);
     });
 
-    // Set platform door height.
-    fx.setLowPlatformDoorsForEngine(me, false);
-
     // Destination signs
     njt.createDestinationSignSelector(me);
 

diff --git a/src/mod/Assets/DTG/WashingtonBaltimore/RailVehicles/CommonScripts/MP36PH_Engine_Script.ts b/src/mod/Assets/DTG/WashingtonBaltimore/RailVehicles/CommonScripts/MP36PH_Engine_Script.ts
@@ -128,14 +128,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeEvents$ = frp.compose(
         aduEvents$,

diff --git a/...DTG/WashingtonBaltimore/RailVehicles/Diesel/P42DC/Amtrak/Locomotive/P42DC_EngineScript.ts b/...DTG/WashingtonBaltimore/RailVehicles/Diesel/P42DC/Amtrak/Locomotive/P42DC_EngineScript.ts
@@ -62,14 +62,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "TrainBrakeControl")
-    );
-    const alerter$ = frp.compose(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        frp.hub()
-    );
+    const alerter$ = frp.compose(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), frp.hub());
     const alerterState = frp.stepper(alerter$, undefined);
     alerter$(({ alarm }) => {
         me.rv.SetControlValue("AlerterVisual", alarm ? 1 : 0);

diff --git a/...celaHHP8Pack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.ts b/...celaHHP8Pack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.ts
@@ -217,10 +217,19 @@ const me = new FrpEngine(() => {
     // Alerter
     const alerterReset$ = frp.compose(
         me.createOnCvChangeStream(),
-        frp.filter(
-            ([name]) =>
-                name === (isFanRailer ? "NewVirtualThrottle" : "VirtualThrottle") || name === "TrainBrakeControl"
-        )
+        frp.filter(([name, value]) => {
+            switch (name) {
+                case isFanRailer ? "NewVirtualThrottle" : "VirtualThrottle":
+                case "TrainBrakeControl":
+                case "Horn":
+                case "Bell":
+                    return true;
+                case "Headlights":
+                    return value > 0.5 && value < 1.5;
+                default:
+                    return false;
+            }
+        })
     );
     const alerterState = frp.stepper(
         ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),

diff --git a/...SC/AcelaPack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.ts b/...SC/AcelaPack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.ts
@@ -297,7 +297,19 @@ const me = new FrpEngine(() => {
     // Alerter
     const alerterReset$ = frp.compose(
         me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
+        frp.filter(([name, value]) => {
+            switch (name) {
+                case "VirtualThrottle":
+                case "TrainBrakeControl":
+                case "Horn":
+                case "Bell":
+                    return true;
+                case "Headlights":
+                    return value > 0.5 && value < 1.5;
+                default:
+                    return false;
+            }
+        })
     );
     const alerterState = frp.stepper(
         ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),

diff --git a/src/mod/Assets/RSC/M8Pack01/RailVehicles/Electric/M8MTA/Scripts/M8_EngineScript.ts b/src/mod/Assets/RSC/M8Pack01/RailVehicles/Electric/M8MTA/Scripts/M8_EngineScript.ts
@@ -184,11 +184,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = me.createOnCvChangeStreamFor("ThrottleAndBrake");
-    const alerter$ = frp.compose(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        frp.hub()
-    );
+    const alerter$ = frp.compose(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), frp.hub());
     const alerterState = frp.stepper(alerter$, undefined);
     // Safety system sounds
     // Unfortunately, we cannot display the AWS symbol without also playing the

diff --git a/...ts/RSC/NewYorkNewHaven/RailVehicles/Electric/ACS-64/Default/CommonScripts/EngineScript.ts b/...ts/RSC/NewYorkNewHaven/RailVehicles/Electric/ACS-64/Default/CommonScripts/EngineScript.ts
@@ -226,14 +226,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "ThrottleAndBrake" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const isAlarm = frp.liftN(
         (aduState, alerterState) => (aduState?.atcAlarm || aduState?.acsesAlarm || alerterState?.alarm) ?? false,

diff --git a/...C/NorthEastCorridor/RailVehicles/Electric/AEM7/Default/Engine/RailVehicle_EngineScript.ts b/...C/NorthEastCorridor/RailVehicles/Electric/AEM7/Default/Engine/RailVehicle_EngineScript.ts
@@ -85,14 +85,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeEvents$ = frp.compose(
         aduEvents$,

diff --git a/...01/RailVehicles/Passengers/Shoreliner/Driving Trailer/CommonScripts/CabCarEngineScript.ts b/...01/RailVehicles/Passengers/Shoreliner/Driving Trailer/CommonScripts/CabCarEngineScript.ts
@@ -103,14 +103,7 @@ const me = new FrpEngine(() => {
     });
     const aduState = frp.stepper(aduStateHub$, undefined);
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "TrainBrakeControl")
-    );
-    const alerterState = frp.stepper(
-        ale.create({ e: me, acknowledge, acknowledgeStream: alerterReset$, cutIn: alerterCutIn }),
-        undefined
-    );
+    const alerterState = frp.stepper(ale.create({ e: me, acknowledge, cutIn: alerterCutIn }), undefined);
     // Safety system sounds
     const upgradeEvents$ = frp.compose(
         aduEvents$,

diff --git a/src/mod/Assets/Reppo/AEM7/RailVehicles/Scripts/AEM7_EngineScript.ts b/src/mod/Assets/Reppo/AEM7/RailVehicles/Scripts/AEM7_EngineScript.ts
@@ -154,15 +154,10 @@ const me = new FrpEngine(() => {
         }
     });
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
     const alerterState = frp.stepper(
         ale.create({
             e: me,
             acknowledge,
-            acknowledgeStream: alerterReset$,
             cutIn: frp.liftN((cutIn, powered) => cutIn && powered, alerterCutIn, isPoweredOn),
         }),
         undefined

diff --git a/src/mod/Assets/Reppo/E60CP/RailVehicles/Scripts/E60_EngineScript.ts b/src/mod/Assets/Reppo/E60CP/RailVehicles/Scripts/E60_EngineScript.ts
@@ -99,15 +99,10 @@ const me = new FrpEngine(() => {
         }
     });
     // Alerter
-    const alerterReset$ = frp.compose(
-        me.createOnCvChangeStream(),
-        frp.filter(([name]) => name === "VirtualThrottle" || name === "VirtualBrake")
-    );
     const alerterState = frp.stepper(
         ale.create({
             e: me,
             acknowledge,
-            acknowledgeStream: alerterReset$,
             cutIn: frp.liftN((cutIn, powered) => cutIn && powered, alerterCutIn, isPoweredOn),
         }),
         undefined