diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index e79ddbcd..eeb5ebf1 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -160,7 +160,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
-
+
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index c731d0f4..b0a11a23 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -159,7 +159,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
-
+
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index fd7dac96..872f5b88 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -159,7 +159,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
-
+
diff --git a/A320-main.xml b/A320-main.xml
index 2dc5fd58..85804ab9 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -2,7 +2,7 @@
-
+
Joshua Davidson (Octal450), Jonathan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555), Based on IDG-A32X
@@ -45,13 +45,14 @@
0.0
/controls/deice/windowprobeheat
0.5
-
+ /environment/aircraft-effects/frost-inch
Fuselage
0.0
-
+
0.3
+ services/deicing_truck/deicing/position-norm
/fdm/jsbsim/ice/fuselage
@@ -459,6 +460,12 @@
+
+
+ 0
+
+
+
@@ -1676,6 +1683,33 @@
+
+ i
+ Change view to lights
+ true
+
+ nasal
+
+
+
+
+ o
+ Change view to overhead
+ true
+
+ nasal
+
+
+
+
+ u
+ Change view to pedestal
+ true
+
+ nasal
+
+
+
x
Decrease field of view
@@ -1685,6 +1719,15 @@
+
+ y
+ Change view to autopilot
+ true
+
+ nasal
+
+
+
DEL
Simple Engage/Disengage reversers
@@ -1800,6 +1843,12 @@
0
1
+
+ property-cycle
+ sim/rendering/als-secondary-lights/use-searchlight
+ 0
+ 1
+
@@ -1870,6 +1919,7 @@
Aircraft/A320-family/Nasal/MCDU/MCDU.nas
Aircraft/A320-family/Nasal/MCDU/INITA.nas
Aircraft/A320-family/Nasal/MCDU/INITB.nas
+ Aircraft/A320-family/Nasal/MCDU/PERFAPPR.nas
Aircraft/A320-family/Nasal/MCDU/PERFCLB.nas
Aircraft/A320-family/Nasal/MCDU/PERFCRZ.nas
Aircraft/A320-family/Nasal/MCDU/PERFDES.nas
@@ -1931,6 +1981,9 @@
Aircraft/A320-family/gui/dialogs/refuel.nas
Aircraft/A320-family/gui/dialogs/rmp.nas
+
+ Aircraft/A320-family/Nasal/Systems/save.nas
+
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 67cb63e2..e19a453e 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -159,7 +159,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
-
+
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 78827afc..7d3de32e 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -159,7 +159,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
-
+
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index ca215827..047f70e0 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -96,6 +96,7 @@ setprop("systems/acconfig/options/weight-kgs", 0);
setprop("systems/acconfig/options/adirs-skip", 0);
setprop("systems/acconfig/options/welcome-skip", 0);
setprop("systems/acconfig/options/no-rendering-warn", 0);
+setprop("systems/acconfig/options/save-state", 0);
setprop("systems/acconfig/options/pfd-rate", 1);
setprop("systems/acconfig/options/nd-rate", 1);
setprop("systems/acconfig/options/uecam-rate", 1);
@@ -187,9 +188,17 @@ setlistener("/sim/signals/fdm-initialized", func {
}
setprop("systems/acconfig/options/revision", current_revision);
writeSettings();
+ if (getprop("options/system/save-state") == 1)
+ {
+ save.restore(save.default, getprop("sim/fg-home") ~ "/Export/" ~ getprop("sim/aircraft") ~ "-save.xml");
+ }
spinning.stop();
});
+setlistener("/sim/signals/exit", func {
+ save.save(save.default, getprop("sim/fg-home") ~ "/Export/" ~ getprop("sim/aircraft") ~ "-save.xml");
+});
+
var renderingSettings = {
check: func() {
var rembrandt = getprop("sim/rendering/rembrandt/enabled");
@@ -223,6 +232,7 @@ var readSettings = func {
io.read_properties(getprop("sim/fg-home") ~ "/Export/A320-family-config.xml", "/systems/acconfig/options");
setprop("options/system/keyboard-mode", getprop("systems/acconfig/options/keyboard-mode"));
setprop("options/system/weight-kgs", getprop("systems/acconfig/options/weight-kgs"));
+ setprop("options/system/save-state", getprop("systems/acconfig/options/save-state"));
setprop("controls/adirs/skip", getprop("systems/acconfig/options/adirs-skip"));
setprop("sim/model/autopush/route/show", getprop("systems/acconfig/options/autopush/show-route"));
setprop("sim/model/autopush/route/show-wingtip", getprop("systems/acconfig/options/autopush/show-wingtip"));
@@ -232,6 +242,7 @@ var readSettings = func {
var writeSettings = func {
setprop("systems/acconfig/options/keyboard-mode", getprop("options/system/keyboard-mode"));
setprop("systems/acconfig/options/weight-kgs", getprop("options/system/weight-kgs"));
+ setprop("systems/acconfig/options/save-state", getprop("options/system/save-state"));
setprop("systems/acconfig/options/adirs-skip", getprop("controls/adirs/skip"));
setprop("systems/acconfig/options/autopush/show-route", getprop("sim/model/autopush/route/show"));
setprop("systems/acconfig/options/autopush/show-wingtip", getprop("sim/model/autopush/route/show-wingtip"));
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 84620273..f3e266a1 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -426,6 +426,27 @@
true
+
+
+
+
+ left
+ /systems/acconfig/options/save-state
+
+ property-toggle
+ /options/system/save-state
+
+
+ dialog-apply
+
+
+ nasal
+
+
+ true
+
hbox
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index 81ffd2c3..3c2240af 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -386,6 +386,16 @@
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-L.xml
+ wing-condensation
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-R.xml
+ wing-condensation
+
+
Pushback
@@ -397,7 +407,7 @@
-
+
Firetruck1
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index 732294f8..9fb3cca6 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -335,86 +335,96 @@
-
-
- Aircraft/Generic/Effects/tyre-smoke-nose.xml
- tyre-smoke-n
-
- 7.83
- 0
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/tyre-smoke-port.xml
- tyre-smoke-p
-
- 20.3180764
- -3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/tyre-smoke-stbd.xml
- tyre-smoke-s
-
- 20.3180764
- 3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-nose.xml
- rain-splash-n
-
- 7.83
- 0
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-port.xml
- rain-splash-p
-
- 20.3180764
- -3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-stbd.xml
- rain-splash-s
-
- 20.3180764
- 3.795
- -3.9669424
-
-
-
-
- Aircraft/A320-family/Models/Effects/tire-smoke-left.xml
- tire-smoke-l
+
+
+ Aircraft/Generic/Effects/tyre-smoke-nose.xml
+ tyre-smoke-n
+
+ 7.83
+ 0
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/tyre-smoke-port.xml
+ tyre-smoke-p
20.3180764
-3.795
-3.9669424
-
-
-
- Aircraft/A320-family/Models/Effects/tire-smoke-right.xml
- tire-smoke-r
+
+
+
+ Aircraft/Generic/Effects/tyre-smoke-stbd.xml
+ tyre-smoke-s
20.3180764
3.795
-3.9669424
-
+
+
+
+ Aircraft/Generic/Effects/rain-nose.xml
+ rain-splash-n
+
+ 7.83
+ 0
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/rain-port.xml
+ rain-splash-p
+
+ 20.3180764
+ -3.795
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/rain-stbd.xml
+ rain-splash-s
+
+ 20.3180764
+ 3.795
+ -3.9669424
+
+
+
+
+ Aircraft/A320-family/Models/Effects/tire-smoke-left.xml
+ tire-smoke-l
+
+ 20.3180764
+ -3.795
+ -3.9669424
+
+
+
+
+ Aircraft/A320-family/Models/Effects/tire-smoke-right.xml
+ tire-smoke-r
+
+ 20.3180764
+ 3.795
+ -3.9669424
+
+
+
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-L.xml
+ wing-condensation
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-R.xml
+ wing-condensation
+
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 20efc22b..60ba9a82 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -335,87 +335,97 @@
-
-
- Aircraft/Generic/Effects/tyre-smoke-nose.xml
- tyre-smoke-n
-
- 7.83
- 0
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/tyre-smoke-port.xml
- tyre-smoke-p
-
- 20.3180764
- -3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/tyre-smoke-stbd.xml
- tyre-smoke-s
-
- 20.3180764
- 3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-nose.xml
- rain-splash-n
-
- 7.83
- 0
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-port.xml
- rain-splash-p
-
- 20.3180764
- -3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-stbd.xml
- rain-splash-s
-
- 20.3180764
- 3.795
- -3.9669424
-
-
-
-
- Aircraft/A320-family/Models/Effects/tire-smoke-left.xml
- tire-smoke-l
+
+
+ Aircraft/Generic/Effects/tyre-smoke-nose.xml
+ tyre-smoke-n
+
+ 7.83
+ 0
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/tyre-smoke-port.xml
+ tyre-smoke-p
20.3180764
-3.795
-3.9669424
-
-
-
- Aircraft/A320-family/Models/Effects/tire-smoke-right.xml
- tire-smoke-r
+
+
+
+ Aircraft/Generic/Effects/tyre-smoke-stbd.xml
+ tyre-smoke-s
20.3180764
3.795
-3.9669424
-
-
+
+
+
+ Aircraft/Generic/Effects/rain-nose.xml
+ rain-splash-n
+
+ 7.83
+ 0
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/rain-port.xml
+ rain-splash-p
+
+ 20.3180764
+ -3.795
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/rain-stbd.xml
+ rain-splash-s
+
+ 20.3180764
+ 3.795
+ -3.9669424
+
+
+
+
+ Aircraft/A320-family/Models/Effects/tire-smoke-left.xml
+ tire-smoke-l
+
+ 20.3180764
+ -3.795
+ -3.9669424
+
+
+
+
+ Aircraft/A320-family/Models/Effects/tire-smoke-right.xml
+ tire-smoke-r
+
+ 20.3180764
+ 3.795
+ -3.9669424
+
+
+
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-L.xml
+ wing-condensation
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-R.xml
+ wing-condensation
+
+
Pushback
@@ -426,43 +436,43 @@
-4.24
+
+
-
-
-
- Firetruck1
- Models/Airport/Vehicle/hoskosh-ti-1500.ac
-
- 60.0
- 10.0
- -4.4
-
-
-
-
- Firetruck2
- Models/Airport/Vehicle/hoskosh-ti-1500.ac
-
- 80.0
- -8.0
- -4.4
-
-
-
-
- select
- Firetruck1
- Firetruck2
-
-
- sim/animation/fire-services
-
- velocities/groundspeed-kt
- 40
-
-
-
-
+
+ Firetruck1
+ Models/Airport/Vehicle/hoskosh-ti-1500.ac
+
+ 60.0
+ 10.0
+ -4.4
+
+
+
+
+ Firetruck2
+ Models/Airport/Vehicle/hoskosh-ti-1500.ac
+
+ 80.0
+ -8.0
+ -4.4
+
+
+
+
+ select
+ Firetruck1
+ Firetruck2
+
+
+ sim/animation/fire-services
+
+ velocities/groundspeed-kt
+ 40
+
+
+
+
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index 9f48a1c7..ffaeafcd 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -395,6 +395,16 @@
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-L.xml
+ wing-condensation
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-R.xml
+ wing-condensation
+
+
Pushback
@@ -406,42 +416,42 @@
-
+
-
- Firetruck1
- Models/Airport/Vehicle/hoskosh-ti-1500.ac
-
- 60.0
- 10.0
- -4.4
-
-
-
-
- Firetruck2
- Models/Airport/Vehicle/hoskosh-ti-1500.ac
-
- 80.0
- -8.0
- -4.4
-
-
-
-
- select
- Firetruck1
- Firetruck2
-
-
- sim/animation/fire-services
-
- velocities/groundspeed-kt
- 40
-
-
-
-
+
+ Firetruck1
+ Models/Airport/Vehicle/hoskosh-ti-1500.ac
+
+ 60.0
+ 10.0
+ -4.4
+
+
+
+
+ Firetruck2
+ Models/Airport/Vehicle/hoskosh-ti-1500.ac
+
+ 80.0
+ -8.0
+ -4.4
+
+
+
+
+ select
+ Firetruck1
+ Firetruck2
+
+
+ sim/animation/fire-services
+
+ velocities/groundspeed-kt
+ 40
+
+
+
+
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index 8999e7f6..0ffa62e3 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -314,86 +314,96 @@
-
-
- Aircraft/Generic/Effects/tyre-smoke-nose.xml
- tyre-smoke-n
-
- 7.83
- 0
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/tyre-smoke-port.xml
- tyre-smoke-p
-
- 20.3180764
- -3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/tyre-smoke-stbd.xml
- tyre-smoke-s
-
- 20.3180764
- 3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-nose.xml
- rain-splash-n
-
- 7.83
- 0
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-port.xml
- rain-splash-p
-
- 20.3180764
- -3.795
- -3.9669424
-
-
-
-
- Aircraft/Generic/Effects/rain-stbd.xml
- rain-splash-s
-
- 20.3180764
- 3.795
- -3.9669424
-
-
-
-
- Aircraft/A320-family/Models/Effects/tire-smoke-left.xml
- tire-smoke-l
+
+
+ Aircraft/Generic/Effects/tyre-smoke-nose.xml
+ tyre-smoke-n
+
+ 7.83
+ 0
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/tyre-smoke-port.xml
+ tyre-smoke-p
20.3180764
-3.795
-3.9669424
-
-
-
- Aircraft/A320-family/Models/Effects/tire-smoke-right.xml
- tire-smoke-r
+
+
+
+ Aircraft/Generic/Effects/tyre-smoke-stbd.xml
+ tyre-smoke-s
20.3180764
3.795
-3.9669424
-
+
+
+
+ Aircraft/Generic/Effects/rain-nose.xml
+ rain-splash-n
+
+ 7.83
+ 0
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/rain-port.xml
+ rain-splash-p
+
+ 20.3180764
+ -3.795
+ -3.9669424
+
+
+
+
+ Aircraft/Generic/Effects/rain-stbd.xml
+ rain-splash-s
+
+ 20.3180764
+ 3.795
+ -3.9669424
+
+
+
+
+ Aircraft/A320-family/Models/Effects/tire-smoke-left.xml
+ tire-smoke-l
+
+ 20.3180764
+ -3.795
+ -3.9669424
+
+
+
+
+ Aircraft/A320-family/Models/Effects/tire-smoke-right.xml
+ tire-smoke-r
+
+ 20.3180764
+ 3.795
+ -3.9669424
+
+
+
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-L.xml
+ wing-condensation
+
+
+ Aircraft/A320-family/Models/Effects/wing-condensation-R.xml
+ wing-condensation
+
@@ -406,42 +416,42 @@
-
+
-
- Firetruck1
- Models/Airport/Vehicle/hoskosh-ti-1500.ac
-
- 60.0
- 10.0
- -4.4
-
-
-
-
- Firetruck2
- Models/Airport/Vehicle/hoskosh-ti-1500.ac
-
- 80.0
- -8.0
- -4.4
-
-
-
-
- select
- Firetruck1
- Firetruck2
-
-
- sim/animation/fire-services
-
- velocities/groundspeed-kt
- 40
-
-
-
-
+
+ Firetruck1
+ Models/Airport/Vehicle/hoskosh-ti-1500.ac
+
+ 60.0
+ 10.0
+ -4.4
+
+
+
+
+ Firetruck2
+ Models/Airport/Vehicle/hoskosh-ti-1500.ac
+
+ 80.0
+ -8.0
+ -4.4
+
+
+
+
+ select
+ Firetruck1
+ Firetruck2
+
+
+ sim/animation/fire-services
+
+ velocities/groundspeed-kt
+ 40
+
+
+
+
diff --git a/Models/Effects/Moisture-neo.xml b/Models/Effects/Moisture-neo.xml
new file mode 100644
index 00000000..9d3c5bdc
--- /dev/null
+++ b/Models/Effects/Moisture-neo.xml
@@ -0,0 +1,146 @@
+
+
+
+
+
+ moisture
+ res/smoke.png
+ false
+ false
+
+ 0.3
+ 0
+ -1.3
+ 0
+
+
+ local
+
+
+ point
+
+
+
+ 0
+ 0
+ 0
+ 0
+
+ 0
+ 0
+
+
+ 180
+ 180
+ 180
+ -180
+ -180
+ -180
+
+
+
+
+
+ 50
+ 0
+
+
+
+ billboard
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.002
+ environment/relative-humidity
+
+
+
+
+
+ 1.3
+
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.0008
+ environment/relative-humidity
+
+
+
+
+
+ 1.6
+
+
+
+ 0.0001
+ 0.4
+ 0.1
+
+
+
+ air
+ false
+ false
+
+
+
+
+
+
diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
index a9e1964c..60339b46 100755
--- a/Models/Effects/Moisture.xml
+++ b/Models/Effects/Moisture.xml
@@ -8,10 +8,10 @@
false
false
- 3
+ 0.3
0
- 0
- -90
+ -1
+ 0
local
@@ -30,18 +30,18 @@
0
- 0
- 0
- 0
- 0
- 0
- 0
+ 180
+ 180
+ 180
+ -180
+ -180
+ -180
- 150
+ 50
0
@@ -54,33 +54,38 @@
- 1.0
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 1.0
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 1.0
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.00000001
+
+
+ 0.003
+ environment/relative-humidity
+
+
- 1
+ 1.0
@@ -89,44 +94,49 @@
- 0.7
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.7
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.7
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.3
+
+
+ 0.0009
+ environment/relative-humidity
+
+
- 2
+ 1.4
- 0.4
+ 0.0001
0.4
0.1
air
- true
+ false
false
diff --git a/Models/Effects/engine-spray-reverse.xml b/Models/Effects/engine-spray-reverse.xml
index bf48ae9b..55517756 100644
--- a/Models/Effects/engine-spray-reverse.xml
+++ b/Models/Effects/engine-spray-reverse.xml
@@ -5,133 +5,149 @@
engine-spray-reverse
res/smoke.png
- false
- false
-
- 0
- 0
- 0
- 180
-
+ false
+ false
world
-
- point
-
+
+ segments
+
+ 1
+ 3
+ -1
+
+
+ 1
+ -3
+ -1
+
+
- -1.5
- 1.5
- -1.5
- 1.5
-
- 0
- 0
-
-
- 0
- 0
- 0
- 0
- 0
- 0
-
+ 0
+ 0
+ 0
+ 0
+
+ 10
+ 1
+
+
+ 180
+ -180
+ 180
+ -180
+ 180
+ -180
+
- 50
- 0
+
+
+ environment/surface/wetness
+ 50
+
+
+ 0
billboard
-
+
- 0.7
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.7
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.7
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.3
+
+
+ 0.2
+ environment/surface/wetness
+
+
-
- 2
-
-
-
-
+
+ 5
+
+
+
- 1.0
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 1.0
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 1.0
- rendering/scene/diffuse/red
+ 0.01
+ environment/relative-humidity
- 0.00000001
+
+
+ 0.1
+ environment/surface/wetness
+
+
-
- 3
-
-
-
-
- 0.4
-
-
- 0.5
- 0.1
+
+ 10
+
+
+
+ 0.5
+
+ 0.025
+ 0.175
-
-
- air
- true
- true
-
+
+
+ air
+ true
+ true
+
\ No newline at end of file
diff --git a/Models/Effects/engine-spray.xml b/Models/Effects/engine-spray.xml
index 010a219f..07d8c8ce 100644
--- a/Models/Effects/engine-spray.xml
+++ b/Models/Effects/engine-spray.xml
@@ -25,29 +25,34 @@
- 15
- 60
- -5
- 5
+ 0
+ 0
+ 0
+ 0
250
15
- 15
- -15
- 15
- -15
- 15
- -15
+ 180
+ -180
+ 180
+ -180
+ 180
+ -180
-
- 100
+
+
+
+ environment/surface/wetness
+ 100
+
+
10
-
+
billboard
@@ -55,26 +60,82 @@
- 0.9
- 0.9
- 0.9
- 0.04
-
-
- 0.5
-
-
-
-
- 1
- 1
- 1
- 0.02
-
-
- 10
-
-
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ environment/surface/wetness
+ 0.05
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ environment/surface/wetness
+ 0.02
+
+
+
+
+
+ 10
+
+
1.0
diff --git a/Models/Effects/wing-condensation-L.xml b/Models/Effects/wing-condensation-L.xml
new file mode 100644
index 00000000..b826cdcd
--- /dev/null
+++ b/Models/Effects/wing-condensation-L.xml
@@ -0,0 +1,261 @@
+
+
+
+
+ wing-condensation
+ res/smoke.png
+ false
+ false
+ normal
+ local
+
+
+
+
+
+
+
+
+ environment/relative-humidity
+ 0.1
+
+ systems/navigation/adr/output/aoa-1
+
+
+ 13.5
+
+
+
+
+
+ environment/relative-humidity
+ 0.1
+
+ systems/navigation/adr/output/aoa-2
+
+
+ 13.5
+
+
+
+
+
+ environment/relative-humidity
+ 0.1
+
+ systems/navigation/adr/output/aoa-3
+
+
+ 13.5
+
+
+
+ velocities/groundspeed-kt
+ 100
+
+
+ velocities/groundspeed-kt
+ 210
+
+
+ environment/relative-humidity
+ 50
+
+
+ environment/temperature-degc
+ 28
+
+
+ position/altitude-agl-ft
+ 0
+
+
+ position/altitude-agl-ft
+ 8000
+
+
+
+ systems/navigation/adr/output/aoa-1
+ 0
+
+
+ systems/navigation/adr/output/aoa-2
+ 0
+
+
+ systems/navigation/adr/output/aoa-3
+ 0
+
+
+
+
+
+
+ segments
+
+ 15
+ -2.3
+ 0
+
+
+ 22
+ -16
+ 0.7
+
+
+ 19
+ -2.3
+ -1
+
+
+
+
+
+
+ 90
+
+
+
+ 90
+
+ 90
+ 90
+
+
+ 0
+ 0
+
+
+ 180
+ 180
+ 180
+ -180
+ -180
+ -180
+
+
+
+
+
+
+
+ 4
+ environment/relative-humidity
+
+
+ 10
+
+
+
+ billboard
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.0007
+ environment/relative-humidity
+
+
+
+
+
+ 1.5
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.00001
+ environment/relative-humidity
+
+
+
+
+
+ 2
+
+
+
+ 0.00001
+
+ 0.025
+ 0.175
+
+
+
+ air
+ true
+ true
+
+
+
+
+
diff --git a/Models/Effects/wing-condensation-R.xml b/Models/Effects/wing-condensation-R.xml
new file mode 100644
index 00000000..62d524a4
--- /dev/null
+++ b/Models/Effects/wing-condensation-R.xml
@@ -0,0 +1,261 @@
+
+
+
+
+ wing-condensation
+ res/smoke.png
+ false
+ false
+ normal
+ local
+
+
+
+
+
+
+
+
+ environment/relative-humidity
+ 0.1
+
+ systems/navigation/adr/output/aoa-1
+
+
+ 13.5
+
+
+
+
+
+ environment/relative-humidity
+ 0.1
+
+ systems/navigation/adr/output/aoa-2
+
+
+ 13.5
+
+
+
+
+
+ environment/relative-humidity
+ 0.1
+
+ systems/navigation/adr/output/aoa-3
+
+
+ 13.5
+
+
+
+ velocities/groundspeed-kt
+ 100
+
+
+ velocities/groundspeed-kt
+ 210
+
+
+ environment/relative-humidity
+ 50
+
+
+ environment/temperature-degc
+ 28
+
+
+ position/altitude-agl-ft
+ 0
+
+
+ position/altitude-agl-ft
+ 8000
+
+
+
+ systems/navigation/adr/output/aoa-1
+ 0
+
+
+ systems/navigation/adr/output/aoa-2
+ 0
+
+
+ systems/navigation/adr/output/aoa-3
+ 0
+
+
+
+
+
+
+ segments
+
+ 15
+ 2.3
+ 0
+
+
+ 22
+ 16
+ 0.7
+
+
+ 19
+ 2.3
+ -1
+
+
+
+
+
+
+ 90
+
+
+
+ 90
+
+ 90
+ 90
+
+
+ 0
+ 0
+
+
+ 180
+ 180
+ 180
+ -180
+ -180
+ -180
+
+
+
+
+
+
+
+ 4
+ environment/relative-humidity
+
+
+ 10
+
+
+
+ billboard
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.0007
+ environment/relative-humidity
+
+
+
+
+
+ 1.5
+
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.01
+ environment/relative-humidity
+
+
+
+
+
+
+ 0.00001
+ environment/relative-humidity
+
+
+
+
+
+ 2
+
+
+
+ 0.00001
+
+ 0.025
+ 0.175
+
+
+
+ air
+ true
+ true
+
+
+
+
+
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index 84d15040..5c4f9b4f 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -51,24 +51,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[0]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[0]/state
- 3
-
-
+ environment/contrail
@@ -84,7 +67,7 @@
- Aircraft/A320-family/Models/Effects/Moisture.xml
+ Aircraft/A320-family/Models/Effects/Moisture-neo.xml
moisture
@@ -111,9 +94,9 @@
- -0.5
+ 0
0
- 0
+ 0.4
0
@@ -186,9 +169,9 @@
- 0.875
+ -1.0
0
- -2.5
+ 0
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index 16498a1f..97de13b0 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -51,24 +51,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[1]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[1]/state
- 3
-
-
+ environment/contrail
@@ -84,7 +67,7 @@
- Aircraft/A320-family/Models/Effects/Moisture.xml
+ Aircraft/A320-family/Models/Effects/Moisture-neo.xml
moisture
@@ -114,9 +97,9 @@
- -0.5
+ 0
0
- 0
+ 0.4
0
@@ -189,9 +172,9 @@
- 0.875
+ -1.0
0
- -2.5
+ 0
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index 6f25c156..bd6f2c98 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -38,24 +38,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[0]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[0]/state
- 3
-
-
+ environment/contrail
@@ -71,7 +54,7 @@
- Aircraft/A320-family/Models/Effects/Moisture.xml
+ Aircraft/A320-family/Models/Effects/Moisture-neo.xml
moisture
@@ -98,7 +81,7 @@
- -0.5
+ 0
0
0
0
@@ -173,9 +156,9 @@
- 1.5
+ 0
0
- -1
+ 0
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index 880418f4..c36d3b8c 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -38,24 +38,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[1]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[1]/state
- 3
-
-
+ environment/contrail
@@ -71,7 +54,7 @@
- Aircraft/A320-family/Models/Effects/Moisture.xml
+ Aircraft/A320-family/Models/Effects/Moisture-neo.xml
moisture
@@ -98,7 +81,7 @@
- -0.5
+ 0
0
0
0
@@ -173,9 +156,9 @@
- 1.5
+ 0
0
- -1
+ 0
diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml
index db90d4f7..da757af4 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml
@@ -40,24 +40,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[0]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[0]/state
- 3
-
-
+ environment/contrail
@@ -100,9 +83,9 @@
- -0.5
+ 0
0
- 0
+ 0.3
0
@@ -175,9 +158,9 @@
- 0.875
+ 0
0
- -2.5
+ 0
diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml
index a09be013..5fc32f21 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml
@@ -40,24 +40,7 @@
contrail
Aircraft/A320-family/Models/Effects/contrail.xml
-
-
- engines/engine[1]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[1]/state
- 3
-
-
+ environment/contrail
@@ -100,9 +83,9 @@
- -0.5
+ 0
0
- 0
+ 0.3
0
@@ -175,9 +158,9 @@
- 0.875
+ 0
0
- -2.5
+ 0
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index c3ec8c37..987352f5 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -37,24 +37,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[0]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[0]/state
- 3
-
-
+ environment/contrail
@@ -97,9 +80,9 @@
- -0.5
+ 0
0
- 0
+ 0.5
0
@@ -172,9 +155,9 @@
- 0.875
+ 0
0
- -2.5
+ 0
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index 82e9b2b9..0242b1d0 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -37,24 +37,7 @@
Aircraft/A320-family/Models/Effects/contrail.xml
contrail
-
-
- engines/engine[1]/n2-actual
- 50
-
-
- position/altitude-ft
- 19000
-
-
- environment/temperature-degc
- -30
-
-
- engines/engine[1]/state
- 3
-
-
+ environment/contrail
@@ -97,9 +80,9 @@
- -0.5
+ 0
0
- 0
+ 0.5
0
@@ -172,9 +155,9 @@
- 0.875
+ 0
0
- -2.5
+ 0
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index cb85e62d..3cc62b29 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -5307,6 +5307,10 @@
nasal