New lights by GabrielYV, ALS secondary lights, bugfix FBW

This commit is contained in:
Joshua 2017-04-09 11:30:46 -04:00
parent 37e92cbf6c
commit e5cd29d89d
30 changed files with 35572 additions and 2128 deletions

View file

@ -69,7 +69,10 @@
<chase-distance-m>-85</chase-distance-m>
<sounde>
<seatbelt-sign type="bool">0</seatbelt-sign>
<no-smoking-sign type="bool">0</no-smoking-sign>
</sounde>
<instrumentation>
<path>Aircraft/A320Family/Systems/instrumentation.xml</path>

View file

@ -2235,43 +2235,9 @@
</animation>
<animation>
<name>Left landing light pick</name>
<name>landing light pick</name>
<type>pick</type>
<object-name>LandingLtLSwtch</object-name>
<action>
<button>0</button>
<repeatable type="bool">false</repeatable>
<binding>
<command>property-toggle</command>
<property>controls/lighting/landing-lights[0]</property>
</binding>
</action>
</animation>
<animation>
<name>Left landing light rotate</name>
<type>rotate</type>
<object-name>LandingLtLSwtch</object-name>
<property>controls/lighting/landing-lights[0]</property>
<interpolation>
<entry><ind>0</ind><dep>35</dep></entry>
<entry><ind>1</ind><dep>-35</dep></entry>
</interpolation>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
<center>
<x-m>-0.01</x-m>
<y-m>0</y-m>
<z-m>-0.3037</z-m>
</center>
</animation>
<animation>
<name>Right landing light pick</name>
<type>pick</type>
<object-name>LandingLtRSwtch</object-name>
<action>
<button>0</button>
@ -2280,12 +2246,12 @@
<command>property-toggle</command>
<property>controls/lighting/landing-lights[2]</property>
</binding>
</action>
</animation>
<animation>
<name>Right landing light rotate</name>
<name>landing light rotate</name>
<type>rotate</type>
<object-name>LandingLtLSwtch</object-name>
<object-name>LandingLtRSwtch</object-name>
<property>controls/lighting/landing-lights[2]</property>
<interpolation>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -23,7 +23,11 @@
<object-name>Cone</object-name>
<condition>
<and>
<property>systems/electrical/outputs/landing-light</property>
<greater-than-equals>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<property>controls/lighting/landing-lights[1]</property>
<equals>
<property>gear/gear[0]/position-norm</property>
<value>1</value>

View file

@ -22,7 +22,13 @@
<object-name>Light</object-name>
<object-name>Cone</object-name>
<condition>
<property>systems/electrical/outputs/landing-light[0]</property>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<property>controls/lighting/landing-lights[2]</property>
</and>
</condition>
</animation>
<animation>

View file

@ -24,7 +24,13 @@
<object-name>Light</object-name>
<object-name>Cone</object-name>
<condition>
<property>systems/electrical/outputs/landing-light[2]</property>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<property>controls/lighting/landing-lights[2]</property>
</and>
</condition>
</animation>
<animation>

View file

@ -9,7 +9,7 @@
<object-name>Cone</object-name>
</effect>
<animation>
<!--animation>
<type>select</type>
<object-name>Cone</object-name>
<object-name>Cone-texture</object-name>
@ -24,6 +24,6 @@
</not>
</and>
</condition>
</animation>
</animation-->
</PropertyList>

View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<path>A320neo/Models/Wings/res/Winglets.ac</path>
<!-- ANIMATIONS -->
<!-- On/off -->
<animation>
<name>On/off</name>
<type>select</type>
<object-name>Light</object-name>
<condition>
<greater-than>
<property>systems/electrical/outputs/nav-light</property>
<value>0</value>
</greater-than>
</condition>
</animation>
<!-- Billboard animation -->
<animation>
<name>Billboard</name>
<type>billboard</type>
<object-name>Light</object-name>
</animation>
</PropertyList>

View file

@ -1,5 +1,6 @@
AC3Db
MATERIAL "Lights" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "Lights" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 1
OBJECT poly
@ -7,6 +8,7 @@ name "Light"
data 5
Plane
texture "lights.png"
texrep 1 1
crease 30.000000
numvert 4
1 1 0
@ -14,11 +16,11 @@ numvert 4
-1 -1 0
-1 1 0
numsurf 1
SURF 0x0
mat 0
SURF 0x00
mat 1
refs 4
0 0.0375 0.5375
3 0.4625 0.5375
2 0.4625 0.9625
1 0.0375 0.9625
0 0.0375000238419 0.537500023842
3 0.462499976158 0.537500023842
2 0.462499976158 0.962499976158
1 0.0375000238419 0.962499976158
kids 0

View file

@ -1,24 +0,0 @@
AC3Db
MATERIAL "Lights" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 1
OBJECT poly
name "Light"
data 5
Plane
texture "lights.png"
crease 30.000000
numvert 4
1 1 0
1 -1 0
-1 -1 0
-1 1 0
numsurf 1
SURF 0x0
mat 0
refs 4
0 0.215234 0.5375
3 0.468359 0.5375
2 0.468359 0.9625
1 0.215234 0.9625
kids 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 KiB

After

Width:  |  Height:  |  Size: 169 KiB

View file

@ -1,5 +1,6 @@
AC3Db
MATERIAL "transparent" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 50 trans 0
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "Lights" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 1
OBJECT poly
@ -7,6 +8,7 @@ name "Light"
data 9
Plane.296
texture "lights.png"
texrep 1 1
crease 30.000000
numvert 4
1 1 0
@ -14,11 +16,11 @@ numvert 4
-1 -1 0
-1 1 0
numsurf 1
SURF 0x0
mat 0
SURF 0x00
mat 1
refs 4
0 0.5375 0.5375
3 0.9625 0.5375
2 0.9625 0.9625
1 0.5375 0.9625
0 0.537500023842 0.537500023842
3 0.962499976158 0.537500023842
2 0.962499976158 0.962499976158
1 0.537500023842 0.962499976158
kids 0

View file

@ -1,27 +1,26 @@
AC3Db
MATERIAL "transparent" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 50 trans 0
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "Lights" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0
OBJECT world
kids 1
OBJECT poly
name "strobe"
name "Light"
data 9
Plane.299
texture "lights.png"
crease 45.000000
texrep 1 1
crease 30.000000
numvert 4
-1 0.999882 -0.001139
1 0.999882 -0.001139
1 -1.00012 -0.001139
-1 -1.00012 -0.001139
numsurf 2
SURF 0x0
mat 0
refs 3
3 0.610182 0.108378
1 0.897196 0.395392
0 0.610182 0.395392
SURF 0x0
mat 0
refs 3
3 0.610182 0.108378
2 0.897196 0.108378
1 0.897196 0.395392
1.875 1.875 0
1.875 -1.875 0
-1.875 -1.875 0
-1.875 1.875 0
numsurf 1
SURF 0x00
mat 1
refs 4
0 0.537500023842 0.0375000238419
3 0.962499976158 0.0375000238419
2 0.962499976158 0.462499976158
1 0.537500023842 0.462499976158
kids 0

View file

@ -9,7 +9,7 @@
<animation>
<name>On/off</name>
<type>select</type>
<object-name>strobe</object-name>
<object-name>Light</object-name>
<condition>
<property>systems/electrical/outputs/strobe</property>
</condition>
@ -19,7 +19,7 @@
<animation>
<name>Billboard</name>
<type>billboard</type>
<object-name>strobe</object-name>
<object-name>Light</object-name>
</animation>
</PropertyList>

View file

@ -69,7 +69,7 @@ var roll_input = func {
setprop("/it-fbw/roll-deg", "0");
}
settimer(roll_input, 0.01);
settimer(roll_input, 0.01);
}
var pitch_input = func {
@ -155,7 +155,7 @@ var pitch_input = func {
}
}
settimer(pitch_input, 0.01);
settimer(pitch_input, 0.01);
}
setlistener("/it-autoflight/output/ap1", func {
@ -191,8 +191,12 @@ setlistener("/sim/signals/fdm-initialized", func {
setlistener("/systems/electrical/bus/ac-ess", func {
if (getprop("/systems/electrical/bus/ac-ess") >= 110) {
setprop("/it-fbw/law", "NORMAL");
if (getprop("/it-fbw/law") != "NORMAL") {
setprop("/it-fbw/law", "NORMAL");
}
} else {
setprop("/it-fbw/law", "DIRECT");
if (getprop("/it-fbw/law") != "DIRECT") {
setprop("/it-fbw/law", "DIRECT");
}
}
});

View file

@ -33,6 +33,26 @@ setlistener("controls/lighting/nav-lights-switch", func
logo_lights.setBoolValue(0);
}
});
setlistener("controls/lighting/landing-lights[1]", func
{
var landl = getprop("controls/lighting/landing-lights[1]");
if (landl == 1) {
setprop("sim/rendering/als-secondary-lights/alt-landing-light",1);
} else {
setprop("sim/rendering/als-secondary-lights/alt-landing-light",0);
}
});
setlistener("controls/lighting/landing-lights[2]", func
{
var landr = getprop("controls/lighting/landing-lights[2]");
if (landr == 1) {
setprop("sim/rendering/als-secondary-lights/use-alt-landing-light",1);
} else {
setprop("sim/rendering/als-secondary-lights/use-alt-landing-light",0);
}
});
## TIRE SMOKE/RAIN
##################
@ -43,25 +63,25 @@ aircraft.rain.init();
## SOUNDS
#########
# seatbelt/no smoking sign triggers
setlistener("controls/switches/seatbelt-sign", func
# seatbelt/no smoking/detent sign triggers
setlistener("/controls/switches/seatbelt-sign", func
{
setprop("/sim/sound/seatbelt-sign",1);
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(1);
settimer(func
{
props.globals.getNode("sim/sound/seatbelt-sign").setBoolValue(0);
props.globals.getNode("/sim/sounde/seatbelt-sign").setBoolValue(0);
}, 2);
});
setlistener("controls/switches/no-smoking-sign", func
});
setlistener("/controls/switches/no-smoking-sign", func
{
props.globals.getNode("sim/sound/no-smoking-sign").setBoolValue(1);
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(1);
settimer(func
{
props.globals.getNode("sim/sound/no-smoking-sign").setBoolValue(0);
props.globals.getNode("/sim/sounde/no-smoking-sign").setBoolValue(0);
}, 2);
});
});
## GEAR

View file

@ -14,7 +14,7 @@ setlistener("/sim/signals/fdm-initialized", func {
setlistener("/controls/engines/engine[0]/throttle-pos", func {
var thrr = getprop("/controls/engines/engine[0]/throttle-pos");
if (thrr < 0.05) {
if (thrr < 0.02) {
setprop("/systems/thrust/state1", "IDLE");
atoff_request();
} else if (thrr >= 0.01 and thrr < 0.60) {
@ -39,7 +39,7 @@ setlistener("/controls/engines/engine[0]/throttle-pos", func {
setlistener("/controls/engines/engine[1]/throttle-pos", func {
var thrr = getprop("/controls/engines/engine[1]/throttle-pos");
if (thrr < 0.05) {
if (thrr < 0.02) {
setprop("/systems/thrust/state2", "IDLE");
atoff_request();
} else if (thrr >= 0.01 and thrr < 0.60) {

View file

@ -163,7 +163,6 @@
<property>/position/gear-agl-ft</property>
<value>18</value>
</less-than>
<greater-than>
<property>controls/engines/engine[0]/throttle</property>
<value>0.0</value>
@ -291,5 +290,289 @@
<property>gear/gear[2]/wow</property>
</condition>
</wow>
<click>
<mode>once</mode>
<path>click.wav</path>
<condition>
<property>/unused/sound/click</property>
</condition>
</click>
<detenta>
<mode>once</mode>
<name>detendaa</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/systems/thrust/state1</property>
<value>IDLE</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendba</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/systems/thrust/state2</property>
<value>IDLE</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendab</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbb</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendac</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/systems/thrust/state1</property>
<value>CL</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbc</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/systems/thrust/state2</property>
<value>CL</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendad</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/systems/thrust/state1</property>
<value>MAN THR</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbd</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/systems/thrust/state2</property>
<value>MAN THR</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendae</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/systems/thrust/state1</property>
<value>MCT</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbe</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/systems/thrust/state2</property>
<value>MCT</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendaf</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/systems/thrust/state1</property>
<value>TOGA</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbf</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/systems/thrust/state2</property>
<value>TOGA</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendag</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/controls/engines/engine[0]/reverser</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbg</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/controls/engines/engine[1]/reverser</property>
<value>0</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<detenta>
<mode>once</mode>
<name>detendah</name>
<path>detenta.wav</path>
<condition>
<equals>
<property>/controls/engines/engine[0]/reverser</property>
<value>1</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detenta>
<detentb>
<mode>once</mode>
<name>detendbh</name>
<path>detentb.wav</path>
<condition>
<equals>
<property>/controls/engines/engine[1]/reverser</property>
<value>1</value>
</equals>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</detentb>
<sb>
<mode>once</mode>
<name>sb</name>
<path>seatbelt.wav</path>
<condition>
<and>
<greater-than>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than>
<property>/sim/sounde/seatbelt-sign</property>
</and>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</sb>
<ns>
<mode>once</mode>
<name>ns</name>
<path>nosmoko.wav</path>
<condition>
<and>
<greater-than>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than>
<property>/sim/sounde/no-smoking-sign</property>
</and>
</condition>
<volume>
<property>/sim/sound/effects/volume</property>
</volume>
</ns>
</fx>
</PropertyList>

Binary file not shown.

Binary file not shown.

BIN
Sounds/detenta.wav Normal file

Binary file not shown.

BIN
Sounds/detentb.wav Normal file

Binary file not shown.

BIN
Sounds/detentc.wav Normal file

Binary file not shown.

BIN
Sounds/detentd.wav Normal file

Binary file not shown.

BIN
Sounds/nosmoko.wav Normal file

Binary file not shown.

BIN
Sounds/seatbelt.wav Normal file

Binary file not shown.

Binary file not shown.