diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml index fa009d13..4e70c01a 100644 --- a/A319-100-CFM.xml +++ b/A319-100-CFM.xml @@ -416,9 +416,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 1 - 3 - 1 - 2 + 7 655.4820 @@ -444,9 +442,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 -1 - 3 - 5 - 4 + 8 655.4820 @@ -552,10 +548,32 @@ YAW MOI_________3950000______23089847_______24848934 JET-A1 50 + + + 589.735 + -226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + + + + 589.735 + 226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + - + diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml index 656726e2..80707b55 100644 --- a/A319-100-IAE.xml +++ b/A319-100-IAE.xml @@ -416,9 +416,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 1 - 3 - 1 - 2 + 7 655.4820 @@ -444,9 +442,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 -1 - 3 - 5 - 4 + 8 655.4820 @@ -552,10 +548,32 @@ YAW MOI_________3950000______23089847_______24848934 JET-A1 50 + + + 589.735 + -226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + + + + 589.735 + 226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + - + diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index e7ea8c9d..a24fc369 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -416,9 +416,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 1 - 3 - 1 - 2 + 7 655.4820 @@ -444,9 +442,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 -1 - 3 - 5 - 4 + 8 655.4820 @@ -552,10 +548,32 @@ YAW MOI_________3950000______23089847_______24848934 JET-A1 50 + + + 589.735 + -226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + + + + 589.735 + 226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + - + diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index 5d2ca590..ab20ec08 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -416,9 +416,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 1 - 3 - 1 - 2 + 7 655.4820 @@ -444,9 +442,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 -1 - 3 - 5 - 4 + 8 655.4820 @@ -471,7 +467,7 @@ YAW MOI_________3950000______23089847_______24848934 412 0 - 4 + 0 JET-A1 50 @@ -548,14 +544,36 @@ YAW MOI_________3950000______23089847_______24848934 412 0 - 4 + 0 JET-A1 50 + + + 589.735 + -226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + + + + 589.735 + 226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + - + diff --git a/A320-main.xml b/A320-main.xml index 061da6e5..89b19366 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -239,6 +239,12 @@ Right Wing Surge + + Left Pipes + + + Right Pipes + @@ -545,6 +551,21 @@ 0 0 + + 0 + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + 0 0 @@ -745,10 +766,11 @@ Aircraft/A320Family/AircraftConfig/acconfig.nas - Aircraft/A320Family/Nasal/engines.nas Aircraft/A320Family/Nasal/electrical.nas Aircraft/A320Family/Nasal/pneumatics.nas Aircraft/A320Family/Nasal/hydraulics.nas + Aircraft/A320Family/Nasal/fuel.nas + Aircraft/A320Family/Nasal/engines.nas Aircraft/A320Family/Nasal/ADIRS.nas diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml index cc6ace49..d8dbab47 100644 --- a/A321-200-CFM.xml +++ b/A321-200-CFM.xml @@ -416,9 +416,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 1 - 3 - 1 - 2 + 7 655.4820 @@ -444,9 +442,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 -1 - 3 - 5 - 4 + 8 655.4820 @@ -552,10 +548,32 @@ YAW MOI_________3950000______23089847_______24848934 JET-A1 50 + + + 589.735 + -226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + + + + 589.735 + 226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + - + diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml index a232c85a..d72b47ee 100644 --- a/A321-200-IAE.xml +++ b/A321-200-IAE.xml @@ -416,9 +416,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 1 - 3 - 1 - 2 + 7 655.4820 @@ -444,9 +442,7 @@ YAW MOI_________3950000______23089847_______24848934 2.2 -1 - 3 - 5 - 4 + 8 655.4820 @@ -552,10 +548,32 @@ YAW MOI_________3950000______23089847_______24848934 JET-A1 50 + + + 589.735 + -226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + + + + 589.735 + 226.575 + -45.567 + + 100 + 0 + 1 + JET-A1 + - + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 7aaf1de4..5fceaa20 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -51,6 +51,8 @@ var systemsReset = func { systems.ADIRSreset(); systems.pneu_init(); systems.hyd_init(); + systems.press_init(); + systems.fuel_init(); fmgc.FMGCinit(); mcdu1.MCDU_reset(); mcdu2.MCDU_reset(); @@ -195,6 +197,12 @@ var beforestart = func { } var beforestart_b = func { # Continue with engine start prep. + setprop("/controls/fuel/tank2pump1", 1); + setprop("/controls/fuel/tank2pump2", 1); + setprop("/controls/fuel/tank3pump1", 1); + setprop("/controls/fuel/tank3pump2", 1); + setprop("/controls/fuel/tank4pump1", 1); + setprop("/controls/fuel/tank4pump2", 1); setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/galley", 1); setprop("/controls/electrical/switches/gen1", 1); @@ -264,6 +272,12 @@ var taxi = func { } var taxi_b = func { # Continue with engine start prep, and start engine 2. + setprop("/controls/fuel/tank2pump1", 1); + setprop("/controls/fuel/tank2pump2", 1); + setprop("/controls/fuel/tank3pump1", 1); + setprop("/controls/fuel/tank3pump2", 1); + setprop("/controls/fuel/tank4pump1", 1); + setprop("/controls/fuel/tank4pump2", 1); setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/galley", 1); setprop("/controls/electrical/switches/gen1", 1); @@ -287,7 +301,7 @@ var taxi_b = func { setprop("instrumentation/adirs/ir[1]/aligned",1); setprop("instrumentation/adirs/ir[2]/aligned",1); setprop("/controls/adirs/mcducbtn", 1); - settimer(taxi_c, 0.5); + settimer(taxi_c, 2); } var taxi_c = func { setprop("/controls/engines/engine-start-switch", 2); diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index d644d55c..aa138f21 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -9,12 +9,44 @@ select - ACESSFeedBtn1F - ACESSFeedBtn2O ACPack1Btn1F ACPack1Btn2O ACPack2Btn1F ACPack2Btn2O + BatteryBtn11F + BatteryBtn12O + BatteryBtn21F + BatteryBtn22O + Gen1Btn1F + Gen1Btn2O + Gen2Btn1F + Gen2Btn2O + + + + /systems/electrical/battery1-amps + 120 + + + /systems/electrical/battery2-amps + 120 + + + /systems/electrical/bus/dc1 + 25 + + + /systems/electrical/bus/dc2 + 25 + + + + + + + select + ACESSFeedBtn1F + ACESSFeedBtn2O APUBleedBtn1F APUBleedBtn2O APUGenBtn1F @@ -29,27 +61,23 @@ ADR2Btn2O ADR3Btn1F ADR3Btn2O - BatteryBtn11F - BatteryBtn12O - BatteryBtn21F - BatteryBtn22O - Battery-volt - Battery-volt-test BlueElecPump1F BlueElecPump2O BusTieBtn2O + CFuelTank1Btn1F + CFuelTank1Btn2O + CFuelTank2Btn1F + CFuelTank2Btn2O Eng1BleedBtn1F Eng1BleedBtn2O Eng2BleedBtn1F Eng2BleedBtn2O - ExtPwrBtn1A ExtPwrBtn2O + FuelModeBtn1F + FuelModeBtn2O + FuelXfeedBtn2O GalleyPwrBtn1F GalleyPwrBtn2O - Gen1Btn1F - Gen1Btn2O - Gen2Btn1F - Gen2Btn2O GreenEngPump1F GreenEngPump2O HotAirBtn1F @@ -62,24 +90,24 @@ IR2Btn2A IR3Btn1F IR3Btn2A + LFuelTank1Btn1F + LFuelTank1Btn2O + LFuelTank2Btn1F + LFuelTank2Btn2O IrsOnBatLightOB PTU1F PTU2O RamAirBtn2O + RFuelTank1Btn1F + RFuelTank1Btn2O + RFuelTank2Btn1F + RFuelTank2Btn2O YellowElecPump1F YellowElecPump2O YellowEngPump1F YellowEngPump2O - - /controls/electrical/switches/battery1 - 1 - - - /controls/electrical/switches/battery2 - 1 - /systems/electrical/bus/dc1 25 @@ -1248,6 +1276,430 @@ + + + + pick + FuelXfeedBtn + FuelXfeedBtn2O + + + false + + property-toggle + /controls/fuel/x-feed + + + nasal + + + + + + + + + select + FuelModeBtn2O + + + + /controls/fuel/x-feed + 1 + + + /controls/switches/annun-test + 1 + + + + + + + pick + LFuelTank1Btn1 + LFuelTank1Btn2 + LFuelTank1Btn1F + LFuelTank1Btn2O + + + false + + property-toggle + /controls/fuel/tank2pump1 + + + nasal + + + + + + + select + LFuelTank1Btn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + LFuelTank1Btn2O + + + + /controls/fuel/tank2pump1 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + pick + LFuelTank2Btn1 + LFuelTank2Btn2 + LFuelTank2Btn1F + LFuelTank2Btn2O + + + false + + property-toggle + /controls/fuel/tank2pump2 + + + nasal + + + + + + + select + LFuelTank2Btn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + LFuelTank2Btn2O + + + + /controls/fuel/tank2pump2 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + pick + CFuelTank1Btn1 + CFuelTank1Btn2 + CFuelTank1Btn1F + CFuelTank1Btn2O + + + false + + property-toggle + /controls/fuel/tank3pump1 + + + nasal + + + + + + + select + CFuelTank1Btn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + CFuelTank1Btn2O + + + + /controls/fuel/tank3pump1 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + + + select + FuelModeBtn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + FuelModeBtn2O + + + + /controls/fuel/mode + 0 + + + /controls/switches/annun-test + 1 + + + + + + + pick + CFuelTank2Btn1 + CFuelTank2Btn2 + CFuelTank2Btn1F + CFuelTank2Btn2O + + + false + + property-toggle + /controls/fuel/tank3pump2 + + + nasal + + + + + + + select + CFuelTank2Btn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + CFuelTank2Btn2O + + + + /controls/fuel/tank3pump2 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + pick + RFuelTank1Btn1 + RFuelTank1Btn2 + RFuelTank1Btn1F + RFuelTank1Btn2O + + + false + + property-toggle + /controls/fuel/tank4pump1 + + + nasal + + + + + + + select + RFuelTank1Btn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + RFuelTank1Btn2O + + + + /controls/fuel/tank4pump1 + 0 + + + /controls/switches/annun-test + 1 + + + + + + + pick + RFuelTank2Btn1 + RFuelTank2Btn2 + RFuelTank2Btn1F + RFuelTank2Btn2O + + + false + + property-toggle + /controls/fuel/tank4pump2 + + + nasal + + + + + + + select + RFuelTank2Btn1F + + + + + /controls/switches/annun-test + 1 + + + + + + select + RFuelTank2Btn2O + + + + /controls/fuel/tank4pump2 + 0 + + + /controls/switches/annun-test + 1 + + + + + Galley pick @@ -1476,6 +1928,16 @@ /systems/failures/elec-gen1 1 + + + /controls/electrical/switches/gen1 + 1 + + + /engines/engine[0]/state + 3 + + /controls/switches/annun-test 1 @@ -1733,6 +2195,16 @@ /systems/failures/elec-gen2 1 + + + /controls/electrical/switches/gen2 + 1 + + + /engines/engine[1]/state + 3 + + /controls/switches/annun-test 1 diff --git a/Models/Instruments/OHpanel/res/background.old.png b/Models/Instruments/OHpanel/res/background.old.png deleted file mode 100644 index 13b30875..00000000 Binary files a/Models/Instruments/OHpanel/res/background.old.png and /dev/null differ diff --git a/Models/Instruments/OHpanel/res/background.png b/Models/Instruments/OHpanel/res/background.png index 6cddd66c..03f49d46 100644 Binary files a/Models/Instruments/OHpanel/res/background.png and b/Models/Instruments/OHpanel/res/background.png differ diff --git a/Models/Instruments/OHpanel/res/markings.old.png b/Models/Instruments/OHpanel/res/markings.old.png deleted file mode 100644 index 99fe3544..00000000 Binary files a/Models/Instruments/OHpanel/res/markings.old.png and /dev/null differ diff --git a/Models/Instruments/OHpanel/res/markings.png b/Models/Instruments/OHpanel/res/markings.png index 243b4f5e..4801dd44 100644 Binary files a/Models/Instruments/OHpanel/res/markings.png and b/Models/Instruments/OHpanel/res/markings.png differ diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index fcf22b11..8c4fda18 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -8,7 +8,697 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 MATERIAL "Switch" rgb 0.678431 0.678431 0.678431 amb 0.678431 0.678431 0.678431 emis 0 0 0 spec 0 0 0 shi 32 trans 0.004 MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0 OBJECT world -kids 254 +kids 261 +OBJECT poly +name "FuelXfeedBtn2O" +loc 0.000175806 0.13925 0.0418499 +data 8 +Cube.063 +texture "buttons3.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 -0.0528 +-0.01 -0.0464 -0.0328 +-0.007 -0.0464 -0.0328 +-0.007 -0.0464 -0.0528 +-0.01 -0.0564 -0.0528 +-0.01 -0.0564 -0.0328 +-0.007 -0.0564 -0.0328 +-0.007 -0.0564 -0.0528 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.75 +7 0.5 0.5 +4 0.5 0.5 +0 0.5 0.75 +SURF 0x0 +mat 4 +refs 4 +6 0 0.5 +2 9.31321e-008 0.75 +1 9.31321e-008 0.75 +5 0 0.5 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.5 +3 0.5 0.75 +2 9.31321e-008 0.75 +6 0 0.5 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.5 +6 0 0.5 +5 0 0.5 +4 0.5 0.5 +kids 0 +OBJECT poly +name "FuelModeBtn1F" +loc 0.000175806 0.10305 -0.04135 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0364 0.0314 +-0.01 -0.0364 0.0514 +-0.007 -0.0364 0.0514 +-0.007 -0.0364 0.0314 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +7 0.5 0.25 +4 0.5 0.25 +0 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +6 0 0.25 +2 9.31321e-008 0.5 +1 9.31321e-008 0.5 +5 0 0.25 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.25 +3 0.5 0.5 +2 9.31321e-008 0.5 +6 0 0.25 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +0 0.5 0.5 +1 9.31321e-008 0.5 +2 9.31321e-008 0.5 +kids 0 +OBJECT poly +name "FuelModeBtn2O" +loc 0.000175806 0.10305 -0.04135 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +-0.01 -0.0564 0.0314 +-0.01 -0.0564 0.0514 +-0.007 -0.0564 0.0514 +-0.007 -0.0564 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.25 +7 0.5 0 +4 0.5 0 +0 0.5 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0 1.19209e-007 +2 9.31321e-008 0.25 +1 9.31321e-008 0.25 +5 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +3 0.5 0.25 +2 9.31321e-008 0.25 +6 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +6 0 1.19209e-007 +5 0 1.19209e-007 +4 0.5 0 +kids 0 +OBJECT poly +name "CFuelTank2Btn1F" +loc 0.000175806 0.10295 -0.0731498 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +-0.007 -0.0364 0.0314 +-0.007 -0.0364 0.0514 +-0.01 -0.0364 0.0514 +-0.01 -0.0364 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +7 0.5 0.5 +6 9.31321e-008 0.5 +5 9.31321e-008 0.5 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0.25 +4 0.5 0.5 +5 9.31321e-008 0.5 +1 0 0.25 +SURF 0x0 +mat 4 +refs 4 +1 0 0.25 +5 9.31321e-008 0.5 +6 9.31321e-008 0.5 +2 0 0.25 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +0 0.5 0.25 +3 0.5 0.25 +7 0.5 0.5 +kids 0 +OBJECT poly +name "CFuelTank2Btn2O" +loc 0.000175806 0.10295 -0.0731498 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0564 0.0314 +-0.007 -0.0564 0.0514 +-0.01 -0.0564 0.0514 +-0.01 -0.0564 0.0314 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +1 0 1.19209e-007 +2 0 1.19209e-007 +3 0.5 0 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +4 0.5 0.25 +5 9.31321e-008 0.25 +1 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +1 0 1.19209e-007 +5 9.31321e-008 0.25 +6 9.31321e-008 0.25 +2 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.25 +0 0.5 0 +3 0.5 0 +7 0.5 0.25 +kids 0 +OBJECT poly +name "CFuelTank1Btn1F" +loc 0.000175806 0.10295 -0.01055 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0364 0.0314 +-0.01 -0.0364 0.0514 +-0.007 -0.0364 0.0514 +-0.007 -0.0364 0.0314 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +7 0.5 0.25 +4 0.5 0.25 +0 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +6 0 0.25 +2 9.31321e-008 0.5 +1 9.31321e-008 0.5 +5 0 0.25 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.25 +3 0.5 0.5 +2 9.31321e-008 0.5 +6 0 0.25 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +0 0.5 0.5 +1 9.31321e-008 0.5 +2 9.31321e-008 0.5 +kids 0 +OBJECT poly +name "CFuelTank1Btn2O" +loc 0.000175806 0.10295 -0.01055 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +-0.01 -0.0564 0.0314 +-0.01 -0.0564 0.0514 +-0.007 -0.0564 0.0514 +-0.007 -0.0564 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.25 +7 0.5 0 +4 0.5 0 +0 0.5 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0 1.19209e-007 +2 9.31321e-008 0.25 +1 9.31321e-008 0.25 +5 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +3 0.5 0.25 +2 9.31321e-008 0.25 +6 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +6 0 1.19209e-007 +5 0 1.19209e-007 +4 0.5 0 +kids 0 +OBJECT poly +name "RFuelTank2Btn1F" +loc 0.000175806 0.10295 -0.15645 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +-0.007 -0.0364 0.0314 +-0.007 -0.0364 0.0514 +-0.01 -0.0364 0.0514 +-0.01 -0.0364 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +7 0.5 0.5 +6 9.31321e-008 0.5 +5 9.31321e-008 0.5 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0.25 +4 0.5 0.5 +5 9.31321e-008 0.5 +1 0 0.25 +SURF 0x0 +mat 4 +refs 4 +1 0 0.25 +5 9.31321e-008 0.5 +6 9.31321e-008 0.5 +2 0 0.25 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +0 0.5 0.25 +3 0.5 0.25 +7 0.5 0.5 +kids 0 +OBJECT poly +name "RFuelTank2Btn2O" +loc 0.000175806 0.10295 -0.15645 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0564 0.0314 +-0.007 -0.0564 0.0514 +-0.01 -0.0564 0.0514 +-0.01 -0.0564 0.0314 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +1 0 1.19209e-007 +2 0 1.19209e-007 +3 0.5 0 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +4 0.5 0.25 +5 9.31321e-008 0.25 +1 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +1 0 1.19209e-007 +5 9.31321e-008 0.25 +6 9.31321e-008 0.25 +2 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.25 +0 0.5 0 +3 0.5 0 +7 0.5 0.25 +kids 0 +OBJECT poly +name "RFuelTank1Btn1F" +loc 0.000175806 0.10295 -0.12565 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0364 0.0314 +-0.01 -0.0364 0.0514 +-0.007 -0.0364 0.0514 +-0.007 -0.0364 0.0314 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +7 0.5 0.25 +4 0.5 0.25 +0 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +6 0 0.25 +2 9.31321e-008 0.5 +1 9.31321e-008 0.5 +5 0 0.25 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.25 +3 0.5 0.5 +2 9.31321e-008 0.5 +6 0 0.25 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +0 0.5 0.5 +1 9.31321e-008 0.5 +2 9.31321e-008 0.5 +kids 0 +OBJECT poly +name "RFuelTank1Btn2O" +loc 0.000175806 0.10295 -0.12565 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +-0.01 -0.0564 0.0314 +-0.01 -0.0564 0.0514 +-0.007 -0.0564 0.0514 +-0.007 -0.0564 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.25 +7 0.5 0 +4 0.5 0 +0 0.5 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0 1.19209e-007 +2 9.31321e-008 0.25 +1 9.31321e-008 0.25 +5 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +3 0.5 0.25 +2 9.31321e-008 0.25 +6 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +6 0 1.19209e-007 +5 0 1.19209e-007 +4 0.5 0 +kids 0 +OBJECT poly +name "LFuelTank2Btn1F" +loc 0.000175806 0.10295 0.04485 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0364 0.0314 +-0.01 -0.0364 0.0514 +-0.007 -0.0364 0.0514 +-0.007 -0.0364 0.0314 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +7 0.5 0.25 +4 0.5 0.25 +0 0.5 0.5 +SURF 0x0 +mat 4 +refs 4 +6 0 0.25 +2 9.31321e-008 0.5 +1 9.31321e-008 0.5 +5 0 0.25 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0.25 +3 0.5 0.5 +2 9.31321e-008 0.5 +6 0 0.25 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.5 +0 0.5 0.5 +1 9.31321e-008 0.5 +2 9.31321e-008 0.5 +kids 0 +OBJECT poly +name "LFuelTank2Btn2O" +loc 0.000175806 0.10295 0.04485 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.01 -0.0464 0.0314 +-0.01 -0.0464 0.0514 +-0.007 -0.0464 0.0514 +-0.007 -0.0464 0.0314 +-0.01 -0.0564 0.0314 +-0.01 -0.0564 0.0514 +-0.007 -0.0564 0.0514 +-0.007 -0.0564 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +3 0.5 0.25 +7 0.5 0 +4 0.5 0 +0 0.5 0.25 +SURF 0x0 +mat 4 +refs 4 +6 0 1.19209e-007 +2 9.31321e-008 0.25 +1 9.31321e-008 0.25 +5 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +3 0.5 0.25 +2 9.31321e-008 0.25 +6 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +7 0.5 0 +6 0 1.19209e-007 +5 0 1.19209e-007 +4 0.5 0 +kids 0 +OBJECT poly +name "LFuelTank1Btn1F" +loc 0.000175806 0.10295 0.0756501 +data 8 +Cube.061 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +-0.007 -0.0364 0.0314 +-0.007 -0.0364 0.0514 +-0.01 -0.0364 0.0514 +-0.01 -0.0364 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +7 0.5 0.5 +6 9.31321e-008 0.5 +5 9.31321e-008 0.5 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0.25 +4 0.5 0.5 +5 9.31321e-008 0.5 +1 0 0.25 +SURF 0x0 +mat 4 +refs 4 +1 0 0.25 +5 9.31321e-008 0.5 +6 9.31321e-008 0.5 +2 0 0.25 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.5 +0 0.5 0.25 +3 0.5 0.25 +7 0.5 0.5 +kids 0 +OBJECT poly +name "LFuelTank1Btn2O" +loc 0.000175806 0.10295 0.0756501 +data 8 +Cube.062 +texture "buttons2.png" +crease 30.000000 +numvert 8 +-0.007 -0.0564 0.0314 +-0.007 -0.0564 0.0514 +-0.01 -0.0564 0.0514 +-0.01 -0.0564 0.0314 +-0.007 -0.0464 0.0314 +-0.007 -0.0464 0.0514 +-0.01 -0.0464 0.0514 +-0.01 -0.0464 0.0314 +numsurf 4 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +1 0 1.19209e-007 +2 0 1.19209e-007 +3 0.5 0 +SURF 0x0 +mat 4 +refs 4 +0 0.5 0 +4 0.5 0.25 +5 9.31321e-008 0.25 +1 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +1 0 1.19209e-007 +5 9.31321e-008 0.25 +6 9.31321e-008 0.25 +2 0 1.19209e-007 +SURF 0x0 +mat 4 +refs 4 +4 0.5 0.25 +0 0.5 0 +3 0.5 0 +7 0.5 0.25 +kids 0 OBJECT poly name "YellowElecPump1F" loc 0.000175806 0.17375 -0.17645 @@ -4726,393 +5416,25 @@ refs 3 8 0.731415 0 kids 0 OBJECT poly -name "inrL1" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.118 -texture "buttons.png" -crease 30.000000 -numvert 8 -0.005631 -0.0904 0.289928 -0.008112 -0.0904 0.309773 -0.011089 -0.0904 0.309401 -0.008608 -0.0904 0.289556 -0.005631 -0.0804 0.289928 -0.008112 -0.0804 0.309773 -0.011089 -0.0804 0.309401 -0.008608 -0.0804 0.289556 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.25 -4 0.5 0.5 -7 0.5 0.5 -3 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -2 0 0.25 -6 9.31321e-008 0.5 -5 9.31321e-008 0.5 -1 0 0.25 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0.5 -6 9.31321e-008 0.5 -2 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -4 0.5 0.5 -5 9.31321e-008 0.5 -6 9.31321e-008 0.5 -kids 0 -OBJECT poly -name "inrL2" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.117 -texture "buttons.png" -crease 30.000000 -numvert 8 -0.008608 -0.1004 0.289556 -0.011089 -0.1004 0.309401 -0.008112 -0.1004 0.309773 -0.005631 -0.1004 0.289928 -0.008608 -0.0904 0.289556 -0.011089 -0.0904 0.309401 -0.008112 -0.0904 0.309773 -0.005631 -0.0904 0.289928 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly -name "fueldumpACT1" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.123 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.006909 -0.0904 0.189608 --0.004428 -0.0904 0.209454 --0.001451 -0.0904 0.209082 --0.003932 -0.0904 0.189236 --0.006909 -0.0804 0.189608 --0.004428 -0.0804 0.209454 --0.001451 -0.0804 0.209082 --0.003932 -0.0804 0.189236 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.25 -4 0.5 0.5 -7 0.5 0.5 -3 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -2 0 0.25 -6 9.31321e-008 0.5 -5 9.31321e-008 0.5 -1 0 0.25 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0.5 -6 9.31321e-008 0.5 -2 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -4 0.5 0.5 -5 9.31321e-008 0.5 -6 9.31321e-008 0.5 -kids 0 -OBJECT poly -name "fueldumpACT2" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.124 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.003932 -0.1004 0.189236 --0.001451 -0.1004 0.209082 --0.004428 -0.1004 0.209454 --0.006909 -0.1004 0.189608 --0.003932 -0.0904 0.189236 --0.001451 -0.0904 0.209082 --0.004428 -0.0904 0.209454 --0.006909 -0.0904 0.189608 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly -name "fueldumpARM1" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.122 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.002692 -0.0904 0.223346 --0.000210999 -0.0904 0.243192 -0.002766 -0.0904 0.242819 -0.000285 -0.0904 0.222974 --0.002692 -0.0804 0.223346 --0.000210999 -0.0804 0.243192 -0.002766 -0.0804 0.242819 -0.000285 -0.0804 0.222974 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.25 -4 0.5 0.5 -7 0.5 0.5 -3 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -2 0 0.25 -6 9.31321e-008 0.5 -5 9.31321e-008 0.5 -1 0 0.25 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0.5 -6 9.31321e-008 0.5 -2 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -4 0.5 0.5 -5 9.31321e-008 0.5 -6 9.31321e-008 0.5 -kids 0 -OBJECT poly -name "fueldumpARM2" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.121 -texture "buttons.png" -crease 30.000000 -numvert 8 -0.000285 -0.1004 0.222974 -0.002766 -0.1004 0.242819 --0.000210999 -0.1004 0.243192 --0.002692 -0.1004 0.223346 -0.000285 -0.0904 0.222974 -0.002766 -0.0904 0.242819 --0.000210999 -0.0904 0.243192 --0.002692 -0.0904 0.223346 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly -name "inrR1" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.119 -texture "buttons.png" -crease 30.000000 -numvert 8 -0.00155 -0.0904 0.257282 -0.004031 -0.0904 0.277127 -0.007008 -0.0904 0.276755 -0.004527 -0.0904 0.25691 -0.00155 -0.0804 0.257282 -0.004031 -0.0804 0.277127 -0.007008 -0.0804 0.276755 -0.004527 -0.0804 0.25691 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.25 -4 0.5 0.5 -7 0.5 0.5 -3 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -2 0 0.25 -6 9.31321e-008 0.5 -5 9.31321e-008 0.5 -1 0 0.25 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0.5 -6 9.31321e-008 0.5 -2 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -4 0.5 0.5 -5 9.31321e-008 0.5 -6 9.31321e-008 0.5 -kids 0 -OBJECT poly -name "inrR2" -loc 0.000113685 0.04095 -4.99785e-005 -data 8 -Cube.120 -texture "buttons.png" -crease 30.000000 -numvert 8 -0.004527 -0.1004 0.25691 -0.007008 -0.1004 0.276755 -0.004031 -0.1004 0.277127 -0.00155 -0.1004 0.257282 -0.004527 -0.0904 0.25691 -0.007008 -0.0904 0.276755 -0.004031 -0.0904 0.277127 -0.00155 -0.0904 0.257282 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -1 0 0.5 -2 0 0.5 -3 0.5 0.5 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -4 0.5 0.75 -5 9.31321e-008 0.75 -1 0 0.5 -SURF 0x0 -mat 4 -refs 4 -1 0 0.5 -5 9.31321e-008 0.75 -6 9.31321e-008 0.75 -2 0 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.75 -0 0.5 0.5 -3 0.5 0.5 -7 0.5 0.75 -kids 0 -OBJECT poly name "EmerGenInd" -loc 0.0607605 0.0978181 -0.488893 +loc -0.000931718 -0.0066696 -0.00709561 data 8 Cube.128 texture "buttons.png" crease 30.000000 numvert 12 --0.0538928 -0.0302 0.218306 --0.0562867 -0.0302 0.238162 --0.0592652 -0.0302 0.237803 --0.0568714 -0.0302 0.217946 --0.0538928 -0.0502 0.218306 --0.0562867 -0.0502 0.238162 --0.0592652 -0.0502 0.237803 --0.0568714 -0.0502 0.217946 --0.0538928 -0.0402 0.218306 --0.0562867 -0.0402 0.238162 --0.0592652 -0.0402 0.237803 --0.0568714 -0.0402 0.217946 +0.000521041 -0.0302 0.224859 +0.00300186 -0.0302 0.244705 +2.49837e-005 -0.0302 0.245077 +-0.00245617 -0.0302 0.225231 +0.000521041 -0.0502 0.224859 +0.00300186 -0.0502 0.244705 +2.49837e-005 -0.0502 0.245077 +-0.00245617 -0.0502 0.225231 +0.000521041 -0.0402 0.224859 +0.00300186 -0.0402 0.244705 +2.49837e-005 -0.0402 0.245077 +-0.00245617 -0.0402 0.225231 numsurf 8 SURF 0x0 mat 4 @@ -5173,23 +5495,23 @@ refs 4 kids 0 OBJECT poly name "EmerGenTstBtn" -loc 0.0607605 0.0978181 -0.488893 +loc -0.000931718 -0.0066696 -0.00709561 data 8 Cube.126 crease 30.000000 numvert 12 --0.0616976 -0.0228 0.283037 --0.0640913 -0.0228 0.302893 --0.0670698 -0.0228 0.302534 --0.0646762 -0.0228 0.282678 --0.0616976 -0.05 0.283037 --0.0640913 -0.05 0.302893 --0.0670698 -0.05 0.302534 --0.0646762 -0.05 0.282678 --0.0616976 -0.0364 0.283037 --0.0640913 -0.0364 0.302893 --0.0670698 -0.0364 0.302534 --0.0646762 -0.0364 0.282678 +0.00860794 -0.0228 0.289556 +0.0110889 -0.0228 0.309401 +0.00811206 -0.0228 0.309773 +0.00563095 -0.0228 0.289928 +0.00860794 -0.05 0.289556 +0.0110889 -0.05 0.309401 +0.00811206 -0.05 0.309773 +0.00563095 -0.05 0.289928 +0.00860794 -0.0364 0.289556 +0.0110889 -0.0364 0.309401 +0.00811206 -0.0364 0.309773 +0.00563095 -0.0364 0.289928 numsurf 8 SURF 0x20 mat 2 @@ -5250,24 +5572,24 @@ refs 4 kids 0 OBJECT poly name "EvacBtn" -loc 0.0607605 0.0978181 -0.488893 +loc 0.00109995 -0.00353075 0.00075604 data 8 Cube.129 texture "buttons.png" crease 30.000000 numvert 12 --0.0578793 0.0248 0.251366 --0.0602732 0.0248 0.271223 --0.0632517 0.0248 0.270864 --0.0608579 0.0248 0.251007 --0.0578793 0.00479999 0.251366 --0.0602732 0.00479999 0.271223 --0.0632517 0.00480001 0.270864 --0.0608579 0.00479999 0.251007 --0.0578793 0.0148 0.251366 --0.0602732 0.0148 0.271223 --0.0632517 0.0148 0.270864 --0.0608579 0.0148 0.251007 +0.00465087 0.0248 0.257901 +0.00713193 0.0248 0.277748 +0.00415508 0.0248 0.27812 +0.00167391 0.0248 0.258274 +0.00465087 0.00479999 0.257901 +0.00713193 0.00479999 0.277748 +0.00415508 0.00480001 0.27812 +0.00167391 0.00479999 0.258274 +0.00465087 0.0148 0.257901 +0.00713193 0.0148 0.277748 +0.00415508 0.0148 0.27812 +0.00167391 0.0148 0.258274 numsurf 8 SURF 0x0 mat 4 @@ -5328,48 +5650,48 @@ refs 4 kids 0 OBJECT poly name "EvacCapt-Purs" -loc 0.0607605 0.0978181 -0.488893 +loc 0.00109995 -0.00353075 0.00075604 data 12 Cylinder.021 crease 30.000000 numvert 37 --0.0525735 0.010259 0.183972 --0.0525735 0.014141 0.183972 --0.0528059 0.017503 0.1859 --0.0532083 0.019444 0.189238 --0.0536735 0.019444 0.193092 --0.0540759 0.017503 0.19643 --0.054308 0.014141 0.198357 --0.054308 0.010259 0.198357 --0.0540759 0.006897 0.19643 --0.0536735 0.004956 0.193092 --0.0532083 0.004956 0.189238 --0.0528059 0.006897 0.1859 --0.0530915 0.00928301 0.188269 --0.0533133 0.00821599 0.190105 --0.0535685 0.00821599 0.192224 --0.0537902 0.00928301 0.19406 --0.0539176 0.011132 0.195121 --0.0539176 0.013268 0.195121 --0.0537902 0.015117 0.19406 --0.0535685 0.016184 0.192224 --0.0533133 0.016184 0.190105 --0.0530915 0.015117 0.188269 --0.0529642 0.013268 0.187209 --0.0529642 0.011132 0.187209 --0.0514553 0.0122 0.191404 --0.0509781 0.011132 0.187448 --0.0509781 0.013268 0.187448 --0.0511065 0.015117 0.188509 --0.0513272 0.016184 0.190345 --0.0515825 0.016184 0.192464 --0.0518042 0.015117 0.1943 --0.0519326 0.013268 0.19536 --0.0519326 0.011132 0.19536 --0.0518042 0.00928301 0.1943 --0.0515825 0.00821602 0.192464 --0.0513272 0.00821599 0.190345 --0.0511065 0.00928301 0.188509 +-0.006505 0.010259 0.191226 +-0.006505 0.014141 0.191226 +-0.00626407 0.017503 0.193153 +-0.00584698 0.019444 0.196489 +-0.005366 0.019444 0.200341 +-0.00494891 0.017503 0.203677 +-0.00470792 0.014141 0.205603 +-0.00470792 0.010259 0.205603 +-0.00494891 0.006897 0.203677 +-0.005366 0.004956 0.200341 +-0.00584698 0.004956 0.196489 +-0.00626407 0.006897 0.193153 +-0.00596808 0.00928301 0.19552 +-0.00573912 0.00821599 0.197356 +-0.00547411 0.00821599 0.199473 +-0.00524505 0.00928301 0.201309 +-0.00511199 0.011132 0.202369 +-0.00511199 0.013268 0.202369 +-0.00524505 0.015117 0.201309 +-0.00547411 0.016184 0.199473 +-0.00573912 0.016184 0.197356 +-0.00596808 0.015117 0.19552 +-0.00610099 0.013268 0.194461 +-0.00610099 0.011132 0.194461 +-0.00362205 0.0122 0.198167 +-0.00411607 0.011132 0.194213 +-0.00411607 0.013268 0.194213 +-0.00398397 0.015117 0.195273 +-0.00375395 0.016184 0.197108 +-0.00348904 0.016184 0.199226 +-0.00325997 0.015117 0.201061 +-0.00312812 0.013268 0.202121 +-0.00312812 0.011132 0.202121 +-0.00325997 0.00928301 0.201061 +-0.00348904 0.00821602 0.199226 +-0.00375395 0.00821599 0.197108 +-0.00398397 0.00928301 0.195273 numsurf 36 SURF 0x20 mat 1 @@ -5614,48 +5936,48 @@ refs 3 kids 0 OBJECT poly name "EvacHornOff" -loc 0.0607605 0.0978181 -0.488893 +loc 0.00109995 -0.00353075 0.00075604 data 12 Cylinder.020 crease 30.000000 numvert 37 --0.0567748 0.010259 0.21882 --0.0567748 0.014141 0.21882 --0.0570081 0.017503 0.220748 --0.0574105 0.019444 0.224085 --0.0578747 0.019444 0.22794 --0.0582772 0.017503 0.231277 --0.0585092 0.014141 0.233204 --0.0585092 0.010259 0.233204 --0.0582772 0.006897 0.231277 --0.0578747 0.00495601 0.22794 --0.0574105 0.004956 0.224085 --0.0570081 0.00689702 0.220748 --0.0572937 0.00928301 0.223117 --0.0575145 0.00821599 0.224953 --0.0577698 0.00821599 0.227072 --0.0579915 0.00928301 0.228908 --0.0581198 0.011132 0.229969 --0.0581198 0.013268 0.229969 --0.0579915 0.015117 0.228908 --0.0577698 0.016184 0.227072 --0.0575145 0.016184 0.224953 --0.0572937 0.015117 0.223117 --0.0571654 0.013268 0.222056 --0.0571654 0.011132 0.222056 --0.0556566 0.0122 0.226252 --0.0551793 0.011132 0.222296 --0.0551793 0.013268 0.222296 --0.0553077 0.015117 0.223357 --0.0555292 0.016184 0.225191 --0.0557847 0.016184 0.227312 --0.0560054 0.015117 0.229148 --0.0561338 0.013268 0.230208 --0.0561338 0.011132 0.230208 --0.0560054 0.00928301 0.229148 --0.0557847 0.00821602 0.227312 --0.0555292 0.00821602 0.225191 --0.0553077 0.00928301 0.223357 +-0.00215101 0.010259 0.226055 +-0.00215101 0.014141 0.226055 +-0.00191095 0.017503 0.227982 +-0.00149411 0.019444 0.231317 +-0.00101191 0.019444 0.23517 +-0.000595162 0.017503 0.238505 +-0.000354083 0.014141 0.240431 +-0.000354083 0.010259 0.240431 +-0.000595162 0.006897 0.238505 +-0.00101191 0.00495601 0.23517 +-0.00149411 0.004956 0.231317 +-0.00191095 0.00689702 0.227982 +-0.00161496 0.00928301 0.23035 +-0.00138503 0.00821599 0.232185 +-0.00112011 0.00821599 0.234303 +-0.000891056 0.00928301 0.236138 +-0.000758873 0.011132 0.237198 +-0.000758873 0.013268 0.237198 +-0.000891056 0.015117 0.236138 +-0.00112011 0.016184 0.234303 +-0.00138503 0.016184 0.232185 +-0.00161496 0.015117 0.23035 +-0.00174714 0.013268 0.229289 +-0.00174714 0.011132 0.229289 +0.000731938 0.0122 0.232996 +0.000238018 0.011132 0.229042 +0.000238018 0.013268 0.229042 +0.000370115 0.015117 0.230102 +0.000598874 0.016184 0.231936 +0.000864081 0.016184 0.234055 +0.0010941 0.015117 0.23589 +0.00122595 0.013268 0.23695 +0.00122595 0.011132 0.23695 +0.0010941 0.00928301 0.23589 +0.000864081 0.00821602 0.234055 +0.000598874 0.00821602 0.231936 +0.000370115 0.00928301 0.230102 numsurf 36 SURF 0x20 mat 1 @@ -5900,24 +6222,24 @@ refs 3 kids 0 OBJECT poly name "Gen1LineBtn" -loc 0.0607605 0.0978181 -0.488893 +loc -0.000931718 -0.0066696 -0.00709561 data 8 Cube.127 texture "buttons.png" crease 30.000000 numvert 12 --0.0576759 -0.0302 0.249678 --0.0600698 -0.0302 0.269535 --0.0630483 -0.0302 0.269176 --0.0606535 -0.0302 0.249319 --0.0576759 -0.0502 0.249678 --0.0600698 -0.0502 0.269535 --0.0630483 -0.0502 0.269176 --0.0606535 -0.0502 0.249319 --0.0576759 -0.0402 0.249678 --0.0600698 -0.0402 0.269535 --0.0630483 -0.0402 0.269176 --0.0606535 -0.0402 0.249319 +0.0044399 -0.0302 0.256215 +0.00692095 -0.0302 0.276061 +0.00394408 -0.0302 0.276433 +0.00146389 -0.0302 0.256587 +0.0044399 -0.0502 0.256215 +0.00692095 -0.0502 0.276061 +0.00394408 -0.0502 0.276433 +0.00146389 -0.0502 0.256587 +0.0044399 -0.0402 0.256215 +0.00692095 -0.0402 0.276061 +0.00394408 -0.0402 0.276433 +0.00146389 -0.0402 0.256587 numsurf 8 SURF 0x0 mat 4 @@ -5978,23 +6300,23 @@ refs 4 kids 0 OBJECT poly name "RATBtn" -loc 0.0607605 0.0978181 -0.488893 +loc -0.000931718 -0.0066696 -0.00709561 data 8 Cube.125 crease 30.000000 numvert 12 --0.0508405 -0.0228 0.192989 --0.0532344 -0.0228 0.212846 --0.0562129 -0.0228 0.212487 --0.0538191 -0.0228 0.19263 --0.0508405 -0.05 0.192989 --0.0532344 -0.05 0.212846 --0.0562129 -0.05 0.212487 --0.0538191 -0.05 0.19263 --0.0508405 -0.0364 0.192989 --0.0532344 -0.0364 0.212846 --0.0562129 -0.0364 0.212487 --0.0538191 -0.0364 0.19263 +-0.00264205 -0.0228 0.199556 +-0.000161003 -0.0228 0.219402 +-0.00313788 -0.0228 0.219774 +-0.00561903 -0.0228 0.199928 +-0.00264205 -0.05 0.199556 +-0.000161003 -0.05 0.219402 +-0.00313788 -0.05 0.219774 +-0.00561903 -0.05 0.199928 +-0.00264205 -0.0364 0.199556 +-0.000161003 -0.0364 0.219402 +-0.00313788 -0.0364 0.219774 +-0.00561903 -0.0364 0.199928 numsurf 8 SURF 0x20 mat 2 @@ -13670,7 +13992,7 @@ refs 4 kids 0 OBJECT poly name "ELAC2Btn1" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.104 texture "buttons.png" @@ -13716,7 +14038,7 @@ refs 4 kids 0 OBJECT poly name "ELAC2Btn2" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.105 texture "buttons.png" @@ -26853,7 +27175,7 @@ refs 4 kids 0 OBJECT poly name "PAC2Btn1" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.111 texture "buttons.png" @@ -26899,7 +27221,7 @@ refs 4 kids 0 OBJECT poly name "PAC2Btn2" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.110 texture "buttons.png" @@ -29039,7 +29361,7 @@ refs 4 kids 0 OBJECT poly name "SEC2Btn1" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.107 texture "buttons.png" @@ -29085,7 +29407,7 @@ refs 4 kids 0 OBJECT poly name "SEC2Btn2" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.106 texture "buttons.png" @@ -29131,7 +29453,7 @@ refs 4 kids 0 OBJECT poly name "SEC3Btn1" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.108 texture "buttons.png" @@ -29177,7 +29499,7 @@ refs 4 kids 0 OBJECT poly name "SEC3Btn2" -loc 0.000113685 -5.00064e-005 -4.99785e-005 +loc 0.000113685 0.0284367 -4.99785e-005 data 8 Cube.109 texture "buttons.png" diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index e03fe859..72669794 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -1,4 +1,5 @@ -# Electrical system for A320 by Joshua Davidson (it0uchpods) and Johnathan Redpath (legoboyvdlp). +# A3XX Electrical System +# Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) ############# # Init Vars # @@ -9,7 +10,9 @@ var ac_volt_min = 110; var dc_volt_std = 28; var dc_volt_min = 25; var dc_amps_std = 150; +var dc_amps_std = 130; var ac_hz_std = 400; +var ac_hz_std = 300; var elec_init = func { setprop("/controls/switches/annun-test", 0); diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas new file mode 100644 index 00000000..d4cba1ce --- /dev/null +++ b/Nasal/fuel.nas @@ -0,0 +1,109 @@ +# A3XX Fuel System +# Joshua Davidson (it0uchpods) + +############# +# Init Vars # +############# + +var fuel_init = func { + setprop("/controls/fuel/x-feed", 0); + setprop("/controls/fuel/tank2pump1", 0); + setprop("/controls/fuel/tank2pump2", 0); + setprop("/controls/fuel/tank3pump1", 0); + setprop("/controls/fuel/tank3pump2", 0); + setprop("/controls/fuel/tank4pump1", 0); + setprop("/controls/fuel/tank4pump2", 0); + setprop("/controls/fuel/mode", 1); + setprop("/systems/fuel/x-feed", 0); + setprop("/systems/fuel/tank[2]/feed0", 0); + setprop("/systems/fuel/tank[2]/feed1", 0); + setprop("/systems/fuel/tank[3]/feed0", 0); + setprop("/systems/fuel/tank[3]/feed1", 0); + setprop("/systems/fuel/tank[4]/feed0", 0); + setprop("/systems/fuel/tank[4]/feed1", 0); + setprop("/systems/fuel/only-use-ctr-tank", 0); + fuel_timer.start(); +} + +############## +# Main Loops # +############## +var master_fuel = func { + var xfeed_sw = getprop("/controls/fuel/x-feed"); + var tank2pump1_sw = getprop("/controls/fuel/tank2pump1"); + var tank2pump2_sw = getprop("/controls/fuel/tank2pump2"); + var tank3pump1_sw = getprop("/controls/fuel/tank3pump1"); + var tank3pump2_sw = getprop("/controls/fuel/tank3pump2"); + var tank4pump1_sw = getprop("/controls/fuel/tank4pump1"); + var tank4pump2_sw = getprop("/controls/fuel/tank4pump2"); + var mode_sw = getprop("/controls/fuel/mode"); + var xfeed = getprop("/systems/fuel/x-feed"); + var ac1 = getprop("/systems/electrical/bus/ac1"); + var ac2 = getprop("/systems/electrical/bus/ac2"); + + if ((ac1 >= 110 or ac2 >= 110) and tank2pump1_sw) { + setprop("/systems/fuel/tank[2]/feed0", 1); + } else { + setprop("/systems/fuel/tank[2]/feed0", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank2pump2_sw) { + setprop("/systems/fuel/tank[2]/feed1", 1); + } else { + setprop("/systems/fuel/tank[2]/feed1", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank3pump1_sw) { + setprop("/systems/fuel/tank[3]/feed0", 1); + } else { + setprop("/systems/fuel/tank[3]/feed0", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank3pump2_sw) { + setprop("/systems/fuel/tank[3]/feed1", 1); + } else { + setprop("/systems/fuel/tank[3]/feed1", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank4pump1_sw) { + setprop("/systems/fuel/tank[4]/feed0", 1); + } else { + setprop("/systems/fuel/tank[4]/feed0", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and tank4pump2_sw) { + setprop("/systems/fuel/tank[4]/feed1", 1); + } else { + setprop("/systems/fuel/tank[4]/feed1", 0); + } + + if ((ac1 >= 110 or ac2 >= 110) and xfeed_sw) { + setprop("/systems/fuel/x-feed", 1); + } else { + setprop("/systems/fuel/x-feed", 0); + } + + var tank2feed0 = getprop("/systems/fuel/tank[2]/feed0"); + var tank2feed1 = getprop("/systems/fuel/tank[2]/feed1"); + var tank3feed0 = getprop("/systems/fuel/tank[3]/feed0"); + var tank3feed1 = getprop("/systems/fuel/tank[3]/feed1"); + var tank4feed0 = getprop("/systems/fuel/tank[4]/feed0"); + var tank4feed1 = getprop("/systems/fuel/tank[4]/feed1"); + + if ((getprop("/fdm/jsbsim/propulsion/tank[3]/contents-lbs") >= 50) and tank3feed0 and tank3feed1) { + setprop("/systems/fuel/only-use-ctr-tank", 1); + } else { + setprop("/systems/fuel/only-use-ctr-tank", 0); + } +} + +################### +# Update Function # +################### + +var update_fuel = func { + master_fuel(); +} + +var fuel_timer = maketimer(0.2, update_fuel); + diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index be9f6eac..09a111ce 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -162,6 +162,7 @@ setlistener("/sim/signals/fdm-initialized", func { systems.pneu_init(); systems.hyd_init(); systems.press_init(); + systems.fuel_init(); fmgc.APinit(); librariesLoop.start(); fmgc.FMGCinit(); diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index 601ad645..a1e1f11a 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -1,4 +1,4 @@ -# A320 Pneumatics System +# A3XX Pneumatics System # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) ############# diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index 27de7ed1..9db13aaa 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -702,5 +702,56 @@ + + RelayBatt1 + once + Aircraft/A320Family/Sounds/Cockpit/relay2.wav + + + /systems/electrical/battery1-amps + 25 + + + + 0.60 + + + + + RelayBatt2 + once + Aircraft/A320Family/Sounds/Cockpit/relay2.wav + + + /systems/electrical/battery2-amps + 25 + + + + 0.60 + + + + + RelayEXT + once + Aircraft/A320Family/Sounds/Cockpit/relay1.wav + + + + /controls/switches/cart + 1 + + + /controls/electrical/switches/gen-ext + 1 + + + + + 0.60 + + + \ No newline at end of file diff --git a/Sounds/Cockpit/relay1.wav b/Sounds/Cockpit/relay1.wav new file mode 100644 index 00000000..8160e9eb Binary files /dev/null and b/Sounds/Cockpit/relay1.wav differ diff --git a/Sounds/Cockpit/relay2.wav b/Sounds/Cockpit/relay2.wav new file mode 100644 index 00000000..2ec25115 Binary files /dev/null and b/Sounds/Cockpit/relay2.wav differ diff --git a/Sounds/Cockpit/relay3.wav b/Sounds/Cockpit/relay3.wav new file mode 100644 index 00000000..8cf79e27 Binary files /dev/null and b/Sounds/Cockpit/relay3.wav differ diff --git a/Systems/fuel.xml b/Systems/fuel.xml new file mode 100644 index 00000000..697cca63 --- /dev/null +++ b/Systems/fuel.xml @@ -0,0 +1,191 @@ + + + + + + + + propulsion/tank[7]/external-flow-rate/jettison + propulsion/tank[8]/external-flow-rate/jettison + /systems/fuel/x-feed + + + + + + /systems/fuel/x-feed == 1 + propulsion/tank[7]/contents-lbs gt propulsion/tank[8]/contents-lbs + propulsion/tank[7]/contents-lbs gt 0 + propulsion/tank[8]/contents-lbs lt 100 + + + + + + /systems/fuel/x-feed == 1 + propulsion/tank[8]/contents-lbs gt propulsion/tank[7]/contents-lbs + propulsion/tank[8]/contents-lbs gt 0 + propulsion/tank[7]/contents-lbs lt 100 + + + + + + + /systems/fuel/only-use-ctr-tank == 0 + propulsion/tank[1]/contents-lbs gt 0 + propulsion/tank[2]/contents-lbs lt 1650 + + + + + + + /systems/fuel/only-use-ctr-tank == 0 + propulsion/tank[5]/contents-lbs gt 0 + propulsion/tank[4]/contents-lbs lt 1650 + + + + + + + /systems/fuel/only-use-ctr-tank == 0 + /systems/fuel/tank[2]/feed0 == 1 + propulsion/tank[2]/contents-lbs gt 0 + propulsion/tank[7]/contents-lbs lt 90 + + + + + + + /systems/fuel/only-use-ctr-tank == 0 + /systems/fuel/tank[2]/feed1 == 1 + propulsion/tank[2]/contents-lbs gt 0 + propulsion/tank[7]/contents-lbs lt 90 + + + + + + + /systems/fuel/only-use-ctr-tank == 0 + /systems/fuel/tank[4]/feed0 == 1 + propulsion/tank[4]/contents-lbs gt 0 + propulsion/tank[8]/contents-lbs lt 90 + + + + + + + /systems/fuel/only-use-ctr-tank == 0 + /systems/fuel/tank[4]/feed1 == 1 + propulsion/tank[4]/contents-lbs gt 0 + propulsion/tank[8]/contents-lbs lt 90 + + + + + + + /systems/fuel/tank[3]/feed0 == 1 + propulsion/tank[3]/contents-lbs gt 0 + propulsion/tank[7]/contents-lbs lt 95 + + + + + + + /systems/fuel/tank[3]/feed1 == 1 + propulsion/tank[3]/contents-lbs gt 0 + propulsion/tank[8]/contents-lbs lt 95 + + + + + + + propulsion/tank[4]/contents-lbs gt propulsion/tank[2]/contents-lbs + propulsion/tank[7]/contents-lbs gt 50 + propulsion/tank[2]/contents-lbs lt 12186 + + + + + + + propulsion/tank[2]/contents-lbs gt propulsion/tank[4]/contents-lbs + propulsion/tank[8]/contents-lbs gt 50 + propulsion/tank[4]/contents-lbs lt 12186 + + + + + -propulsion/tank[7]/external-flow-rate/jettison + -propulsion/tank[7]/external-flow-rate/recirculation + -propulsion/tank[7]/external-flow-rate/x-feed + + propulsion/tank[8]/external-flow-rate/x-feed + propulsion/tank[2]/external-flow-rate/pump[0] + propulsion/tank[2]/external-flow-rate/pump[1] + propulsion/tank[3]/external-flow-rate/pump[0] + + propulsion/tank[7]/external-flow-rate-pps + + + + -propulsion/tank[8]/external-flow-rate/jettison + -propulsion/tank[8]/external-flow-rate/recirculation + -propulsion/tank[8]/external-flow-rate/x-feed + + propulsion/tank[7]/external-flow-rate/x-feed + propulsion/tank[4]/external-flow-rate/pump[0] + propulsion/tank[4]/external-flow-rate/pump[1] + propulsion/tank[3]/external-flow-rate/pump[1] + + propulsion/tank[8]/external-flow-rate-pps + + + + -propulsion/tank[2]/external-flow-rate/pump[0] + -propulsion/tank[2]/external-flow-rate/pump[1] + + propulsion/tank[7]/external-flow-rate/recirculation + propulsion/tank[1]/external-flow-rate/transfer-valve + + propulsion/tank[2]/external-flow-rate-pps + + + + -propulsion/tank[4]/external-flow-rate/pump[0] + -propulsion/tank[4]/external-flow-rate/pump[1] + + propulsion/tank[8]/external-flow-rate/recirculation + propulsion/tank[5]/external-flow-rate/transfer-valve + + propulsion/tank[4]/external-flow-rate-pps + + + + -propulsion/tank[1]/external-flow-rate/transfer-valve + + propulsion/tank[1]/external-flow-rate-pps + + + + -propulsion/tank[5]/external-flow-rate/transfer-valve + + propulsion/tank[5]/external-flow-rate-pps + + + + -propulsion/tank[3]/external-flow-rate/pump[0] + -propulsion/tank[3]/external-flow-rate/pump[1] + + propulsion/tank[3]/external-flow-rate-pps + + +