From 225c20ff65688b59cb2608be5afff3e7b69c6d19 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Fri, 20 Sep 2024 15:28:27 -0500 Subject: [PATCH] Fix /update enum for taxi/wing lights --- src/aircraft/AerosoftA333.ts | 2 +- src/aircraft/Felis742.ts | 4 +-- src/aircraft/FenixA320.ts | 4 +-- src/aircraft/FlightFactor757.ts | 4 +-- src/aircraft/FlightFactorA320.ts | 2 +- src/aircraft/FlyJSim727.ts | 4 +-- src/aircraft/FlyJSim732.ts | 4 +-- src/aircraft/FsLabsAirbus.ts | 4 +-- src/aircraft/IXEG733.ts | 4 +-- src/aircraft/JarDesignA330.ts | 2 +- src/aircraft/PMDG_737_FSUIPC.ts | 4 +-- src/aircraft/PMDG_737_MSFS.ts | 4 +-- src/aircraft/PMDG_747_FSUIPC.ts | 4 +-- src/aircraft/PMDG_777_FSUIPC.ts | 4 +-- src/aircraft/PMDG_777_MSFS.ts | 4 +-- src/aircraft/ProSim737.ts | 2 +- src/aircraft/QualityWings.ts | 2 +- src/aircraft/RotateMD11.ts | 4 +-- src/aircraft/RotateMD80.ts | 4 +-- src/aircraft/Toliss.ts | 2 +- src/aircraft/Zibo738.ts | 4 +-- src/aircraft/_default_fsuipc.ts | 4 +-- src/aircraft/_default_msfs.ts | 4 +-- src/aircraft/_default_xplane.ts | 4 +-- src/aircraft/example.ts | 44 -------------------------------- src/aircraft/iniBuildsA300.ts | 4 +-- src/defs.ts | 4 +-- src/rules/example.ts | 34 ------------------------ src/rules/fuel_refilled.ts | 18 ++++++++++--- src/types/rule.d.ts | 5 ---- 30 files changed, 60 insertions(+), 133 deletions(-) delete mode 100644 src/aircraft/example.ts delete mode 100644 src/rules/example.ts diff --git a/src/aircraft/AerosoftA333.ts b/src/aircraft/AerosoftA333.ts index 02cafc4..2a3cf44 100644 --- a/src/aircraft/AerosoftA333.ts +++ b/src/aircraft/AerosoftA333.ts @@ -21,7 +21,7 @@ export default class AerosoftA333Airbus extends AircraftConfig { [AircraftFeature.LandingLights]: false, [AircraftFeature.NavigationLights]: false, [AircraftFeature.StrobeLights]: false, - [AircraftFeature.TaxiLight]: false, + [AircraftFeature.TaxiLights]: false, } flapNames: FlapNames = { diff --git a/src/aircraft/Felis742.ts b/src/aircraft/Felis742.ts index bbbac5c..a2b252b 100644 --- a/src/aircraft/Felis742.ts +++ b/src/aircraft/Felis742.ts @@ -24,12 +24,12 @@ export default class Felis742 extends AircraftConfig { 'B742/ext_light/landing_outbd_L_sw': FeatureType.Int, 'B742/ext_light/landing_outbd_R_sw': FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'B742/ext_light/logo_sw': FeatureType.Int, }, [AircraftFeature.NavigationLights]: false, [AircraftFeature.StrobeLights]: false, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'B742/ext_light/runway_turnoff_L_sw': FeatureType.Int, 'B742/ext_light/runway_turnoff_R_sw': FeatureType.Int, }, diff --git a/src/aircraft/FenixA320.ts b/src/aircraft/FenixA320.ts index 380209d..c76c626 100644 --- a/src/aircraft/FenixA320.ts +++ b/src/aircraft/FenixA320.ts @@ -25,7 +25,7 @@ export default class FenixA320 extends AircraftConfig { S_OH_EXT_LT_LANDING_L: FeatureType.Int, S_OH_EXT_LT_LANDING_R: FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { S_OH_EXT_LT_NAV_LOGO: FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -34,7 +34,7 @@ export default class FenixA320 extends AircraftConfig { [AircraftFeature.StrobeLights]: { S_OH_EXT_LT_STROBE: FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { S_OH_EXT_LT_NOSE: FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/FlightFactor757.ts b/src/aircraft/FlightFactor757.ts index ec84143..d292d0c 100644 --- a/src/aircraft/FlightFactor757.ts +++ b/src/aircraft/FlightFactor757.ts @@ -23,7 +23,7 @@ export default class FlightFactor757 extends AircraftConfig { [AircraftFeature.LandingLights]: { 'sim/cockpit2/switches/landing_lights_switch': FeatureType.NumberArray, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'sim/cockpit2/switches/generic_lights_switch': FeatureType.NumberArray, }, [AircraftFeature.NavigationLights]: { @@ -32,7 +32,7 @@ export default class FlightFactor757 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'sim/cockpit2/switches/strobe_lights_on': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'sim/cockpit2/switches/landing_lights_switch': FeatureType.NumberArray, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/FlightFactorA320.ts b/src/aircraft/FlightFactorA320.ts index 22b8994..1439d94 100644 --- a/src/aircraft/FlightFactorA320.ts +++ b/src/aircraft/FlightFactorA320.ts @@ -31,7 +31,7 @@ export default class FlightFactorA320 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'model/controls/light_strobe': FeatureType.Number, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'model/controls/light_nose': FeatureType.Number, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/FlyJSim727.ts b/src/aircraft/FlyJSim727.ts index 80afe0a..6ff6146 100644 --- a/src/aircraft/FlyJSim727.ts +++ b/src/aircraft/FlyJSim727.ts @@ -26,7 +26,7 @@ export default class FlyJSim727 extends AircraftConfig { 'FJS/727/lights/OutboundLLSwitch_L': FeatureType.Int, 'FJS/727/lights/OutboundLLSwitch_R': FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'FJS/727/lights/LogoLightSwitch': FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -35,7 +35,7 @@ export default class FlyJSim727 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'FJS/727/lights/StrobeLightSwitch': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'FJS/727/lights/TaxiLightSwitch': FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/FlyJSim732.ts b/src/aircraft/FlyJSim732.ts index 7b25a39..8ead848 100644 --- a/src/aircraft/FlyJSim732.ts +++ b/src/aircraft/FlyJSim732.ts @@ -26,7 +26,7 @@ export default class FlyJSim732 extends AircraftConfig { 'FJS/732/lights/OutBoundLLightSwitch1': FeatureType.Int, 'FJS/732/lights/OutBoundLLightSwitch2': FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'FJS/732/lights/LogoLightSwitch': FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -35,7 +35,7 @@ export default class FlyJSim732 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'FJS/732/lights/StrobeLightSwitch': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'FJS/732/lights/TaxiLightSwitch': FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/FsLabsAirbus.ts b/src/aircraft/FsLabsAirbus.ts index 7b0465f..fa6d81b 100644 --- a/src/aircraft/FsLabsAirbus.ts +++ b/src/aircraft/FsLabsAirbus.ts @@ -18,10 +18,10 @@ export default class FsLabsAirbus extends AircraftConfig { features: FeatureAddresses = { [AircraftFeature.BeaconLights]: false, [AircraftFeature.LandingLights]: false, - [AircraftFeature.LogoLight]: false, + [AircraftFeature.LogoLights]: false, [AircraftFeature.NavigationLights]: false, [AircraftFeature.StrobeLights]: false, - [AircraftFeature.TaxiLight]: false, + [AircraftFeature.TaxiLights]: false, [AircraftFeature.WingLights]: false, } diff --git a/src/aircraft/IXEG733.ts b/src/aircraft/IXEG733.ts index 3fc6876..155fafb 100644 --- a/src/aircraft/IXEG733.ts +++ b/src/aircraft/IXEG733.ts @@ -26,7 +26,7 @@ export default class IXEG733 extends AircraftConfig { 'ixeg/733/lighting/l_outboard_ll_act': FeatureType.Int, 'ixeg/733/lighting/r_outboard_ll_act': FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'ixeg/733/lighting/logo_lt_act': FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -35,7 +35,7 @@ export default class IXEG733 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'ixeg/733/lighting/strobe_lt_act': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'ixeg/733/lighting/taxi_lt_act': FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/JarDesignA330.ts b/src/aircraft/JarDesignA330.ts index c629484..607dc02 100644 --- a/src/aircraft/JarDesignA330.ts +++ b/src/aircraft/JarDesignA330.ts @@ -29,7 +29,7 @@ export default class JarDesignA330 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'sim/custom/xap/extlight/strobe_sw': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'sim/custom/xap/extlight/nose_sw': FeatureType.Int, }, } diff --git a/src/aircraft/PMDG_737_FSUIPC.ts b/src/aircraft/PMDG_737_FSUIPC.ts index 6c93734..2c6fbe4 100644 --- a/src/aircraft/PMDG_737_FSUIPC.ts +++ b/src/aircraft/PMDG_737_FSUIPC.ts @@ -23,14 +23,14 @@ export default class PMDG_737_FSUIPC extends AircraftConfig { [AircraftFeature.LandingLights]: { '0x64F6': FeatureType.Int, }, - [AircraftFeature.LogoLight]: false, + [AircraftFeature.LogoLights]: false, [AircraftFeature.NavigationLights]: { '0x6500': FeatureType.Int, }, [AircraftFeature.StrobeLights]: { '0x6500': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { '0x64FA': FeatureType.Int, }, [AircraftFeature.WingLights]: false, diff --git a/src/aircraft/PMDG_737_MSFS.ts b/src/aircraft/PMDG_737_MSFS.ts index f59b33e..8641aae 100644 --- a/src/aircraft/PMDG_737_MSFS.ts +++ b/src/aircraft/PMDG_737_MSFS.ts @@ -24,7 +24,7 @@ export default class PMDG_737_MSFS extends AircraftConfig { switch_113_73X: FeatureType.Int, switch_114_73X: FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { switch_122_73X: FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -33,7 +33,7 @@ export default class PMDG_737_MSFS extends AircraftConfig { [AircraftFeature.StrobeLights]: { switch_123_73X: FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { switch_117_73X: FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/PMDG_747_FSUIPC.ts b/src/aircraft/PMDG_747_FSUIPC.ts index d1f5d83..9ebf86e 100644 --- a/src/aircraft/PMDG_747_FSUIPC.ts +++ b/src/aircraft/PMDG_747_FSUIPC.ts @@ -23,14 +23,14 @@ export default class PMDG_747_FSUIPC extends AircraftConfig { [AircraftFeature.LandingLights]: { '0x6506': FeatureType.Int, }, - [AircraftFeature.LogoLight]: false, + [AircraftFeature.LogoLights]: false, [AircraftFeature.NavigationLights]: { '0x650B': FeatureType.Int, }, [AircraftFeature.StrobeLights]: { '0x6511': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { '0x6510': FeatureType.Int, }, [AircraftFeature.WingLights]: false, diff --git a/src/aircraft/PMDG_777_FSUIPC.ts b/src/aircraft/PMDG_777_FSUIPC.ts index ce2a773..62c006c 100644 --- a/src/aircraft/PMDG_777_FSUIPC.ts +++ b/src/aircraft/PMDG_777_FSUIPC.ts @@ -23,14 +23,14 @@ export default class PMDG_777_FSUIPC extends AircraftConfig { [AircraftFeature.LandingLights]: { '0x6485': FeatureType.Int, }, - [AircraftFeature.LogoLight]: false, + [AircraftFeature.LogoLights]: false, [AircraftFeature.NavigationLights]: { '0x650B': FeatureType.Int, }, [AircraftFeature.StrobeLights]: { '0x648F': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { '0x648E': FeatureType.Int, }, [AircraftFeature.WingLights]: false, diff --git a/src/aircraft/PMDG_777_MSFS.ts b/src/aircraft/PMDG_777_MSFS.ts index c8f5aaa..b6a53b4 100644 --- a/src/aircraft/PMDG_777_MSFS.ts +++ b/src/aircraft/PMDG_777_MSFS.ts @@ -25,7 +25,7 @@ export default class PMDG_777_MSFS extends AircraftConfig { switch_23_a: FeatureType.Int, switch_24_a: FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { switch_116_a: FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -34,7 +34,7 @@ export default class PMDG_777_MSFS extends AircraftConfig { [AircraftFeature.StrobeLights]: { switch_122_a: FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { switch_121_a: FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/ProSim737.ts b/src/aircraft/ProSim737.ts index 7f11c42..549cd54 100644 --- a/src/aircraft/ProSim737.ts +++ b/src/aircraft/ProSim737.ts @@ -16,7 +16,7 @@ export default class ProSim737 extends AircraftConfig { [AircraftFeature.LandingLights]: false, [AircraftFeature.NavigationLights]: false, [AircraftFeature.StrobeLights]: false, - [AircraftFeature.TaxiLight]: false, + [AircraftFeature.TaxiLights]: false, } /** diff --git a/src/aircraft/QualityWings.ts b/src/aircraft/QualityWings.ts index 42e4f48..cbc1351 100644 --- a/src/aircraft/QualityWings.ts +++ b/src/aircraft/QualityWings.ts @@ -16,7 +16,7 @@ export default class QualityWings extends AircraftConfig { [AircraftFeature.LandingLights]: false, [AircraftFeature.NavigationLights]: false, [AircraftFeature.StrobeLights]: false, - [AircraftFeature.TaxiLight]: false, + [AircraftFeature.TaxiLights]: false, } /** diff --git a/src/aircraft/RotateMD11.ts b/src/aircraft/RotateMD11.ts index 61c5e16..6b19908 100644 --- a/src/aircraft/RotateMD11.ts +++ b/src/aircraft/RotateMD11.ts @@ -24,7 +24,7 @@ export default class RotateMD11 extends AircraftConfig { 'Rotate/aircraft/controls/ldg_l_lts': FeatureType.Int, 'Rotate/aircraft/controls/ldg_r_lts': FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'Rotate/aircraft/controls/logo_lts': FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -33,7 +33,7 @@ export default class RotateMD11 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'Rotate/aircraft/controls/strobe_lts': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'Rotate/aircraft/controls/nose_lts': FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/RotateMD80.ts b/src/aircraft/RotateMD80.ts index 41b4f30..8ceb9cd 100644 --- a/src/aircraft/RotateMD80.ts +++ b/src/aircraft/RotateMD80.ts @@ -24,7 +24,7 @@ export default class RotateMD80 extends AircraftConfig { 'Rotate/md80/lights/wing_ldg_light_switch_r': FeatureType.Int, 'Rotate/md80/lights/wing_ldg_light_switch_l': FeatureType.Int, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'Rotate/md80/lights/logo_light_switch': FeatureType.Int, }, [AircraftFeature.NavigationLights]: { @@ -33,7 +33,7 @@ export default class RotateMD80 extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'Rotate/md80/lights/pos_strobe_light_switch': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'Rotate/md80/lights/nose_light_switch': FeatureType.Int, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/Toliss.ts b/src/aircraft/Toliss.ts index 395789c..fef599f 100644 --- a/src/aircraft/Toliss.ts +++ b/src/aircraft/Toliss.ts @@ -30,7 +30,7 @@ export default class Toliss extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'AirbusFBW/OHPLightSwitches': FeatureType.IntArray, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'AirbusFBW/OHPLightSwitches': FeatureType.IntArray, }, } diff --git a/src/aircraft/Zibo738.ts b/src/aircraft/Zibo738.ts index fe7962e..b227b64 100644 --- a/src/aircraft/Zibo738.ts +++ b/src/aircraft/Zibo738.ts @@ -17,10 +17,10 @@ export default class Zibo738 extends AircraftConfig { } features: FeatureAddresses = { - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'laminar/B738/toggle_switch/logo_light': FeatureType.Int, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'laminar/B738/toggle_switch/taxi_light_brightness_pos': FeatureType.Int, }, } diff --git a/src/aircraft/_default_fsuipc.ts b/src/aircraft/_default_fsuipc.ts index 8a15f1c..0a5179a 100644 --- a/src/aircraft/_default_fsuipc.ts +++ b/src/aircraft/_default_fsuipc.ts @@ -32,10 +32,10 @@ export default class DefaultFsuipc extends AircraftConfig { features: FeatureAddresses = { [AircraftFeature.BeaconLights]: { '0x0D0C': FeatureType.Int }, [AircraftFeature.LandingLights]: { '0x0D0C': FeatureType.Int }, - [AircraftFeature.LogoLight]: { '0x0D0C': FeatureType.Int }, + [AircraftFeature.LogoLights]: { '0x0D0C': FeatureType.Int }, [AircraftFeature.NavigationLights]: { '0x0D0C': FeatureType.Int }, [AircraftFeature.StrobeLights]: { '0x0D0C': FeatureType.Int }, - [AircraftFeature.TaxiLight]: { '0x0D0C': FeatureType.Int }, + [AircraftFeature.TaxiLights]: { '0x0D0C': FeatureType.Int }, [AircraftFeature.WingLights]: { '0x0D0C': FeatureType.Int }, } diff --git a/src/aircraft/_default_msfs.ts b/src/aircraft/_default_msfs.ts index e734dd6..f026ff5 100644 --- a/src/aircraft/_default_msfs.ts +++ b/src/aircraft/_default_msfs.ts @@ -41,11 +41,11 @@ export default class DefaultMsFs extends AircraftConfig { [AircraftFeature.StrobeLights]: { LIGHTING_STROBE_1: FeatureType.Bool, }, - [AircraftFeature.TaxiLight]: { LIGHTING_TAXI_1: FeatureType.Bool }, + [AircraftFeature.TaxiLights]: { LIGHTING_TAXI_1: FeatureType.Bool }, [AircraftFeature.WingLights]: { LIGHTING_RECOGNITION_1: FeatureType.Bool, }, - [AircraftFeature.LogoLight]: { LIGHTING_BEACON_1: FeatureType.Bool }, + [AircraftFeature.LogoLights]: { LIGHTING_BEACON_1: FeatureType.Bool }, } /** diff --git a/src/aircraft/_default_xplane.ts b/src/aircraft/_default_xplane.ts index 7554f32..bd7ea25 100644 --- a/src/aircraft/_default_xplane.ts +++ b/src/aircraft/_default_xplane.ts @@ -26,7 +26,7 @@ export default class DefaultXPlane extends AircraftConfig { [AircraftFeature.LandingLights]: { 'sim/cockpit2/switches/landing_lights_on': FeatureType.Bool, }, - [AircraftFeature.LogoLight]: { + [AircraftFeature.LogoLights]: { 'sim/cockpit2/switches/logo_lights_on': FeatureType.Bool, }, [AircraftFeature.NavigationLights]: { @@ -35,7 +35,7 @@ export default class DefaultXPlane extends AircraftConfig { [AircraftFeature.StrobeLights]: { 'sim/cockpit2/switches/strobe_lights_on': FeatureType.Bool, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'sim/cockpit2/switches/taxi_light_on': FeatureType.Bool, }, [AircraftFeature.WingLights]: { diff --git a/src/aircraft/example.ts b/src/aircraft/example.ts deleted file mode 100644 index 28c27d2..0000000 --- a/src/aircraft/example.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { AircraftConfigSimType, AircraftFeature, FeatureType } from '../defs' -import { - AircraftConfig, - FeatureAddresses, - FeatureState, - FlapNames, - Meta, -} from '../interface/aircraft' - -export default class Example extends AircraftConfig { - meta: Meta = { - id: 'example', - name: 'example', - sim: AircraftConfigSimType.MsFs, - enabled: true, - priority: 2, - } - - features: FeatureAddresses = { - [AircraftFeature.BeaconLights]: { - example_lvar: FeatureType.Int, - }, - } - - flapNames: FlapNames = { - 0: 'UP', - 1: 'CONF 1', - } - - /** - * - * @param {string} title The title of the aircraft, lowercased - * @param {string=} icao The ICAO of the aircraft. Might not be available - * @param {string=} config_path Path to the aircraft config. Might not be there - * @return {boolean} - */ - match(title: string, icao: string, config_path: string): boolean { - return ['example', 'aircraft'].every((w) => title.includes(w)) - } - - beaconLights(): FeatureState { - return null - } -} diff --git a/src/aircraft/iniBuildsA300.ts b/src/aircraft/iniBuildsA300.ts index c7d0b3a..6348e5e 100644 --- a/src/aircraft/iniBuildsA300.ts +++ b/src/aircraft/iniBuildsA300.ts @@ -23,14 +23,14 @@ export default class IniBuildsA3N extends AircraftConfig { [AircraftFeature.LandingLights]: { 'A300/switches/animations_current': FeatureType.NumberArray, }, - [AircraftFeature.LogoLight]: false, + [AircraftFeature.LogoLights]: false, [AircraftFeature.NavigationLights]: { 'A300/switches/animations_current': FeatureType.NumberArray, }, [AircraftFeature.StrobeLights]: { 'A300/switches/animations_current': FeatureType.NumberArray, }, - [AircraftFeature.TaxiLight]: { + [AircraftFeature.TaxiLights]: { 'A300/switches/animations_current': FeatureType.NumberArray, }, [AircraftFeature.WingLights]: { diff --git a/src/defs.ts b/src/defs.ts index 07b1ea7..61056d0 100644 --- a/src/defs.ts +++ b/src/defs.ts @@ -114,10 +114,10 @@ export enum PirepState { export enum AircraftFeature { BeaconLights = 0, LandingLights = 1, - LogoLight = 2, + LogoLights = 2, NavigationLights = 3, StrobeLights = 4, - TaxiLight = 5, + TaxiLights = 5, WingLights = 6, Flaps = 7, APU = 8, diff --git a/src/rules/example.ts b/src/rules/example.ts deleted file mode 100644 index 73f04c3..0000000 --- a/src/rules/example.ts +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Determine if the beacon lights are on while the aircraft is in motio - */ -import { Meta, Rule, RuleValue } from '../types/rule' -import { Pirep, Telemetry } from '../types/types' - -export default class ExampleRule implements Rule { - meta: Meta = { - id: 'ExampleRule', - name: 'An Example Rule', - enabled: true, - message: 'A example rule!', - states: [], - repeatable: false, - cooldown: 60, - max_count: 3, - points: -1, - delay_time: 5000, - } - - violated(pirep: Pirep, data: Telemetry, previousData?: Telemetry): RuleValue { - return Acars.ViolatedAfterDelay( - this.meta.name, - this.meta.delay_time, - () => { - if (data.onGround) { - return [false] - } - - return [true, 'The example was violated!', this.meta.points] - }, - ) - } -} diff --git a/src/rules/fuel_refilled.ts b/src/rules/fuel_refilled.ts index 43fb537..711c3a9 100644 --- a/src/rules/fuel_refilled.ts +++ b/src/rules/fuel_refilled.ts @@ -7,11 +7,21 @@ import { Pirep, Telemetry } from '../types/types' export default class FuelRefilled implements Rule { meta: Meta = { - id: 'EXCESS_TAXI_SPEED', - name: 'Taxi speed exceeded limit', + id: 'FUEL_REFILLED', + name: 'Fuel refilled', enabled: true, - message: 'Taxi speed exceeded limit', - states: [], + message: 'Fuel refilled', + states: [ + PirepState.Pushback, + PirepState.TaxiOut, + PirepState.Takeoff, + PirepState.Enroute, + PirepState.Approach, + PirepState.Final, + PirepState.Landed, + PirepState.TaxiIn, + PirepState.OnBlock, + ], repeatable: false, cooldown: 60, max_count: 3, diff --git a/src/types/rule.d.ts b/src/types/rule.d.ts index d3f2a50..8469bd2 100644 --- a/src/types/rule.d.ts +++ b/src/types/rule.d.ts @@ -96,11 +96,6 @@ export interface Meta { */ points?: number - /** - * From upstream - */ - parameter?: number - /** * This just allows any other properties */