From 234e87341970b64b1f8b73b26421a72d62bf8cf2 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Fri, 10 Nov 2017 15:42:19 -0400 Subject: [PATCH] Add cargo doors, fix a319 / a318 doors --- Models/Fuselages/A318/fuselage.xml | 12 ++--- Models/Fuselages/A319/fuselage.xml | 12 ++--- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 57 +++++++++++++++----- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/Models/Fuselages/A318/fuselage.xml b/Models/Fuselages/A318/fuselage.xml index 4c9dbd7e..e6dce0a1 100644 --- a/Models/Fuselages/A318/fuselage.xml +++ b/Models/Fuselages/A318/fuselage.xml @@ -154,7 +154,7 @@ nasal @@ -164,7 +164,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.250 @@ -181,7 +181,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.25-0.2 @@ -205,7 +205,7 @@ nasal @@ -215,7 +215,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250 @@ -232,7 +232,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250.2 diff --git a/Models/Fuselages/A319/fuselage.xml b/Models/Fuselages/A319/fuselage.xml index 27ab6070..b0144890 100644 --- a/Models/Fuselages/A319/fuselage.xml +++ b/Models/Fuselages/A319/fuselage.xml @@ -153,7 +153,7 @@ nasal @@ -163,7 +163,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.250 @@ -180,7 +180,7 @@ translate DoorL3 DoorL3int - sim/model/door-positions/doorl3/position-norm + sim/model/door-positions/doorl4/position-norm 00 0.25-0.2 @@ -204,7 +204,7 @@ nasal @@ -214,7 +214,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250 @@ -231,7 +231,7 @@ translate DoorR3 DoorR3int - sim/model/door-positions/doorr3/position-norm + sim/model/door-positions/doorr4/position-norm 00 0.250.2 diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index 8e3db0e7..6e82d23c 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -1157,19 +1157,9 @@ var canvas_lowerECAM_door = { getKeys: func() { return ["TAT","SAT","GW","Bulk","BulkLine","BulkLbl", "Exit1L", "Exit1R", "Cabin1Left", "Cabin1LeftLbl", "Cabin1LeftLine", "Cabin1LeftSlide", "Cabin1Right", "Cabin1RightLbl", "Cabin1RightLine", "Cabin1RightSlide", "Cabin2Left", "Cabin2LeftLbl", "Cabin2LeftLine", "Cabin2LeftSlide", "Cabin2Right", "Cabin2RightLbl", "Cabin2RightLine", "Cabin2RightSlide", "Cabin3Left","Cabin3LeftLbl", "Cabin3LeftLine", "Cabin3LeftSlide", "Cabin3Right", "Cabin3RightLbl", "Cabin3RightLine", "Cabin3RightSlide", "AvionicsLine1", "AvionicsLbl1", "AvionicsLine2", "AvionicsLbl2", - "Cargo1Line", "Cargo1Lbl", "Cargo2Line", "Cargo2Lbl", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; + "Cargo1Line", "Cargo1Lbl", "Cargo1Door", "Cargo2Line", "Cargo2Lbl", "Cargo2Door", "ExitLSlide", "ExitLLine", "ExitLLbl", "ExitRSlide", "ExitRLine", "ExitRLbl", "Cabin4Left", "Cabin4LeftLbl", "Cabin4LeftLine", "Cabin4LeftSlide", "Cabin4Right", "Cabin4RightLbl", "Cabin4RightLine", "Cabin4RightSlide"]; }, update: func() { - # if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { - # me["Bulk"].hide(); - # me["BulkLine"].hide(); - # me["BulkLbl"].hide(); - # } else { - # me["Bulk"].show(); - # me["BulkLine"].show(); - # me["BulkLbl"].show(); - # } - # If you make AirBerlin or Allegiant livery add below if (((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) and (getprop("/sim/model/livery/name") != "easyJet" or getprop("/sim/model/livery/name") != "GermanWings (D-AGWZ)")) { @@ -1300,6 +1290,48 @@ var canvas_lowerECAM_door = { me["Cabin4RightLine"].hide(); } + if ((getprop("/sim/aircraft") == "A319-100-IAE") or (getprop("/sim/aircraft") == "A319-100-CFM")) { + me["Bulk"].hide(); + } else { + me["Bulk"].show(); + } + + if (getprop("/sim/model/door-positions/cargobulk/position-norm") > 0) { + me["Bulk"].setColor(0.7333,0.3803,0); + me["Bulk"].setColorFill(0.7333,0.3803,0); + me["BulkLbl"].show(); + me["BulkLine"].show(); + } else { + me["Bulk"].setColor(0.0509,0.7529,0.2941); + me["Bulk"].setColorFill(0,0,0); + me["BulkLbl"].hide(); + me["BulkLine"].hide(); + } + + if (getprop("/sim/model/door-positions/cargofwd/position-norm") > 0) { + me["Cargo1Door"].setColor(0.7333,0.3803,0); + me["Cargo1Door"].setColorFill(0.7333,0.3803,0); + me["Cargo1Lbl"].show(); + me["Cargo1Line"].show(); + } else { + me["Cargo1Door"].setColor(0.0509,0.7529,0.2941); + me["Cargo1Door"].setColorFill(0,0,0); + me["Cargo1Lbl"].hide(); + me["Cargo1Line"].hide(); + } + + if (getprop("/sim/model/door-positions/cargoaft/position-norm") > 0) { + me["Cargo2Door"].setColor(0.7333,0.3803,0); + me["Cargo2Door"].setColorFill(0.7333,0.3803,0); + me["Cargo2Lbl"].show(); + me["Cargo2Line"].show(); + } else { + me["Cargo2Door"].setColor(0.0509,0.7529,0.2941); + me["Cargo2Door"].setColorFill(0,0,0); + me["Cargo2Lbl"].hide(); + me["Cargo2Line"].hide(); + } + me["Cabin1LeftSlide"].hide(); me["Cabin1RightSlide"].hide(); @@ -1320,9 +1352,6 @@ var canvas_lowerECAM_door = { me["ExitRSlide"].hide(); me["ExitRLine"].hide(); me["ExitRLbl"].hide(); - me["Bulk"].hide(); - me["BulkLine"].hide(); - me["BulkLbl"].hide(); me["Cargo1Line"].hide(); me["Cargo1Lbl"].hide(); me["Cargo2Line"].hide();