diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml
index aeb9f6b7..4cef3abf 100644
--- a/A319-100-CFM-set.xml
+++ b/A319-100-CFM-set.xml
@@ -123,15 +123,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/a319livery-cfm.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml
index 15692cb1..6968290e 100644
--- a/A319-100-IAE-set.xml
+++ b/A319-100-IAE-set.xml
@@ -123,15 +123,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/a319livery-iae.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 9487d310..503814cf 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -116,15 +116,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/a320livery-cfm.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index 8c5310a2..88566230 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -116,15 +116,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/a320livery-iae.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/A320-main.xml b/A320-main.xml
index c60bc577..d726f34b 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -97,6 +97,8 @@
0
0
+ 0
+ 0
@@ -703,6 +705,14 @@
+
+ Aircraft/A320Family/Nasal/libraries.nas
+ Aircraft/A320Family/Nasal/PFD_FMA.nas
+ Aircraft/A320Family/Models/Instruments/ND/ND.nas
+ Aircraft/A320Family/Nasal/fctl.nas
+ Aircraft/A320Family/Nasal/gpws.nas
+ Aircraft/A320Family/Nasal/efis.nas
+
Aircraft/A320Family/AircraftConfig/acconfig.nas
@@ -726,10 +736,10 @@
Aircraft/A320Family/Nasal/FMGC.nas
- Aircraft/A320Family/Nasal/MCDU1.nas
+ Aircraft/A320Family/Nasal/MCDU/MCDU1.nas
- Aircraft/A320Family/Nasal/MCDU2.nas
+ Aircraft/A320Family/Nasal/MCDU/MCDU2.nas
diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml
index acdd3cc8..7ce6a1eb 100644
--- a/A321-200-CFM-set.xml
+++ b/A321-200-CFM-set.xml
@@ -111,15 +111,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/a321livery-cfm.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index 0137fd9b..5d348e21 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -116,15 +116,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/a321livery-iae.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/ACJ-IAE-set.xml b/ACJ-IAE-set.xml
index 99c42dc0..9a34ad38 100644
--- a/ACJ-IAE-set.xml
+++ b/ACJ-IAE-set.xml
@@ -122,15 +122,9 @@
-
- Aircraft/A320Family/Nasal/various.nas
+
Aircraft/A320Family/Nasal/acjlivery.nas
- Aircraft/A320Family/Models/Instruments/ND/ND.nas
- Aircraft/A320Family/Nasal/gpws.nas
- Aircraft/A320Family/Nasal/efis.nas
- Aircraft/A320Family/Nasal/PFD_FMA.nas
- Aircraft/A320Family/Nasal/fctl.nas
-
+
diff --git a/AircraftConfig/ac_init.xml b/AircraftConfig/ac_init.xml
index 61cb26c2..2e44d02c 100644
--- a/AircraftConfig/ac_init.xml
+++ b/AircraftConfig/ac_init.xml
@@ -7,7 +7,7 @@
aircraft-config-init
vbox
- 200
+ 260
hbox
@@ -23,9 +23,16 @@
vbox
- center
+ left
+
+ 1
+
+ center
+ /systems/acconfig/spin
+ 1
+
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 6a5614f6..ceebaae8 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -1,7 +1,26 @@
# Aircraft Config Center
# Joshua Davidson (it0uchpods)
+var spinning = maketimer(0.1, func {
+ var spinning = getprop("/systems/acconfig/spinning");
+ if (spinning == 0) {
+ setprop("/systems/acconfig/spin", "\\");
+ setprop("/systems/acconfig/spinning", 1);
+ } else if (spinning == 1) {
+ setprop("/systems/acconfig/spin", "|");
+ setprop("/systems/acconfig/spinning", 2);
+ } else if (spinning == 2) {
+ setprop("/systems/acconfig/spin", "/");
+ setprop("/systems/acconfig/spinning", 3);
+ } else if (spinning == 3) {
+ setprop("/systems/acconfig/spin", "-");
+ setprop("/systems/acconfig/spinning", 0);
+ }
+});
+
setprop("/systems/acconfig/autoconfig-running", 0);
+setprop("/systems/acconfig/spinning", 0);
+setprop("/systems/acconfig/spin", "-");
var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/A320Family/AircraftConfig/main.xml");
var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/A320Family/AircraftConfig/welcome.xml");
var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/A320Family/AircraftConfig/psload.xml");
@@ -9,11 +28,13 @@ var ps_loaded_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psloaded/dialog", "
var init_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/init/dialog", "Aircraft/A320Family/AircraftConfig/ac_init.xml");
var help_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/help/dialog", "Aircraft/A320Family/AircraftConfig/help.xml");
var fbw_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/A320Family/AircraftConfig/fbw.xml");
+spinning.start();
init_dlg.open();
setlistener("/sim/signals/fdm-initialized", func {
init_dlg.close();
welcome_dlg.open();
+ spinning.stop();
});
var saveSettings = func {
@@ -40,6 +61,7 @@ var systemsReset = func {
# Cold and Dark
var colddark = func {
+ spinning.start();
ps_load_dlg.open();
setprop("/systems/acconfig/autoconfig-running", 1);
# Initial shutdown, and reinitialization.
@@ -51,7 +73,7 @@ var colddark = func {
setprop("/controls/flight/flap-lever", 0);
setprop("/controls/flight/flap-pos", 0);
setprop("/controls/flight/flap-txt", " ");
- A320.flaptimer.stop();
+ libraries.flaptimer.stop();
setprop("/controls/flight/speedbrake-arm", 0);
setprop("/controls/gear/gear-down", 1);
systemsReset();
@@ -79,10 +101,12 @@ var colddark_b = func {
setprop("/systems/acconfig/autoconfig-running", 0);
ps_load_dlg.close();
ps_loaded_dlg.open();
+ spinning.stop();
}
# Ready to Start Eng
var beforestart = func {
+ spinning.start();
ps_load_dlg.open();
setprop("/systems/acconfig/autoconfig-running", 1);
# First, we set everything to cold and dark.
@@ -94,7 +118,7 @@ var beforestart = func {
setprop("/controls/flight/flap-lever", 0);
setprop("/controls/flight/flap-pos", 0);
setprop("/controls/flight/flap-txt", " ");
- A320.flaptimer.stop();
+ libraries.flaptimer.stop();
setprop("/controls/flight/speedbrake-arm", 0);
setprop("/controls/gear/gear-down", 1);
systemsReset();
@@ -147,10 +171,12 @@ var beforestart_b = func {
setprop("/systems/acconfig/autoconfig-running", 0);
ps_load_dlg.close();
ps_loaded_dlg.open();
+ spinning.stop();
}
# Ready to Taxi
var taxi = func {
+ spinning.start();
ps_load_dlg.open();
setprop("/systems/acconfig/autoconfig-running", 1);
# First, we set everything to cold and dark.
@@ -162,7 +188,7 @@ var taxi = func {
setprop("/controls/flight/flap-lever", 0);
setprop("/controls/flight/flap-pos", 0);
setprop("/controls/flight/flap-txt", " ");
- A320.flaptimer.stop();
+ libraries.flaptimer.stop();
setprop("/controls/flight/speedbrake-arm", 0);
setprop("/controls/gear/gear-down", 1);
systemsReset();
@@ -243,6 +269,7 @@ var taxi_e = func {
setprop("/systems/acconfig/autoconfig-running", 0);
ps_load_dlg.close();
ps_loaded_dlg.open();
+ spinning.stop();
}
# Ready to Takeoff
@@ -258,7 +285,7 @@ var takeoff = func {
setprop("/controls/flight/flap-lever", 1);
setprop("/controls/flight/flap-pos", 2);
setprop("/controls/flight/flap-txt", "1+F");
- A320.flaptimer.start();
+ libraries.flaptimer.start();
setprop("/controls/flight/elevator-trim", -0.15);
}
});
diff --git a/AircraftConfig/psload.xml b/AircraftConfig/psload.xml
index 7bae8825..d1a7dd2b 100644
--- a/AircraftConfig/psload.xml
+++ b/AircraftConfig/psload.xml
@@ -29,6 +29,13 @@
left
+
+ 1
+
+ center
+ /systems/acconfig/spin
+ 1
+
diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml
index 9f47e07d..c8706afc 100644
--- a/AircraftConfig/welcome.xml
+++ b/AircraftConfig/welcome.xml
@@ -37,7 +37,7 @@
center
-
+
center
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index 46aab059..92945b2f 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -238,7 +238,7 @@
sim/model/livery
texture
- A320.png
+ a320.png
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 2dba5925..c819cc52 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -238,7 +238,7 @@
sim/model/livery
texture
- A320.png
+ a320.png
diff --git a/Models/ACJ-IAE.xml b/Models/ACJ-IAE.xml
index f54cd859..3b6c268c 100644
--- a/Models/ACJ-IAE.xml
+++ b/Models/ACJ-IAE.xml
@@ -18,7 +18,7 @@
Flightdeck
- Aircraft/A320Family/Models/FlightDeck/a320.flightdeck.xml
+ Aircraft/A320Family/Models/FlightDeck/libraries.flightdeck.xml
6.4
0.2399
@@ -32,7 +32,7 @@
Nose Gear
- Aircraft/A320Family/Models/LandingGears/a320.nlg.xml
+ Aircraft/A320Family/Models/LandingGears/libraries.nlg.xml
9.43
-1.8306008
@@ -41,7 +41,7 @@
Main Gears.Left
- Aircraft/A320Family/Models/LandingGears/a320.mlg.left.xml
+ Aircraft/A320Family/Models/LandingGears/libraries.mlg.left.xml
20.3180764
-3.795
@@ -51,7 +51,7 @@
Main Gears.Right
- Aircraft/A320Family/Models/LandingGears/a320.mlg.right.xml
+ Aircraft/A320Family/Models/LandingGears/libraries.mlg.right.xml
20.3180764
3.795
@@ -60,7 +60,7 @@
- Aircraft/A320Family/Models/Wings/a320.wings.iae.xml
+ Aircraft/A320Family/Models/Wings/libraries.wings.iae.xml
15.280
-1.06019
@@ -69,7 +69,7 @@
A320 Winglets
- Aircraft/A320Family/Models/Wings/a320.winglets.xml
+ Aircraft/A320Family/Models/Wings/libraries.winglets.xml
/sim/multiplay/generic/int[12]
@@ -84,7 +84,7 @@
A320 Sharklets
- Aircraft/A320Family/Models/Wings/a320.sharklets.xml
+ Aircraft/A320Family/Models/Wings/libraries.sharklets.xml
/sim/multiplay/generic/int[12]
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 07b0d863..cd083f43 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -449,6 +449,20 @@
pick
spd-sel
+
+
+ true
+
+ nasal
+
+
+
+ nasal
+
+
+
true
@@ -475,8 +489,8 @@
property-adjust
/it-autoflight/input/spd-mach
0.01
- 0.40
- 0.99
+ 0.50
+ 0.95
@@ -505,8 +519,8 @@
property-adjust
/it-autoflight/input/spd-mach
-0.01
- 0.40
- 0.99
+ 0.50
+ 0.95
@@ -522,6 +536,10 @@
/it-autoflight/input/lat
1
+
+ nasal
+
+
@@ -531,6 +549,10 @@
/it-autoflight/input/lat
3
+
+ nasal
+
+
@@ -582,6 +604,10 @@
/it-autoflight/input/vert
4
+
+ nasal
+
+
@@ -661,6 +687,10 @@
/it-autoflight/input/vs
0
+
+ nasal
+
+
@@ -675,6 +705,10 @@
}
+
+ nasal
+
+
@@ -732,6 +766,10 @@
/it-autoflight/input/lat
2
+
+ nasal
+
+
@@ -746,20 +784,25 @@
/it-autoflight/input/vert
2
+
+ nasal
+
+
-
+
pick
@@ -773,6 +816,10 @@
0
1
+
+ nasal
+
+
@@ -795,6 +842,10 @@
}
+
+ nasal
+
+
@@ -817,6 +868,10 @@
}
+
+ nasal
+
+
@@ -854,6 +909,10 @@
0
1
+
+ nasal
+
+
@@ -867,6 +926,10 @@
property-toggle
/it-autoflight/input/ap1
+
+ nasal
+
+
@@ -880,6 +943,10 @@
property-toggle
/it-autoflight/input/ap2
+
+ nasal
+
+
@@ -893,6 +960,10 @@
property-toggle
/it-autoflight/input/athr
+
+ nasal
+
+
@@ -907,6 +978,10 @@
/it-autoflight/input/athr
0
+
+ nasal
+
+
@@ -920,6 +995,10 @@
/it-autoflight/input/athr\
0
+
+ nasal
+
+
@@ -1250,7 +1329,7 @@
center-center
xy-plane
number-value
- %1.2f
+ %1.3f
/it-autoflight/input/spd-mach
false
led.txf
@@ -3628,7 +3707,7 @@
false
nasal
-
+
@@ -3637,7 +3716,7 @@
false
nasal
-
+
@@ -3651,7 +3730,7 @@
false
nasal
-
+
@@ -3660,7 +3739,7 @@
false
nasal
-
+
@@ -3674,7 +3753,7 @@
false
nasal
-
+
@@ -3683,7 +3762,7 @@
false
nasal
-
+
@@ -3697,7 +3776,7 @@
false
nasal
-
+
@@ -3706,7 +3785,7 @@
false
nasal
-
+
diff --git a/Models/Instruments/ND/ND_L.xml b/Models/Instruments/ND/ND_L.xml
index 28b2b87f..848c52a8 100644
--- a/Models/Instruments/ND/ND_L.xml
+++ b/Models/Instruments/ND/ND_L.xml
@@ -26,7 +26,7 @@ MD-11 Navigation display
false
nasal
-
+
diff --git a/Models/Instruments/ND/ND_R.xml b/Models/Instruments/ND/ND_R.xml
index d9b87c61..20dc0dfc 100644
--- a/Models/Instruments/ND/ND_R.xml
+++ b/Models/Instruments/ND/ND_R.xml
@@ -26,7 +26,7 @@ MD-11 Navigation display
false
nasal
-
+
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 622d75e1..11441f24 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -137,6 +137,10 @@
3
3
+
+ nasal
+
+
@@ -150,6 +154,10 @@
1
1
+
+ nasal
+
+
@@ -222,6 +230,10 @@
3
3
+
+ nasal
+
+
@@ -235,6 +247,10 @@
1
1
+
+ nasal
+
+
@@ -307,6 +323,10 @@
3
3
+
+ nasal
+
+
@@ -320,6 +340,10 @@
1
1
+
+ nasal
+
+
@@ -395,6 +419,10 @@
6
6
+
+ nasal
+
+
@@ -411,6 +439,10 @@
1
1
+
+ nasal
+
+
@@ -454,6 +486,10 @@
4
4
+
+ nasal
+
+
@@ -468,6 +504,10 @@
1
1
+
+ nasal
+
+
@@ -524,6 +564,10 @@
property-toggle
/controls/adirs/adr[0]/off
+
+ nasal
+
+
@@ -575,6 +619,10 @@
property-toggle
/controls/adirs/adr[1]/off
+
+ nasal
+
+
@@ -626,6 +674,10 @@
property-toggle
/controls/adirs/adr[2]/off
+
+ nasal
+
+
@@ -827,7 +879,7 @@
-
+
@@ -917,6 +969,10 @@
property-toggle
/controls/hydraulic/eng1-pump
+
+ nasal
+
+
@@ -968,6 +1024,10 @@
property-toggle
/controls/hydraulic/elec-pump-blue
+
+ nasal
+
+
@@ -1019,6 +1079,10 @@
property-toggle
/controls/hydraulic/ptu
+
+ nasal
+
+
@@ -1070,6 +1134,10 @@
property-toggle
/controls/hydraulic/eng2-pump
+
+ nasal
+
+
@@ -1121,6 +1189,10 @@
property-toggle
/controls/hydraulic/elec-pump-yellow
+
+ nasal
+
+
@@ -1172,6 +1244,10 @@
property-toggle
/controls/electrical/switches/galley
+
+ nasal
+
+
@@ -1223,6 +1299,10 @@
property-toggle
/controls/electrical/switches/battery1
+
+ nasal
+
+
@@ -1274,6 +1354,10 @@
property-toggle
/controls/electrical/switches/battery2
+
+ nasal
+
+
@@ -1358,7 +1442,10 @@
property-toggle
/controls/electrical/switches/gen1
-
+
+ nasal
+
+
@@ -1409,6 +1496,10 @@
property-toggle
/controls/electrical/switches/ac-ess-feed
+
+ nasal
+
+
@@ -1460,6 +1551,10 @@
property-toggle
/controls/electrical/switches/gen-apu
+
+ nasal
+
+
@@ -1507,6 +1602,10 @@
property-toggle
/controls/electrical/switches/apu-ext-crosstie
+
+ nasal
+
+
@@ -1541,6 +1640,10 @@
property-toggle
/controls/electrical/switches/gen-ext
+
+ nasal
+
+
@@ -1596,7 +1699,10 @@
property-toggle
/controls/electrical/switches/gen2
-
+
+ nasal
+
+
@@ -1683,6 +1789,10 @@
9
11
+
+ nasal
+
+
@@ -1695,6 +1805,10 @@
9
7
+
+ nasal
+
+
@@ -1733,6 +1847,10 @@
property-toggle
/controls/pneumatic/switches/pack1
+
+ nasal
+
+
@@ -1784,6 +1902,10 @@
property-toggle
/controls/pneumatic/switches/bleed1
+
+ nasal
+
+
@@ -1835,6 +1957,10 @@
property-toggle
/controls/pneumatic/switches/bleedapu
+
+ nasal
+
+
@@ -1886,6 +2012,10 @@
property-toggle
/controls/pneumatic/switches/bleed2
+
+ nasal
+
+
@@ -1936,6 +2066,10 @@
property-toggle
/controls/pneumatic/switches/hot-air
+
+ nasal
+
+
@@ -1987,6 +2121,10 @@
property-toggle
/controls/pneumatic/switches/pack2
+
+ nasal
+
+
@@ -2041,6 +2179,10 @@
/controls/pneumatic/switches/ram-air
0
+
+ nasal
+
+
@@ -2292,6 +2434,10 @@
property-toggle
/controls/APU/master
+
+ nasal
+
+
@@ -2347,6 +2493,10 @@
}
+
+ nasal
+
+
diff --git a/Models/Instruments/PFD/res/pfd-3d.ac.bak b/Models/Instruments/PFD/res/pfd-3d.ac.bak
deleted file mode 100644
index 16d27512..00000000
--- a/Models/Instruments/PFD/res/pfd-3d.ac.bak
+++ /dev/null
@@ -1,672 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 0 0 shi 128 trans 0
-OBJECT world
-kids 34
-OBJECT poly
-name "ground"
-loc -0.000632844 0.000620101 0.00496066
-texture "ground.png"
-crease 45.000000
-numvert 4
-0 0.0443777 -0.0369368
-0 0.0443777 0.0369368
-0 -0.0443777 0.0369368
-0 -0.0443777 -0.0369368
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.5875 0.5875
-1 0.4125 0.5875
-2 0.4125 0.4125
-3 0.5875 0.4125
-kids 0
-OBJECT poly
-name "sky"
-loc -0.000632844 0.000620101 0.00496066
-texture "sky.png"
-crease 45.000000
-numvert 4
-0 -0.0443777 -0.0369368
-0 -0.0443777 0.0369368
-0 0.0443777 0.0369368
-0 0.0443777 -0.0369368
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.5875 0.5875
-2 0.4125 0.5875
-1 0.4125 0.4125
-0 0.5875 0.4125
-kids 0
-OBJECT poly
-name "rudder_bar"
-loc 0.00132974 -0.00872025 0.00509377
-texture "rudder-bar.png"
-crease 45.000000
-numvert 4
-0 -0.0105466 -0.00420202
-0 -0.0105466 0.00420203
-0 0.0105466 0.00420202
-0 0.0105466 -0.00420203
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 1 1
-2 0 1
-1 0 0
-0 1 0
-kids 0
-OBJECT poly
-name "target-alt-sel"
-loc 0.000960576 -0.000264099 -0.0431903
-texture "trgt-alt-man.png"
-crease 45.000000
-numvert 4
-0 -0.0428304 -0.00623311
-0 -0.0428304 0.00772078
-0 0.0428304 0.00772078
-0 0.0428304 -0.00623311
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.990386 0.217208
-2 0.022378 0.217208
-1 0.0223766 0.0507198
-0 0.990386 0.0507198
-kids 0
-OBJECT poly
-name "trgt-spd-man"
-loc 0.00121828 0.000747255 0.0473924
-texture "trgt-spd-man.png"
-crease 45.000000
-numvert 4
-0 0.0424935 -0.00258292
-0 0.0424935 0.00258288
-0 -0.0424935 0.00258288
-0 -0.0424935 -0.00258292
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.998074 0.321737
-1 0.800781 0.321737
-2 0.800781 0.0447528
-3 0.998074 0.0447528
-kids 0
-OBJECT poly
-name "horizon"
-loc -0.00063943 0.000620101 0.00496066
-texture "horizon.png"
-crease 45.000000
-numvert 4
-0 0.0443777 -0.0369368
-0 0.0443777 0.0369368
-0 -0.0443777 0.0369368
-0 -0.0443777 -0.0369368
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.5875 0.5875
-1 0.4125 0.5875
-2 0.4125 0.4125
-3 0.5875 0.4125
-kids 0
-OBJECT poly
-name "hdg-tape"
-loc 0.000141949 -0.0623471 0.00488526
-texture "hdg-tape.png"
-crease 45.000000
-numvert 4
-0 -0.00631734 -0.0361253
-0 -0.00631734 0.0361253
-0 0.00631731 0.0361253
-0 0.00631731 -0.0361253
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.0605338 0.994588
-2 -0.0513565 0.994588
-1 -0.0513565 -0.0462684
-0 0.0605338 -0.0462684
-kids 0
-OBJECT poly
-name "trk-ind"
-loc 0.00063943 -0.0623471 0.00488526
-texture "trk-ind.png"
-crease 45.000000
-numvert 4
-0 -0.00631735 -0.0361253
-0 -0.00631735 0.0361253
-0 0.00631731 0.0361253
-0 0.00631731 -0.0361253
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.0605338 0.994588
-2 -0.0513565 0.994588
-1 -0.0513565 -0.0462684
-0 0.0605338 -0.0462684
-kids 0
-OBJECT poly
-name "loc-crs"
-loc 0.00063943 -0.0623471 0.00488526
-texture "loc-crs.png"
-crease 45.000000
-numvert 4
-0 -0.00631734 -0.0361253
-0 -0.00631734 0.0361253
-0 0.00631731 0.0361253
-0 0.00631731 -0.0361253
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.0605338 0.994588
-2 -0.0513565 0.994588
-1 -0.0513565 -0.0462684
-0 0.0605338 -0.0462684
-kids 0
-OBJECT poly
-name "hdg-bug"
-loc 0.00063943 -0.0563471 0.00570176
-texture "hdg-bug.png"
-crease 45.000000
-numvert 4
-0 -0.00601734 -0.0361253
-0 -0.00601734 0.0361253
-0 0.00601731 0.0361253
-0 0.00601731 -0.0361253
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.0605338 0.994588
-2 -0.0513565 0.994588
-1 -0.0513565 -0.0462684
-0 0.0605338 -0.0462684
-kids 0
-OBJECT poly
-name "alt-tape-1"
-loc -0.00063943 -0.000264099 -0.0474465
-texture "alt-tape.png"
-crease 45.000000
-numvert 4
-0 0.0428304 -0.00806341
-0 0.0428304 0.00806338
-0 -0.0428304 0.00806338
-0 -0.0428304 -0.00806341
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.990386 0.217208
-1 0.022378 0.217208
-2 0.0223766 0.0507198
-3 0.990386 0.0507198
-kids 0
-OBJECT poly
-name "spd-tape"
-loc -0.00063943 -0.000264099 0.0592757
-texture "spd-tape.png"
-crease 45.000000
-numvert 4
-0 -0.0428304 -0.00990531
-0 -0.0428304 0.00990527
-0 0.0428304 0.00990527
-0 0.0428304 -0.00990531
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.498074 0.321737
-2 0.00829178 0.321737
-1 0.00829178 0.0447528
-0 0.498074 0.0447528
-kids 0
-OBJECT poly
-name "vsi"
-loc 0.00091828 -0.000133 -0.0683266
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.040099 -0.00314169
-0 -0.040099 0.00334499
-0 0.040099 0.00334499
-0 0.040099 -0.00314169
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.660342 0.662271
-2 0.638535 0.662271
-1 0.638535 0.258462
-0 0.660342 0.258462
-kids 0
-OBJECT poly
-name "spdtrnd-up"
-loc 0.00133822 0.021479 0.0513726
-texture "spdtrend.png"
-crease 45.000000
-numvert 4
-0 0.0210118 -0.00234548
-0 0.0210118 0.00234544
-0 -0.0210118 0.00234544
-0 -0.0210118 -0.00234548
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0 0.496308
-1 1.03601 0.496308
-2 1.03601 -0.00461811
-3 0 -0.00461811
-kids 0
-OBJECT poly
-name "sidestick-pos"
-loc 0.00133541 0.000618536 0.00359356
-texture "autoland.png"
-crease 45.000000
-numvert 4
-0 0.00674502 -0.00440941
-0 -0.00674502 -0.00440941
-0 -0.00674502 0.00810496
-0 0.00674502 0.00810496
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.791565 0.449709
-2 0.68209 0.449709
-1 0.68209 0.0104858
-0 0.791565 0.0104858
-kids 0
-OBJECT poly
-name "sidestick-max"
-loc 0.00091828 -0.0216617 0.0287131
-texture "autoland.png"
-crease 45.000000
-numvert 8
-0 0.00402807 0.00438482
-0 -0.00402807 0.00438482
-0 -0.00402807 -0.00238551
-0 0.00402807 -0.00238551
-0 0.00402807 -0.0523576
-0 -0.00402807 -0.0523576
-0 -0.00402807 -0.0455873
-0 0.00402807 -0.0455873
-numsurf 2
-SURF 0x30
-mat 0
-refs 4
-0 0.629302 0.44775
-1 0.520441 0.44775
-2 0.520441 0.0183234
-3 0.629302 0.0183234
-SURF 0x30
-mat 0
-refs 4
-7 0.629302 0.0183234
-6 0.520441 0.0183234
-5 0.520441 0.44775
-4 0.629302 0.44775
-kids 0
-OBJECT poly
-name "sidestick-max"
-loc 0.00091828 0.0234689 0.0287131
-texture "autoland.png"
-crease 45.000000
-numvert 8
-0 -0.00378506 -0.00238554
-0 -0.00378506 0.0043848
-0 0.00378506 0.0043848
-0 0.00378506 -0.00238554
-0 -0.00378506 -0.0455873
-0 -0.00378506 -0.0523576
-0 0.00378506 -0.0523576
-0 0.00378506 -0.0455873
-numsurf 2
-SURF 0x30
-mat 0
-refs 4
-3 0.629302 0.44775
-2 0.520441 0.44775
-1 0.520441 0.0183234
-0 0.629302 0.0183234
-SURF 0x30
-mat 0
-refs 4
-4 0.629302 0.0183234
-5 0.520441 0.0183234
-6 0.520441 0.44775
-7 0.629302 0.44775
-kids 0
-OBJECT poly
-name "gsscale"
-loc 0.00091828 0.0004113 -0.0352752
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.0361804 -0.00381497
-0 0.0361804 -0.00381499
-0 0.0361804 0.00381497
-0 -0.0361804 0.00381498
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.99826 0.988171
-1 0.99826 0.0824336
-2 0.947974 0.0824336
-3 0.947974 0.988171
-kids 0
-OBJECT poly
-name "locscale"
-loc 0.00091828 -0.0478575 0.00489046
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00428779 -0.0357276
-0 -0.00428779 0.0357276
-0 0.00428777 0.0357276
-0 0.00428777 -0.0357276
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.501561 0.112546
-2 0.964105 0.112546
-1 0.964105 0.00122176
-0 0.501561 0.00122176
-kids 0
-OBJECT poly
-name "gspointer"
-loc 0.00226889 9.10088e-006 -0.0356073
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00547617 0.0031265
-0 -0.00547617 0.0031265
-0 -0.00547617 -0.00312652
-0 0.00547617 -0.00312652
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.239237 0.294683
-1 0.442683 0.294683
-2 0.442683 0.0549766
-3 0.239237 0.0549766
-kids 0
-OBJECT poly
-name "locpointer"
-loc 0.00226889 -0.0482638 0.00541306
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.0031265 -0.00547615
-0 -0.0031265 0.00547617
-0 0.00312651 0.00547617
-0 0.00312651 -0.00547615
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.239237 0.294683
-2 0.442683 0.294683
-1 0.442683 0.0549766
-0 0.239237 0.0549766
-kids 0
-OBJECT poly
-name "vls-tape"
-loc 0.00091828 -0.000281699 0.0476063
-texture "vls-tape.png"
-crease 45.000000
-numvert 4
--1e-005 0.0424935 -0.00136903
--1e-005 0.0424935 0.00136901
--1e-005 -0.0424935 0.00136901
--1e-005 -0.0424935 -0.00136903
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 1 0.321832
-1 0 0.321832
-2 0 0.0448185
-3 1 0.0448185
-kids 0
-OBJECT poly
-name "stall-tape"
-loc 0.00091828 -0.000281699 0.0476063
-texture "spd-tape.png"
-crease 45.000000
-numvert 4
-0 0.0424935 -0.00136903
-0 0.0424935 0.00136901
-0 -0.0424935 0.00136901
-0 -0.0424935 -0.00136903
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.598403 0.321832
-1 0.501577 0.321832
-2 0.501577 0.0448185
-3 0.598403 0.0448185
-kids 0
-OBJECT poly
-name "vfe-tape"
-loc 0.00091828 -0.000281699 0.0476063
-texture "spd-tape.png"
-crease 45.000000
-numvert 4
-0 -0.0424935 -0.00136903
-0 -0.0424935 0.00136901
-0 0.0424935 0.00136901
-0 0.0424935 -0.00136903
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.66857 0.321965
-2 0.605455 0.321965
-1 0.605455 0.0450599
-0 0.66857 0.0450599
-kids 0
-OBJECT poly
-name "alt-tape-2"
-loc 0.00133137 0.000295199 -0.0595814
-texture "alt-tape-2.png"
-crease 45.000000
-numvert 4
-0 -0.00598263 -0.00278856
-0 -0.00598263 0.00278853
-0 0.00598263 0.00278853
-0 0.00598263 -0.00278856
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.962665 0.356135
-2 0.0568116 0.356135
-1 0.0568116 -0.130193
-0 0.962665 -0.130193
-kids 0
-OBJECT poly
-name "radar-alt"
-loc 0.000360576 -0.000264099 -0.0474465
-texture "radar-alt.png"
-crease 45.000000
-numvert 4
-0 0.0428304 -0.00806341
-0 0.0428304 0.00806338
-0 -0.0428304 0.00806338
-0 -0.0428304 -0.00806341
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.990386 0.217208
-1 0.022378 0.217208
-2 0.0223766 0.0507198
-3 0.990386 0.0507198
-kids 0
-OBJECT poly
-name "landing-elev"
-loc 0.000360576 -0.000264099 -0.0474465
-texture "arpt-elev.png"
-crease 45.000000
-numvert 4
-0 0.0428304 -0.00806341
-0 0.0428304 0.00806338
-0 -0.0428304 0.00806338
-0 -0.0428304 -0.00806341
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.990386 0.217208
-1 0.022378 0.217208
-2 0.0223766 0.0507198
-3 0.990386 0.0507198
-kids 0
-OBJECT poly
-name "rect"
-loc 0.0643506 0 0
-texture "mask.png"
-crease 45.000000
-numvert 4
--0.0639733 0.0784821 -0.0784821
--0.0639733 0.0784821 0.0784821
--0.0639733 -0.0784821 0.0784821
--0.0639733 -0.0784821 -0.0784821
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 1 1
-1 0 1
-2 0 0
-3 1 0
-kids 0
-OBJECT poly
-name "spdtrnd-down"
-loc 0.00133822 -0.0211824 0.0513713
-texture "spdtrend.png"
-crease 45.000000
-numvert 4
-0 0.0210118 0.00234548
-0 0.0210118 -0.00234545
-0 -0.0210118 -0.00234544
-0 -0.0210118 0.00234548
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0 0.496308
-2 1.03601 0.496308
-1 1.03601 -0.00461811
-0 0 -0.00461811
-kids 0
-OBJECT poly
-name "bank"
-loc 0.00147448 0.0381779 0.00511426
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.000568084 -0.00535177
-0 -0.000568084 0.00535178
-0 0.00444023 -0.00535177
-0 0.00444023 0.00535178
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.348876 0.413639
-2 0.348876 0.567016
-3 0.505593 0.567016
-1 0.505593 0.413639
-kids 0
-OBJECT poly
-name "slipskid"
-loc 0.00147448 0.0381779 0.00511426
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00444023 -0.00535177
-0 -0.00444022 0.00535178
-0 -0.000568084 0.00535178
-0 -0.000568084 -0.00535177
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-2 0.505593 0.413639
-1 0.505593 0.295057
-0 0.348876 0.295057
-3 0.348876 0.413639
-kids 0
-OBJECT poly
-name "centerbar"
-loc 0.001346 -0.00175913 0.00477472
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 -0.00611249 -0.0377232
-0 -0.00611249 0.0384099
-0 0.0061125 0.0384099
-0 0.0061125 -0.0377232
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.403727 0.933591
-2 0.909275 0.933591
-1 0.909275 0.783893
-0 0.403727 0.783893
-kids 0
-OBJECT poly
-name "fd_pitch"
-loc 0.00132974 0.000646424 0.005045
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.00074983 -0.0194069
-0 0.00074983 0.0194069
-0 -0.00074983 0.0194069
-0 -0.00074983 -0.0194069
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.510324 0.464321
-1 0.762653 0.464321
-2 0.762653 0.461267
-3 0.510324 0.461267
-kids 0
-OBJECT poly
-name "fd_roll"
-loc 0.00132974 0.000880169 0.00507529
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.0196142 -0.000820077
-0 -0.0196142 -0.000820077
-0 -0.0196142 0.000820077
-0 0.0196142 0.000820077
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.510324 0.464321
-2 0.762653 0.464321
-1 0.762653 0.461267
-0 0.510324 0.461267
-kids 0
diff --git a/Models/Interior/a320.interior.xml b/Models/Interior/a320.interior.xml
index 9de21623..f3c66d0d 100644
--- a/Models/Interior/a320.interior.xml
+++ b/Models/Interior/a320.interior.xml
@@ -2,7 +2,7 @@
- res/a320.interior.ac
+ res/libraries.interior.ac
diff --git a/Nasal/MCDU1.nas b/Nasal/MCDU/MCDU1.nas
similarity index 100%
rename from Nasal/MCDU1.nas
rename to Nasal/MCDU/MCDU1.nas
diff --git a/Nasal/MCDU2.nas b/Nasal/MCDU/MCDU2.nas
similarity index 100%
rename from Nasal/MCDU2.nas
rename to Nasal/MCDU/MCDU2.nas
diff --git a/Nasal/various.nas b/Nasal/libraries.nas
similarity index 82%
rename from Nasal/various.nas
rename to Nasal/libraries.nas
index e9e3d8c4..52c02c10 100644
--- a/Nasal/various.nas
+++ b/Nasal/libraries.nas
@@ -1,4 +1,4 @@
-# A320 Various
+# A320 Main Libraries
# Joshua Davidson (it0uchpods)
# :)
@@ -70,6 +70,24 @@ aircraft.rain.init();
# Sounds #
##########
+setlistener("/sim/sounde/btn1", func {
+ if (!getprop("/sim/sounde/btn1")) {
+ return;
+ }
+ settimer(func {
+ props.globals.getNode("/sim/sounde/btn1").setBoolValue(0);
+ }, 0.05);
+});
+
+setlistener("/sim/sounde/knb1", func {
+ if (!getprop("/sim/sounde/knb1")) {
+ return;
+ }
+ settimer(func {
+ props.globals.getNode("/sim/sounde/knb1").setBoolValue(0);
+ }, 0.05);
+});
+
setlistener("/controls/switches/seatbelt-sign", func {
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(1);
settimer(func {
@@ -165,4 +183,26 @@ var externalconnections = maketimer(0.1, func {
setprop("/controls/switches/cart", 0);
setprop("/controls/pneumatic/switches/groundair", 0);
}
-});
\ No newline at end of file
+});
+
+var mcpSPDKnbPull = func {
+ var ias = getprop("/instrumentation/airspeed-indicator/indicated-speed-kt");
+ var mach = getprop("/instrumentation/airspeed-indicator/indicated-mach");
+ if (getprop("/it-autoflight/input/kts-mach") == 0) {
+ if (ias >= 100 and ias <= 360) {
+ setprop("/it-autoflight/input/spd-kts", math.round(ias, 1));
+ } else if (ias < 100) {
+ setprop("/it-autoflight/input/spd-kts", 100);
+ } else if (ias > 360) {
+ setprop("/it-autoflight/input/spd-kts", 360);
+ }
+ } else if (getprop("/it-autoflight/input/kts-mach") == 1) {
+ if (mach >= 0.50 and mach <= 0.95) {
+ setprop("/it-autoflight/input/spd-kts", math.round(mach, 0.001));
+ } else if (mach < 0.50) {
+ setprop("/it-autoflight/input/spd-kts", 0.50);
+ } else if (mach > 0.95) {
+ setprop("/it-autoflight/input/spd-kts", 0.95);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index bb03b99d..fd132c28 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -391,14 +391,6 @@
-
- once
- click.wav
-
- /unused/sound/click
-
-
-
once
detendaa
@@ -674,5 +666,29 @@
+
+ Overhead Button
+ once
+ Aircraft/A320Family/Sounds/oh-button.wav
+
+ /sim/sounde/btn1
+
+
+ 0.75
+
+
+
+
+ Overhead Knob
+ once
+ Aircraft/A320Family/Sounds/oh-knob.wav
+
+ /sim/sounde/knb1
+
+
+ 0.60
+
+
+
\ No newline at end of file
diff --git a/Sounds/click.wav b/Sounds/click.wav
deleted file mode 100644
index 03973bb1..00000000
Binary files a/Sounds/click.wav and /dev/null differ
diff --git a/Sounds/oh-button.wav b/Sounds/oh-button.wav
new file mode 100644
index 00000000..cf75ce39
Binary files /dev/null and b/Sounds/oh-button.wav differ
diff --git a/Sounds/oh-knob.wav b/Sounds/oh-knob.wav
new file mode 100644
index 00000000..9b516e54
Binary files /dev/null and b/Sounds/oh-knob.wav differ