From 679e1d5f19f7fd204aefdba7e4ec2c5b58d82d7b Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 16 Apr 2019 16:22:06 +0100 Subject: [PATCH] Add APU fire, fix for non-IAE --- AircraftConfig/fail.xml | 10 +++++ Models/A320-100-CFM.xml | 10 +++++ Models/A320-200-CFM.xml | 11 +++++ Models/A320-200-IAE.xml | 10 +++++ Models/A320neo-CFM.xml | 10 +++++ Models/A320neo-PW.xml | 10 +++++ Models/Effects/a320-apufire.xml | 35 +++++++++++++++ Models/Effects/flame-apu.eff | 25 +++++++++++ Models/Effects/flame-cfm.eff | 25 +++++++++++ Models/Wings/a320-fire-left-cfm.xml | 35 +++++++++++++++ Models/Wings/a320-fire-right-cfm.xml | 35 +++++++++++++++ Models/Wings/a320.wings.cfm.xml | 12 +++--- Models/Wings/a320.wings.neocfm.xml | 12 +++--- Models/Wings/a320.wings.neopw.xml | 12 +++--- Nasal/fire.nas | 16 ++++--- Systems/a320-engine-fire.xml | 64 ++++++++++++++++++++++++++++ 16 files changed, 307 insertions(+), 25 deletions(-) create mode 100644 Models/Effects/a320-apufire.xml create mode 100644 Models/Effects/flame-apu.eff create mode 100644 Models/Effects/flame-cfm.eff create mode 100644 Models/Wings/a320-fire-left-cfm.xml create mode 100644 Models/Wings/a320-fire-right-cfm.xml create mode 100644 Systems/a320-engine-fire.xml diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml index 87991a31..938e357c 100644 --- a/AircraftConfig/fail.xml +++ b/AircraftConfig/fail.xml @@ -511,6 +511,16 @@ true + + + left + /systems/failures/apu-fire + + dialog-apply + + true + + left diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml index ed7d2e18..d6bb38d3 100644 --- a/Models/A320-100-CFM.xml +++ b/Models/A320-100-CFM.xml @@ -405,4 +405,14 @@ + + + APU Fire + Aircraft/IDG-A32X/Models/Effects/a320-apufire.xml + + 40.15 + 0.0 + 1.08 + + diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index faee1f00..1b88b0a3 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -435,4 +435,15 @@ + + + APU Fire + Aircraft/IDG-A32X/Models/Effects/a320-apufire.xml + + 40.15 + 0.0 + 1.08 + + + diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index 55752740..960a8463 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -434,4 +434,14 @@ + + + APU Fire + Aircraft/IDG-A32X/Models/Effects/a320-apufire.xml + + 40.15 + 0.0 + 1.08 + + diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml index 7c68810a..75832160 100644 --- a/Models/A320neo-CFM.xml +++ b/Models/A320neo-CFM.xml @@ -415,4 +415,14 @@ + + + APU Fire + Aircraft/IDG-A32X/Models/Effects/a320-apufire.xml + + 40.15 + 0.0 + 1.08 + + diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index ea12ab35..885bd75e 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -421,4 +421,14 @@ + + + APU Fire + Aircraft/IDG-A32X/Models/Effects/a320-apufire.xml + + 40.15 + 0.0 + 1.08 + + diff --git a/Models/Effects/a320-apufire.xml b/Models/Effects/a320-apufire.xml new file mode 100644 index 00000000..07d7662b --- /dev/null +++ b/Models/Effects/a320-apufire.xml @@ -0,0 +1,35 @@ + + + + Aircraft/Generic/Effects/Thruster/thrust_flame.ac + + + scale + systems/failures/apu-fire + 0.2 + 0.3 + 0.3 + 0.8 + 0.8 + 0.2 + 0.2 + 0.2 + + + + select + Bounding_box + + + systems/failures/apu-fire + 0.8 + + + + + + Aircraft/IDG-A32X/Models/Effects/flame-apu + Bounding_box + + + \ No newline at end of file diff --git a/Models/Effects/flame-apu.eff b/Models/Effects/flame-apu.eff new file mode 100644 index 00000000..580dae33 --- /dev/null +++ b/Models/Effects/flame-apu.eff @@ -0,0 +1,25 @@ + + + AB-flame + Effects/thrust-flame + + /sim/model/flame/blue-base + 0.01 + /sim/model/flame/green-base + /sim/model/flame/red-base + 0 + /sim/model/flame/blue-high + /sim/model/flame/green-high + /sim/model/flame/red-high + /sim/model/flame/blue-low + /sim/model/flame/green-low + /sim/model/flame/red-low + 0.7 + 0.8 + 0.4 + 0.2 + 0.8 + 1 + 0 + + \ No newline at end of file diff --git a/Models/Effects/flame-cfm.eff b/Models/Effects/flame-cfm.eff new file mode 100644 index 00000000..72a7dcfc --- /dev/null +++ b/Models/Effects/flame-cfm.eff @@ -0,0 +1,25 @@ + + + AB-flame + Effects/thrust-flame + + /sim/model/flame/blue-base + 0.01 + /sim/model/flame/green-base + /sim/model/flame/red-base + 0 + /sim/model/flame/blue-high + /sim/model/flame/green-high + /sim/model/flame/red-high + /sim/model/flame/blue-low + /sim/model/flame/green-low + /sim/model/flame/red-low + 0.4 + 0.8 + 0.2 + 0.5 + 0.8 + 1 + 0 + + \ No newline at end of file diff --git a/Models/Wings/a320-fire-left-cfm.xml b/Models/Wings/a320-fire-left-cfm.xml new file mode 100644 index 00000000..01dfc4dc --- /dev/null +++ b/Models/Wings/a320-fire-left-cfm.xml @@ -0,0 +1,35 @@ + + + + Aircraft/Generic/Effects/Thruster/thrust_flame.ac + + + scale + systems/failures/engine-left-fire + 0.2 + 0.3 + 0.3 + 0.8 + 0.8 + 0.4 + 0.35 + 0.35 + + + + select + Bounding_box + + + systems/failures/engine-left-fire + 0.8 + + + + + + Aircraft/IDG-A32X/Models/Effects/flame-cfm + Bounding_box + + + \ No newline at end of file diff --git a/Models/Wings/a320-fire-right-cfm.xml b/Models/Wings/a320-fire-right-cfm.xml new file mode 100644 index 00000000..6d3233c4 --- /dev/null +++ b/Models/Wings/a320-fire-right-cfm.xml @@ -0,0 +1,35 @@ + + + + Aircraft/Generic/Effects/Thruster/thrust_flame.ac + + + scale + systems/failures/engine-right-fire + 0.2 + 0.3 + 0.3 + 0.8 + 0.8 + 0.4 + 0.35 + 0.35 + + + + select + Bounding_box + + + systems/failures/engine-right-fire + 0.8 + + + + + + Aircraft/IDG-A32X/Models/Effects/flame-cfm + Bounding_box + + + \ No newline at end of file diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml index f567faf9..fdd7baf4 100644 --- a/Models/Wings/a320.wings.cfm.xml +++ b/Models/Wings/a320.wings.cfm.xml @@ -27,21 +27,21 @@ Engine.CFM.Left.FireBBox - Aircraft/IDG-A32X/Models/Wings/a320-fire-left.xml + Aircraft/IDG-A32X/Models/Wings/a320-fire-left-cfm.xml - -1.6387912 + 3.2 -5.755 - -1.0170087 + -1.2 Engine.CFM.RightFireBBox - Aircraft/IDG-A32X/Models/Wings/a320-fire-right.xml + Aircraft/IDG-A32X/Models/Wings/a320-fire-right-cfm.xml - -1.6387912 + 3.2 5.755 - -1.0170087 + -1.2 diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml index f52f79af..d0a2a8a5 100644 --- a/Models/Wings/a320.wings.neocfm.xml +++ b/Models/Wings/a320.wings.neocfm.xml @@ -27,21 +27,21 @@ Engine.CFM.Left.FireBBox - Aircraft/IDG-A32X/Models/Wings/a320-fire-left.xml + Aircraft/IDG-A32X/Models/Wings/a320-fire-left-cfm.xml - -1.6387912 + 3.28 -5.755 - -1.0170087 + -1.13 Engine.CFM.RightFireBBox - Aircraft/IDG-A32X/Models/Wings/a320-fire-right.xml + Aircraft/IDG-A32X/Models/Wings/a320-fire-right-cfm.xml - -1.6387912 + 3.28 5.755 - -1.0170087 + -1.13 diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml index 69016fbb..94ff0c57 100644 --- a/Models/Wings/a320.wings.neopw.xml +++ b/Models/Wings/a320.wings.neopw.xml @@ -27,21 +27,21 @@ Engine.PW.Left.FireBBox - Aircraft/IDG-A32X/Models/Wings/a320-fire-left.xml + Aircraft/IDG-A32X/Models/Wings/a320-fire-left-cfm.xml - -1.6387912 + 3.8 -5.755 - -1.0170087 + -1.15 Engine.PW.RightFireBBox - Aircraft/IDG-A32X/Models/Wings/a320-fire-right.xml + Aircraft/IDG-A32X/Models/Wings/a320-fire-right-cfm.xml - -1.6387912 + 3.8 5.755 - -1.0170087 + -1.15 diff --git a/Nasal/fire.nas b/Nasal/fire.nas index 57e8721b..e5050054 100644 --- a/Nasal/fire.nas +++ b/Nasal/fire.nas @@ -282,14 +282,16 @@ var engFireDetectorUnit = { }; var detectorLoop = { - sys: 9, type: 0, + sys: 9, temperature: "", - new: func(type, sys, temperature) { + elecProp: "", + new: func(type, sys, temperature, elecProp) { var dL = {parents:[detectorLoop]}; - dL.sys = sys; dL.type = type; + dL.sys = sys; dL.temperature = temperature; + dL.elecProp = props.globals.getNode(elecProp, 1); return dL; }, @@ -300,7 +302,7 @@ var detectorLoop = { if (typeLoop == 1) { index += 1 } - if (propsNasFire[index].getValue() > 250) { + if (propsNasFire[index].getValue() > 250 and me.elecProp.getValue() >= 25) { me.sendSignal(system,typeLoop); } }, @@ -412,9 +414,9 @@ var engFireDetectorUnits = std.Vector.new([ engFireDetectorUnit.new(0), engFireD # Create detector loops var detectorLoops = std.Vector.new([ -detectorLoop.new(0, 0, "/systems/fire/engine1/temperature"), detectorLoop.new(1, 0, "/systems/fire/engine1/temperature"), -detectorLoop.new(0, 1, "/systems/fire/engine2/temperature"), detectorLoop.new(1, 1, "/systems/fire/engine2/temperature"), -detectorLoop.new(0, 2, "/systems/fire/apu/temperature"), detectorLoop.new(1, 2, "/systems/fire/apu/temperature") +detectorLoop.new(0, 0, "/systems/fire/engine1/temperature", "/systems/electrical/bus/dcess"), detectorLoop.new(1, 0, "/systems/fire/engine1/temperature", "/systems/electrical/bus/dc2"), +detectorLoop.new(0, 1, "/systems/fire/engine2/temperature", "/systems/electrical/bus/dc2"), detectorLoop.new(1, 1, "/systems/fire/engine2/temperature", "/systems/electrical/bus/dcess"), +detectorLoop.new(0, 2, "/systems/fire/apu/temperature", "/systems/electrical/bus/dcbat"), detectorLoop.new(1, 2, "/systems/fire/apu/temperature", "/systems/electrical/bus/dcbat") ]); # Create extinguisher bottles diff --git a/Systems/a320-engine-fire.xml b/Systems/a320-engine-fire.xml new file mode 100644 index 00000000..373a0f2f --- /dev/null +++ b/Systems/a320-engine-fire.xml @@ -0,0 +1,64 @@ + + + + + + + + + /systems/fire/engine1/temperature + + + /systems/failures/engine-left-fire + + 0 0 + 1 25 + +
+ simulation/channel-dt +
+
+
+ /systems/fire/engine1/temperature +
+ + + + + /systems/fire/engine2/temperature + + + /systems/failures/engine-right-fire + + 0 0 + 1 25 + +
+ simulation/channel-dt +
+
+
+ /systems/fire/engine2/temperature +
+ + + + + /systems/fire/apu/temperature + + + /systems/failures/apu-fire + + 0 0 + 1 25 + +
+ simulation/channel-dt +
+
+
+ /systems/fire/apu/temperature +
+
+ +