GIT: Merge and VC: update fire bindings to match
This commit is contained in:
commit
5a41093e8c
1 changed files with 170 additions and 146 deletions
|
@ -455,34 +455,15 @@
|
|||
<button>0</button>
|
||||
<repeatable>true</repeatable>
|
||||
<binding>
|
||||
<condition>
|
||||
<property>devices/status/keyboard/shift</property>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/fwddisch</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>devices/status/keyboard/shift</property>
|
||||
<property>controls/OH/protectors/fwddisch</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/fwddisch</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<and>
|
||||
<not>
|
||||
<property>devices/status/keyboard/shift</property>
|
||||
</not>
|
||||
<not>
|
||||
<property>controls/OH/protectors/fwddisch</property>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
|
@ -496,34 +477,15 @@
|
|||
<button>0</button>
|
||||
<repeatable>true</repeatable>
|
||||
<binding>
|
||||
<condition>
|
||||
<property>devices/status/keyboard/shift</property>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/aftdisch</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>devices/status/keyboard/shift</property>
|
||||
<property>controls/OH/protectors/aftdisch</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/aftdisch</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<and>
|
||||
<not>
|
||||
<property>devices/status/keyboard/shift</property>
|
||||
</not>
|
||||
<not>
|
||||
<property>controls/OH/protectors/aftdisch</property>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
|
@ -2040,6 +2002,29 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/ratman</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<or>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dcbat</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/ratman</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -2047,23 +2032,20 @@
|
|||
<type>pick</type>
|
||||
<object-name>RATManGuard</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/ratman</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/ratman</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>controls/OH/protectors/ratman</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -3579,6 +3561,29 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<and>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/elecratman</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
<or>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dcbat</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
<value>25</value>
|
||||
</greater-than-equals>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/elecratman</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -3586,23 +3591,20 @@
|
|||
<type>pick</type>
|
||||
<object-name>EmerManOnGuard</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/elecratman</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/elecratman</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>controls/OH/protectors/elecratman</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -4349,6 +4351,17 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/ramair</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/ramair</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -4358,24 +4371,12 @@
|
|||
<object-name>RamAirBtn2O</object-name>
|
||||
<object-name>RamAirBtnProt</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/ramair</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/ramair</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -4618,6 +4619,17 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/ditching</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/ditching</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -4628,24 +4640,12 @@
|
|||
<object-name>DitchBtn2O</object-name>
|
||||
<object-name>DitchProt</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/ditching</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/ditching</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -5555,6 +5555,17 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/eng1-manstart</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/eng1-manstart</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -5565,24 +5576,21 @@
|
|||
<object-name>Eng1ManStartBtn2O</object-name>
|
||||
<object-name>Eng1ManStartProt</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/eng1-manstart</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/eng1-manstart</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>controls/OH/protectors/eng1-manstart</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -5652,6 +5660,17 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/eng2-manstart</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/eng2-manstart</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -5662,24 +5681,21 @@
|
|||
<object-name>Eng2ManStartBtn2O</object-name>
|
||||
<object-name>Eng2ManStartProt</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<repeatable>false</repeatable>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/eng2-manstart</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/eng2-manstart</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>controls/OH/protectors/eng2-manstart</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -6200,7 +6216,7 @@
|
|||
setprop("/controls/engines/engine[0]/fire-btn-cover", 0);
|
||||
} else if (getprop("/controls/engines/engine[0]/fire-btn-cover") == 1) {
|
||||
setprop("/controls/engines/engine[0]/fire-btn", 1);
|
||||
} else if (getprop("/devices/status/keyboard/shift") == 1) {
|
||||
} else {
|
||||
setprop("/controls/engines/engine[0]/fire-btn-cover", 1);
|
||||
}
|
||||
</script>
|
||||
|
@ -6223,7 +6239,7 @@
|
|||
setprop("/controls/engines/engine[0]/fire-btn-cover", 0);
|
||||
} else if (getprop("/controls/engines/engine[0]/fire-btn-cover") == 1) {
|
||||
setprop("/controls/engines/engine[0]/fire-btn-cover", 0);
|
||||
} else if (getprop("/devices/status/keyboard/shift") == 1) {
|
||||
} else {
|
||||
setprop("/controls/engines/engine[0]/fire-btn-cover", 1);
|
||||
}
|
||||
</script>
|
||||
|
@ -6444,7 +6460,7 @@
|
|||
setprop("/controls/APU/fire-btn-cover", 0);
|
||||
} else if (getprop("/controls/APU/fire-btn-cover") == 1) {
|
||||
setprop("/controls/APU/fire-btn", 1);
|
||||
} else if (getprop("/devices/status/keyboard/shift") == 1) {
|
||||
} else {
|
||||
setprop("/controls/APU/fire-btn-cover", 1);
|
||||
}
|
||||
</script>
|
||||
|
@ -6467,7 +6483,7 @@
|
|||
setprop("/controls/APU/fire-btn-cover", 0);
|
||||
} else if (getprop("/controls/APU/fire-btn-cover") == 1) {
|
||||
setprop("/controls/APU/fire-btn-cover", 0);
|
||||
} else if (getprop("/devices/status/keyboard/shift") == 1) {
|
||||
} else {
|
||||
setprop("/controls/APU/fire-btn-cover", 1);
|
||||
}
|
||||
</script>
|
||||
|
@ -6586,7 +6602,7 @@
|
|||
setprop("/controls/engines/engine[1]/fire-btn-cover", 0);
|
||||
} else if (getprop("/controls/engines/engine[1]/fire-btn-cover") == 1) {
|
||||
setprop("/controls/engines/engine[1]/fire-btn", 1);
|
||||
} else if (getprop("/devices/status/keyboard/shift") == 1) {
|
||||
} else {
|
||||
setprop("/controls/engines/engine[1]/fire-btn-cover", 1);
|
||||
}
|
||||
</script>
|
||||
|
@ -6609,7 +6625,7 @@
|
|||
setprop("/controls/engines/engine[1]/fire-btn-cover", 0);
|
||||
} else if (getprop("/controls/engines/engine[1]/fire-btn-cover") == 1) {
|
||||
setprop("/controls/engines/engine[1]/fire-btn-cover", 0);
|
||||
} else if (getprop("/devices/status/keyboard/shift") == 1) {
|
||||
} else {
|
||||
setprop("/controls/engines/engine[1]/fire-btn-cover", 1);
|
||||
}
|
||||
</script>
|
||||
|
@ -7043,6 +7059,17 @@
|
|||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-btn", 1);</script>
|
||||
</binding>
|
||||
<binding>
|
||||
<condition>
|
||||
<equals>
|
||||
<property>controls/OH/protectors/maskman</property>
|
||||
<value>1</value>
|
||||
</equals>
|
||||
</condition>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/maskman</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
@ -7050,23 +7077,20 @@
|
|||
<type>pick</type>
|
||||
<object-name>MaskManOnGuard</object-name>
|
||||
<action>
|
||||
<button>1</button>
|
||||
<button>0</button>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<command>property-toggle</command>
|
||||
<property>controls/OH/protectors/maskman</property>
|
||||
<value>1</value>
|
||||
</binding>
|
||||
<mod-up>
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>controls/OH/protectors/maskman</property>
|
||||
<value>0</value>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</mod-up>
|
||||
<binding>
|
||||
<condition>
|
||||
<not>
|
||||
<property>controls/OH/protectors/maskman</property>
|
||||
</not>
|
||||
</condition>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/sim/sounde/oh-cover", 1);</script>
|
||||
</binding>
|
||||
</action>
|
||||
</animation>
|
||||
|
||||
|
|
Reference in a new issue