Merge branch 'master' of github.com:it0uchpods/A320Family

This commit is contained in:
Joshua Davidson 2017-07-22 14:50:33 -04:00
commit 776cfd1eaf
5 changed files with 78 additions and 1 deletions

View file

@ -5746,7 +5746,7 @@
</condition> </condition>
</animation> </animation>
<!-- CVR --> <!-- Sounds -->
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>CVRTest</object-name> <object-name>CVRTest</object-name>
@ -5760,4 +5760,30 @@
</action> </action>
</animation> </animation>
<animation>
<type>pick</type>
<object-name>GroundCall</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.MechCall();</script>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>FwdCabinCall</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>nasal</command>
<script>libraries.CabinCall();</script>
</binding>
</action>
</animation>
</PropertyList> </PropertyList>

View file

@ -17,6 +17,8 @@ var variousReset = func {
setprop("/instrumentation/mk-viii/inputs/discretes/glideslope-cancel", 0); setprop("/instrumentation/mk-viii/inputs/discretes/glideslope-cancel", 0);
setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 0); setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 0);
setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override", 0); setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override", 0);
setprop("/controls/switches/cabinCall", 0);
setprop("/controls/switches/mechCall", 0);
# cockpit voice recorder stuff # cockpit voice recorder stuff
setprop("/controls/CVR/power", 0); setprop("/controls/CVR/power", 0);
setprop("/controls/CVR/test", 0); setprop("/controls/CVR/test", 0);
@ -26,6 +28,21 @@ var variousReset = func {
setprop("/controls/switches/cabinfan", 1); setprop("/controls/switches/cabinfan", 1);
} }
var CabinCall = func {
setprop("/controls/switches/cabinCall", 1);
settimer(func() {
setprop("/controls/switches/cabinCall", 0);
}, 15);
}
var MechCall = func {
setprop("/controls/switches/mechCall", 1);
settimer(func() {
setprop("/controls/switches/mechCall", 0);
}, 15);
}
var CVR_test = func { var CVR_test = func {
var parkBrake = getprop("/controls/gear/brake-parking"); var parkBrake = getprop("/controls/gear/brake-parking");
if (parkBrake) { if (parkBrake) {

View file

@ -44,6 +44,40 @@
</pitch> </pitch>
</apu--> </apu-->
<announcement>
<name>PurserSnacks</name>
<mode>once</mode>
<path>purserSnacks.wav</path>
<condition>
<equals>
<property>/controls/switches/cabinCall</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>8</factor>
</volume>
<reference-dist>20.0</reference-dist>
<max-dist>100.0</max-dist>
</announcement>
<announcement>
<name>MechCall</name>
<mode>once</mode>
<path>mechCall.wav</path>
<condition>
<equals>
<property>/controls/switches/mechCall</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>8</factor>
</volume>
<reference-dist>20.0</reference-dist>
<max-dist>100.0</max-dist>
</announcement>
<callout> <callout>
<name>V1</name> <name>V1</name>
<mode>once</mode> <mode>once</mode>

BIN
Sounds/mechCall.wav Normal file

Binary file not shown.

BIN
Sounds/purserSnacks.wav Normal file

Binary file not shown.