fly/A320-family
1
0
Fork 0
Code Activity

Merge pull request #17 from legoboyvdlp/fire-fix

Browse source 
Fixed Fire indications
This commit is contained in:
Jonathan Redpath 2019-10-25 19:05:59 +01:00 committed by GitHub
commit 1b95e72ac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 551 additions and 557 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

412
Models/FlightDeck/a320.flightdeck.xml
View file

File diff suppressed because it is too large Load diff

595
Models/Instruments/OHpanel/OHpanel.xml
View file

File diff suppressed because it is too large Load diff

101
Models/Instruments/Pedestal_up/Pedestal_up.xml
View file

@ -5,7 +5,7 @@
<PropertyList>
<path>res/Pedestal_up.ac</path>
<animation>
<name>Panel lighting</name>
<type>material</type>
@ -53,18 +53,18 @@
<factor-prop>sim/model/lights/dome-light</factor-prop>
</emission>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-upper</inherits-from>
<object-name>throttle_1</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-atc</inherits-from>
<object-name>atc_glare</object-name>
<object-name>atc_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-engine</inherits-from>
<object-name>engine_body</object-name>
@ -73,7 +73,7 @@
<object-name>Lcutoff</object-name>
<object-name>Rcutoff</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/brightness-panel-ped</inherits-from>
<object-name>vu111_body</object-name>
@ -81,12 +81,12 @@
<object-name>vu111_glare</object-name>
<object-name>vu112_glare</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/dummy-gap</inherits-from>
<object-name>dummy_1</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-radar</inherits-from>
<object-name>radar_mode</object-name>
@ -94,7 +94,7 @@
<object-name>radar_body</object-name>
<object-name>radar_glare</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/cockpit-irradiance</inherits-from>
<object-name>ecam_body</object-name>
@ -121,28 +121,7 @@
<object-name>vu112_aids</object-name>
<object-name>vu112_dfdr</object-name>
</effect>
<animation>
<type>select</type>
<object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
</condition>
</animation>
<animation>
<type>material</type>
<object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
</condition>
<emission>
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
</emission>
</animation>
<animation>
<type>select</type>
<object-name>engine_fault_1</object-name>
@ -150,28 +129,28 @@
<property>systems/unused/unused-ped</property>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
<or>
<property>/systems/fire/engine1/warning-active</property>
<property>/controls/switches/annun-test</property>
</or>
</condition>
</animation>
<animation>
<type>material</type>
<object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
</condition>
<emission>
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
</emission>
</animation>
<animation>
<type>select</type>
<object-name>engine_fault_2</object-name>
@ -179,28 +158,28 @@
<property>systems/unused/unused-ped</property>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>engine_fire_2</object-name>
<condition>
<property>systems/fire/engine2/warning-active</property>
<or>
<property>/systems/fire/engine2/warning-active</property>
<property>/controls/switches/annun-test</property>
</or>
</condition>
</animation>
<animation>
<type>material</type>
<object-name>engine_fire_2</object-name>
<condition>
<property>systems/fire/engine2/warning-active</property>
</condition>
<emission>
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
</emission>
</animation>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/cockpit-irradiance</inherits-from>
<object-name>atc_0</object-name>
@ -221,7 +200,7 @@
<object-name>atc_sys</object-name>
<object-name>atc_thrt</object-name>
</effect>
<text>
<name>atc-code</name>
<offsets>
@ -246,7 +225,7 @@
<height type="int">32</height>
</font-resolution>
</text>
<text>
<name>atc-test</name>
<offsets>
@ -269,7 +248,7 @@
<height type="int">32</height>
</font-resolution>
</text>
<animation>
<type>pick</type>
<object-name>atc_0</object-name>
@ -282,7 +261,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_1</object-name>
@ -295,7 +274,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_2</object-name>
@ -308,7 +287,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_3</object-name>
@ -321,7 +300,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_4</object-name>
@ -334,7 +313,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_5</object-name>
@ -347,7 +326,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_6</object-name>
@ -360,7 +339,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_7</object-name>
@ -373,7 +352,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_clr</object-name>
@ -386,7 +365,7 @@
</binding>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>atc_sys</object-name>
@ -404,7 +383,7 @@
</axis>
<property>controls/atc/system-knob</property>
</animation>
<animation>
<type>pick</type>
<object-name>atc_sys</object-name>
@ -422,7 +401,7 @@
</binding>
</action>
</animation>
<animation>
<type>rotate</type>
<object-name>atc_stby</object-name>
@ -440,7 +419,7 @@
</axis>
<property>controls/atc/mode-knob</property>
</animation>
<animation>
<type>pick</type>
<object-name>atc_stby</object-name>
@ -479,7 +458,7 @@
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>atc_ident</object-name>
@ -491,7 +470,7 @@
</binding>
</action>
</animation>
<animation>
<type>select</type>
<object-name>atc_fail</object-name>