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

This commit is contained in:
Joshua Davidson 2017-07-29 15:35:52 -04:00
commit d9a8c25b10
11 changed files with 224 additions and 2 deletions

View file

@ -228,6 +228,16 @@
</script>
</binding>
</item>
<item>
<label>Announcements</label>
<binding>
<command>nasal</command>
<script>
var announce_dlg = gui.Dialog.new("sim/gui/dialogs/announce/dialog", "Aircraft/A320Family/AircraftConfig/announce.xml");
announce_dlg.open();
</script>
</binding>
</item>
<item>
<label>Pushback</label>
<binding>

107
AircraftConfig/announce.xml Normal file
View file

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
#######################################
# Copyright (c) A3XX Development Team #
#######################################
-->
<!-- A3XX Aircraft Config Dialog -->
<PropertyList>
<name>announcements</name>
<layout>vbox</layout>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>Announcements</label>
</text>
<button>
<halign>right</halign>
<pref-width>20</pref-width>
<pref-height>20</pref-height>
<legend>X</legend>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<group>
<layout>vbox</layout>
<checkbox>
<label>Welcome (F/A)</label>
<halign>left</halign>
<property>/sim/sounde/welcomefa</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>Welcome (Capt)</label>
<halign>left</halign>
<property>/sim/sounde/welcomecapt</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>Doors Departure</label>
<halign>left</halign>
<property>/sim/sounde/doors</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>SafetyBrief</label>
<halign>left</halign>
<property>/sim/sounde/safety</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>Prepare for Takeoff</label>
<halign>left</halign>
<property>/sim/sounde/prepareto</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>Seatbelt Turned Off</label>
<halign>left</halign>
<property>/sim/sounde/seatbelt-10k</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
</group>
</group>
</PropertyList>

View file

@ -394,7 +394,7 @@
</script>
</binding>
</button>
</group>
</group>

View file

@ -705,7 +705,7 @@
<gear>
<name>gearding</name>
<mode>once</mode>
<path>gear-ding.wav</path>
<path>nosmoko.wav</path> <!-- since it is trigered by smoking sign logic then the sound must be smoking sign sound -->
<condition>
<and>
<equals>
@ -1184,5 +1184,110 @@
</volume>
</relay>
<announcements>
<name>welcomeFA</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/welcome.wav</path>
<condition>
<equals>
<property>/sim/sounde/welcomefa</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</announcements>
<announcements>
<name>welcomeCA</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/captwelcome.wav</path>
<condition>
<equals>
<property>/sim/sounde/welcomecapt</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</announcements>
<announcements>
<name>doorsDep</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/doorsdepart.wav</path>
<condition>
<equals>
<property>/sim/sounde/doors</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</announcements>
<announcements>
<name>PrepTo</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/takeoff.wav</path>
<condition>
<equals>
<property>/sim/sounde/prepareto</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</announcements>
<announcements>
<name>seatbeltOff</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/belt10k.wav</path>
<condition>
<equals>
<property>/sim/sounde/seatbelt-10k</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</announcements>
<announcements>
<name>safety</name>
<mode>once</mode>
<path>Aircraft/A320Family/Sounds/safety.wav</path>
<condition>
<equals>
<property>/sim/sounde/safety</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</announcements>
<hydraulics>
<name>yellow</name>
<mode>looped</mode>
<path>Aircraft/A320Family/Sounds/NewSounds/yellowpump.wav</path>
<condition>
<equals>
<property>/controls/hydraulic/elec-pump-yellow</property>
<value>1</value>
</equals>
</condition>
<volume>
<factor>0.20</factor>
</volume>
</hydraulics>
</fx>
</PropertyList>

Binary file not shown.

BIN
Sounds/belt10k.wav Normal file

Binary file not shown.

BIN
Sounds/captwelcome.wav Normal file

Binary file not shown.

BIN
Sounds/doorsdepart.wav Normal file

Binary file not shown.

BIN
Sounds/safety.wav Normal file

Binary file not shown.

BIN
Sounds/takeoff.wav Normal file

Binary file not shown.

BIN
Sounds/welcome.wav Normal file

Binary file not shown.