From 26d957a4418cead719b7abeafbd9aefb3bd4d53f Mon Sep 17 00:00:00 2001 From: Jonathan Redpath <legoboyvdlp@gmail.com> Date: Tue, 7 Nov 2017 18:30:40 -0400 Subject: [PATCH] A32X: make the strobe lights flash twice, and fix the formatting of some .eff / .xml files --- Models/Effects/IDG-A32X-interior.eff | 36 +++++++------- Models/FlightDeck/a320.flightdeck.xml | 68 +++++++++++++-------------- Nasal/libraries.nas | 6 +-- revision.txt | 2 +- 4 files changed, 55 insertions(+), 57 deletions(-) diff --git a/Models/Effects/IDG-A32X-interior.eff b/Models/Effects/IDG-A32X-interior.eff index 02b561a1..77955a32 100644 --- a/Models/Effects/IDG-A32X-interior.eff +++ b/Models/Effects/IDG-A32X-interior.eff @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <PropertyList> - <name>IDG-A32X-interior</name> - <inherits-from>Effects/model-interior</inherits-from> - <parameters> - <texture n="4"> - <type>cubemap</type> - <images> - <positive-x>res/0004.png</positive-x> - <negative-x>res/0002.png</negative-x> - <positive-y>res/0001.png</positive-y> - <negative-y>res/0003.png</negative-y> - <positive-z>res/0005.png</positive-z> - <negative-z>res/0006.png</negative-z> - </images> - </texture> - <opacity-cube-center type="vec3d" n="0"> 0.6 0.0 0.7</opacity-cube-center> - <opacity-cube-scale type="vec3d" n="0"> 1 1 1</opacity-cube-scale> - <opacity-cube-angle type="float">0.0</opacity-cube-angle> - </parameters> + <name>IDG-A32X-interior</name> + <inherits-from>Effects/model-interior</inherits-from> + <parameters> + <texture n="4"> + <type>cubemap</type> + <images> + <positive-x>res/0004.png</positive-x> + <negative-x>res/0002.png</negative-x> + <positive-y>res/0001.png</positive-y> + <negative-y>res/0003.png</negative-y> + <positive-z>res/0005.png</positive-z> + <negative-z>res/0006.png</negative-z> + </images> + </texture> + <opacity-cube-center type="vec3d" n="0"> 0.6 0.0 0.7</opacity-cube-center> + <opacity-cube-scale type="vec3d" n="0"> 1 1 1</opacity-cube-scale> + <opacity-cube-angle type="float">0.0</opacity-cube-angle> + </parameters> </PropertyList> \ No newline at end of file diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index eb5c5297..3fb429bc 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -5875,39 +5875,39 @@ </emission> </animation> - <effect> - <inherits-from>Models/Effects/IDG-A32X-interior</inherits-from> - <object-name>fcu_panel</object-name> - <object-name>main_panel</object-name> - <object-name>ped_labels_1</object-name> - <object-name>ped_labels_2</object-name> - <object-name>carpet</object-name> - <object-name>so.1</object-name> - <object-name>sts.002</object-name> - <object-name>Seat</object-name> - <object-name>beam_a</object-name> - <object-name>beam_f</object-name> - <object-name>wall_1</object-name> - <object-name>seat3.001</object-name> - <object-name>seat4.002</object-name> - <object-name>pedal_adjust</object-name> - <object-name>pedals_block_capt</object-name> - <object-name>ped_surface</object-name> - <object-name>ped_wf</object-name> - <object-name>pedestal1</object-name> - <object-name>pedestal2</object-name> - <object-name>pedestal3</object-name> - <object-name>sfl</object-name> - <object-name>sfl.003</object-name> - <object-name>sts</object-name> - <object-name>sfl.001</object-name> - <object-name>sts.003</object-name> - <object-name>sts.001</object-name> - <object-name>speaker_front</object-name> - <object-name>efis_box_1</object-name> - <object-name>efis_box_2</object-name> - <object-name>efis_box_3</object-name> - <object-name>efis_box_4</object-name> - </effect> + <effect> + <inherits-from>Models/Effects/IDG-A32X-interior</inherits-from> + <object-name>fcu_panel</object-name> + <object-name>main_panel</object-name> + <object-name>ped_labels_1</object-name> + <object-name>ped_labels_2</object-name> + <object-name>carpet</object-name> + <object-name>so.1</object-name> + <object-name>sts.002</object-name> + <object-name>Seat</object-name> + <object-name>beam_a</object-name> + <object-name>beam_f</object-name> + <object-name>wall_1</object-name> + <object-name>seat3.001</object-name> + <object-name>seat4.002</object-name> + <object-name>pedal_adjust</object-name> + <object-name>pedals_block_capt</object-name> + <object-name>ped_surface</object-name> + <object-name>ped_wf</object-name> + <object-name>pedestal1</object-name> + <object-name>pedestal2</object-name> + <object-name>pedestal3</object-name> + <object-name>sfl</object-name> + <object-name>sfl.003</object-name> + <object-name>sts</object-name> + <object-name>sfl.001</object-name> + <object-name>sts.003</object-name> + <object-name>sts.001</object-name> + <object-name>speaker_front</object-name> + <object-name>efis_box_1</object-name> + <object-name>efis_box_2</object-name> + <object-name>efis_box_3</object-name> + <object-name>efis_box_4</object-name> + </effect> </PropertyList> diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 8bf5971b..d6fbaed0 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -33,7 +33,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2); var beacon_switch = props.globals.getNode("/controls/switches/beacon", 2); var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.015, 3], "/controls/lighting/beacon"); var strobe_switch = props.globals.getNode("/controls/switches/strobe", 2); -var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.025, 1.5], "/controls/lighting/strobe"); +var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.005, 0.005, 0.005, 1], "/controls/lighting/strobe"); var logo_lights = getprop("/sim/model/lights/logo-lights"); var setting = getprop("/controls/lighting/nav-lights-switch"); var wow = getprop("/gear/gear[2]/wow"); @@ -42,9 +42,7 @@ var slats = getprop("/controls/flight/slats"); setlistener("controls/lighting/nav-lights-switch", func { var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights"); var setting = getprop("/controls/lighting/nav-lights-switch"); - if (setting == 1) { - nav_lights.setBoolValue(1); - } else if (setting == 2) { + if (setting == 1 or setting == 2) { nav_lights.setBoolValue(1); } else { nav_lights.setBoolValue(0); diff --git a/revision.txt b/revision.txt index 235c4368..1bda098b 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -3053 \ No newline at end of file +3054 \ No newline at end of file