fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cargo fire, guard not animated

Browse source
This commit is contained in:
Jonathan Redpath 2017-09-21 18:03:32 +01:00
parent 6927b98af7
commit f85aaab3a1
5 changed files with 47343 additions and 47762 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
AircraftConfig/fail.xml
View file

@ -458,6 +458,40 @@
</binding> </binding>
<live>true</live> <live>true</live>
</checkbox> </checkbox>
<group>
<layout>hbox</layout>
<hrule>
<stretch type="bool">true</stretch>
</hrule>
<text>
<label>Cargo Fire</label>
</text>
<hrule>
<stretch type="bool">true</stretch>
</hrule>
</group>
<checkbox>
<label>FWD</label>
<halign>left</halign>
<property>/systems/fire/cargo/fwddet</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>AFT</label>
<halign>left</halign>
<property>/systems/fire/cargo/aftdet</property>
<binding>
<command>dialog-apply</command>
</binding>
<live>true</live>
</checkbox>
<hrule/> <hrule/>

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

@ -200,8 +200,6 @@
<type>select</type> <type>select</type>
<object-name>AftCargoIsoBtn1F</object-name> <object-name>AftCargoIsoBtn1F</object-name>
<object-name>AftCargoIsoBtn2O</object-name> <object-name>AftCargoIsoBtn2O</object-name>
<object-name>AftCargoSmkBtn1S</object-name>
<object-name>AftCargoSmkBtn2D</object-name>
<object-name>APUFireAgtBtn1S</object-name> <object-name>APUFireAgtBtn1S</object-name>
<object-name>APUFireAgtBtn2D</object-name> <object-name>APUFireAgtBtn2D</object-name>
<object-name>CargoHotAirBtn1F</object-name> <object-name>CargoHotAirBtn1F</object-name>
@ -219,8 +217,6 @@
<object-name>Eng2FireAgt2Btn2D</object-name> <object-name>Eng2FireAgt2Btn2D</object-name>
<object-name>EvacCommandBtn1E</object-name> <object-name>EvacCommandBtn1E</object-name>
<object-name>EvacCommandBtn2O</object-name> <object-name>EvacCommandBtn2O</object-name>
<object-name>FwdCargoSmkBtn1S</object-name>
<object-name>FwdCargoSmkBtn2D</object-name>
<object-name>Gen1LineBtn1S</object-name> <object-name>Gen1LineBtn1S</object-name>
<object-name>Gen1LineBtn2O</object-name> <object-name>Gen1LineBtn2O</object-name>
<object-name>RcdrGndCtlBtn2O</object-name> <object-name>RcdrGndCtlBtn2O</object-name>
@ -252,6 +248,202 @@
</diffuse> </diffuse>
</animation> </animation>
<!-- cargo smoke -->
<animation>
<type>select</type>
<object-name>FwdCargoSmkBtn1S</object-name>
<condition>
<or>
<equals>
<property>/controls/fire/cargo/fwdsmokeLight</property>
<value>1</value>
</equals>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>AftCargoSmkBtn1S</object-name>
<condition>
<or>
<equals>
<property>/controls/fire/cargo/aftsmokeLight</property>
<value>1</value>
</equals>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>FwdCargoSmkBtn2D</object-name>
<condition>
<or>
<equals>
<property>/controls/fire/cargo/fwddischLight</property>
<value>1</value>
</equals>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>AftCargoSmkBtn2D</object-name>
<condition>
<or>
<equals>
<property>/controls/fire/cargo/aftdischLight</property>
<value>1</value>
</equals>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
</condition>
</animation>
<animation>
<name>Cargo Smoke Test</name>
<type>pick</type>
<object-name>CargoSmkTest</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>controls/fire/cargo/test</property>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<!--<animation>
<type>rotate</type>
<object-name>AftCargoDischGuard</object-name>
<property>controls/OH/protectors/aftdisch</property>
<factor>-145</factor>
<axis>
</axis>
</animation>-->
<!--<animation>
<type>rotate</type>
<object-name>FwdCargoDischGuard</object-name>
<property>controls/OH/protectors/fwddisch</property>
<factor>-145</factor>
<axis>
</axis>
</animation>-->
<animation>
<type>pick</type>
<object-name>AftCargoDischGuard</object-name>
<action>
<button>1</button>
<binding>
<command>property-assign</command>
<property>controls/OH/protectors/aftdisch</property>
<value>1</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>controls/OH/protectors/aftdisch</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>FwdCargoDischGuard</object-name>
<action>
<button>1</button>
<binding>
<command>property-assign</command>
<property>controls/OH/protectors/fwddisch</property>
<value>1</value>
</binding>
<mod-up>
<binding>
<command>property-assign</command>
<property>controls/OH/protectors/fwddisch</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>FwdCargoDischBtn</object-name>
<action>
<button>0</button>
<binding>
<command>property-assign</command>
<property>controls/fire/cargo/fwddisch</property>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>AftCargoDischBtn</object-name>
<action>
<button>0</button>
<binding>
<command>property-assign</command>
<property>controls/fire/cargo/aftdisch</property>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<animation>
<type>pick</type>
<object-name>AftCargoDischBtn</object-name>
</animation>
<!-- IRS 1 --> <!-- IRS 1 -->
<animation> <animation>
<type>pick</type> <type>pick</type>
@ -1597,21 +1789,6 @@
</condition> </condition>
</animation> </animation>
<animation>
<name>Cargo Smoke Test</name>
<type>pick</type>
<object-name>CargoSmkTest</object-name>
<action>
<button>0</button>
<repeatable>false</repeatable>
<binding>
<command>property-assign</command>
<property>controls/fire/cargo/test</property>
<value>1</value>
</binding>
</action>
</animation>
<!-- Hydraulic --> <!-- Hydraulic -->
<animation> <animation>
<name>Green Eng Pump pick</name> <name>Green Eng Pump pick</name>

94822
Models/Instruments/OHpanel/res/ohpanel.ac
View file

File diff suppressed because it is too large Load diff

32
Nasal/fire.nas
View file

@ -33,6 +33,8 @@ setlistener("/sim/signals/fdm-initialized", func {
}); });
var fire_init = func { var fire_init = func {
setprop("/controls/OH/protectors/fwddisch", 0);
setprop("/controls/OH/protectors/aftdisch", 0);
setprop("/systems/fire/cargo/fwddet", 0); setprop("/systems/fire/cargo/fwddet", 0);
setprop("/systems/fire/cargo/aftdet", 0); setprop("/systems/fire/cargo/aftdet", 0);
setprop("/systems/fire/cargo/fwdsquib", 0); setprop("/systems/fire/cargo/fwdsquib", 0);
@ -40,8 +42,6 @@ var fire_init = func {
setprop("/systems/fire/cargo/bottlelevel", 100); setprop("/systems/fire/cargo/bottlelevel", 100);
setprop("/systems/fire/cargo/test", 0); setprop("/systems/fire/cargo/test", 0);
setprop("/controls/fire/cargo/test", 0); setprop("/controls/fire/cargo/test", 0);
setprop("/controls/fire/cargo/fwdguard", 1);
setprop("/controls/fire/cargo/aftguard", 1);
setprop("/controls/fire/cargo/fwddisch", 0); # pushbutton setprop("/controls/fire/cargo/fwddisch", 0); # pushbutton
setprop("/controls/fire/cargo/aftdisch", 0); setprop("/controls/fire/cargo/aftdisch", 0);
setprop("/controls/fire/cargo/fwddischLight", 0); setprop("/controls/fire/cargo/fwddischLight", 0);
@ -114,13 +114,17 @@ var master_fire = func {
} }
if (dischpb1 and fwdsquib and !bottleIsEmpty and !pause) { if (dischpb1 and fwdsquib and !bottleIsEmpty and !pause) {
setprop("/systems/fire/cargo/bottlelevel", getprop("/systems/fire/cargo/bottlelevel") - 0.166); setprop("/systems/fire/cargo/bottlelevel", getprop("/systems/fire/cargo/bottlelevel") - 0.33);
} }
if (dischpb2) { if (dischpb2) {
if (WeCanExt == 1 and !aftsquib and !bottleIsEmpty and (dc1 > 0 or dc2 > 0 or dcbat > 0)) { if (WeCanExt == 1 and !aftsquib and !bottleIsEmpty and (dc1 > 0 or dc2 > 0 or dcbat > 0)) {
setprop("/systems/fire/cargo/aftsquib", 1); setprop("/systems/fire/cargo/aftsquib", 1);
} }
}
if (dischpb2 and aftsquib and !bottleIsEmpty and !pause) {
setprop("/systems/fire/cargo/bottlelevel", getprop("/systems/fire/cargo/bottlelevel") - 0.33);
} }
################# #################
@ -149,7 +153,23 @@ var master_fire = func {
setprop("/controls/fire/cargo/warnaft", 0); setprop("/controls/fire/cargo/warnaft", 0);
setprop("/controls/fire/cargo/test/state", 2); setprop("/controls/fire/cargo/test/state", 2);
}, 0.5); }, 0.5);
} else if (test2 and state == 2) { } if (test2 and state == 2) {
setprop("/controls/fire/cargo/fwdsmokeLight", 1);
setprop("/controls/fire/cargo/warnfwd", 1);
settimer(func(){
setprop("/controls/fire/cargo/fwdsmokeLight", 0);
setprop("/controls/fire/cargo/warnfwd", 0);
setprop("/controls/fire/cargo/test/state", 3);
}, 0.5);
} else if (test2 and state == 3) {
setprop("/controls/fire/cargo/aftsmokeLight", 1);
setprop("/controls/fire/cargo/warnaft", 1);
settimer(func(){
setprop("/controls/fire/cargo/aftsmokeLight", 0);
setprop("/controls/fire/cargo/warnaft", 0);
setprop("/controls/fire/cargo/test/state", 4);
}, 0.5);
} else if (test2 and state == 4) {
setprop("/controls/fire/cargo/fwddischLight", 1); setprop("/controls/fire/cargo/fwddischLight", 1);
setprop("/controls/fire/cargo/aftdischLight", 1); setprop("/controls/fire/cargo/aftdischLight", 1);
settimer(func(){ settimer(func(){
@ -166,12 +186,12 @@ var master_fire = func {
# Status # # Status #
########## ##########
if (level < 0.1) { if (level < 0.1 and !test) {
setprop("/controls/fire/cargo/bottleempty", 1); setprop("/controls/fire/cargo/bottleempty", 1);
setprop("/controls/fire/cargo/status", 0); setprop("/controls/fire/cargo/status", 0);
setprop("/controls/fire/cargo/fwddischLight", 1); setprop("/controls/fire/cargo/fwddischLight", 1);
setprop("/controls/fire/cargo/aftdischLight", 1); setprop("/controls/fire/cargo/aftdischLight", 1);
} else { } else if (!test) {
setprop("/controls/fire/cargo/bottleempty", 0); setprop("/controls/fire/cargo/bottleempty", 0);
setprop("/controls/fire/cargo/status", 1); setprop("/controls/fire/cargo/status", 1);
setprop("/controls/fire/cargo/fwddischLight", 0); setprop("/controls/fire/cargo/fwddischLight", 0);

2
revision.txt
View file

@ -1 +1 @@
1517 1518