A3XX: Fix bug in electrical, and sounds

This commit is contained in:
Joshua Davidson 2017-10-04 17:47:16 -04:00
parent 399ab73b03
commit 3fc3ca4eae
3 changed files with 71 additions and 29 deletions

View file

@ -198,7 +198,7 @@ var master_elec = func {
setprop("/systems/electrical/gen-ext", 0); setprop("/systems/electrical/gen-ext", 0);
} }
if (rpmapu >= 94.9 and gen_apu_sw and !extpwr_on and !gen_ext_sw) { if (rpmapu >= 94.9 and gen_apu_sw and !gen_ext_sw) {
setprop("/systems/electrical/gen-apu", 1); setprop("/systems/electrical/gen-apu", 1);
} else { } else {
setprop("/systems/electrical/gen-apu", 0); setprop("/systems/electrical/gen-apu", 0);

View file

@ -1122,10 +1122,13 @@
<mode>once</mode> <mode>once</mode>
<path>Aircraft/IDG-A32X/Sounds/Cockpit/700hz.wav</path> <path>Aircraft/IDG-A32X/Sounds/Cockpit/700hz.wav</path>
<condition> <condition>
<equals> <and>
<property>controls/CVR/tone</property> <property>sim/current-view/internal</property>
<value>1</value> <equals>
</equals> <property>controls/CVR/tone</property>
<value>1</value>
</equals>
</and>
</condition> </condition>
<volume> <volume>
<factor>0.60</factor> <factor>0.60</factor>
@ -1137,10 +1140,13 @@
<mode>once</mode> <mode>once</mode>
<path>Aircraft/IDG-A32X/Sounds/Cockpit/relay2.wav</path> <path>Aircraft/IDG-A32X/Sounds/Cockpit/relay2.wav</path>
<condition> <condition>
<greater-than> <and>
<property>/systems/electrical/battery1-amps</property> <property>sim/current-view/internal</property>
<value>25</value> <greater-than>
</greater-than> <property>/systems/electrical/battery1-amps</property>
<value>25</value>
</greater-than>
</and>
</condition> </condition>
<volume> <volume>
<factor>0.60</factor> <factor>0.60</factor>
@ -1152,10 +1158,13 @@
<mode>once</mode> <mode>once</mode>
<path>Aircraft/IDG-A32X/Sounds/Cockpit/relay2.wav</path> <path>Aircraft/IDG-A32X/Sounds/Cockpit/relay2.wav</path>
<condition> <condition>
<greater-than> <and>
<property>/systems/electrical/battery2-amps</property> <property>sim/current-view/internal</property>
<value>25</value> <greater-than>
</greater-than> <property>/systems/electrical/battery2-amps</property>
<value>25</value>
</greater-than>
</and>
</condition> </condition>
<volume> <volume>
<factor>0.60</factor> <factor>0.60</factor>
@ -1168,6 +1177,7 @@
<path>Aircraft/IDG-A32X/Sounds/Cockpit/relay4.wav</path> <path>Aircraft/IDG-A32X/Sounds/Cockpit/relay4.wav</path>
<condition> <condition>
<and> <and>
<property>sim/current-view/internal</property>
<equals> <equals>
<property>/controls/switches/cart</property> <property>/controls/switches/cart</property>
<value>1</value> <value>1</value>
@ -1184,35 +1194,67 @@
</relay> </relay>
<relay> <relay>
<name>RelayAPU</name> <name>RelayEXTB</name>
<mode>once</mode> <mode>once</mode>
<path>Aircraft/IDG-A32X/Sounds/Cockpit/relay4.wav</path> <path>Aircraft/IDG-A32X/Sounds/Cockpit/relay4.wav</path>
<condition> <condition>
<equals> <and>
<property>/systems/electrical/gen-apu</property> <property>sim/current-view/internal</property>
<value>1</value> <equals>
</equals> <property>/controls/switches/cart</property>
<value>1</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-extb</property>
<value>1</value>
</equals>
</and>
</condition> </condition>
<volume> <volume>
<factor>0.60</factor> <factor>0.60</factor>
</volume> </volume>
</relay> </relay>
<relay>
<name>RelayAPU</name>
<mode>once</mode>
<path>Aircraft/IDG-A32X/Sounds/Cockpit/relay4.wav</path>
<condition>
<and>
<property>sim/current-view/internal</property>
<equals>
<property>/systems/electrical/gen-apu</property>
<value>1</value>
</equals>
</and>
</condition>
<volume>
<factor>0.60</factor>
</volume>
</relay>
<relay> <relay>
<name>Avionics</name> <name>Avionics</name>
<mode>looped</mode> <mode>looped</mode>
<path>Aircraft/IDG-A32X/Sounds/FL2070/320efis.wav</path> <path>Aircraft/IDG-A32X/Sounds/FL2070/320efis.wav</path>
<condition> <condition>
<or> <and>
<greater-than> <property>sim/current-view/internal</property>
<property>/systems/electrical/bus/ac1</property> <or>
<value>110</value> <greater-than>
</greater-than> <property>/systems/electrical/bus/ac1</property>
<greater-than> <value>110</value>
<property>/systems/electrical/bus/ac2</property> </greater-than>
<value>110</value> <greater-than>
</greater-than> <property>/systems/electrical/bus/ac2</property>
</or> <value>110</value>
</greater-than>
</or>
</and>
</condition> </condition>
<volume> <volume>
<factor>0.60</factor> <factor>0.60</factor>

View file

@ -1 +1 @@
2027 2028