From 2b8d067bed504170110aaaabc2b915f707d179a4 Mon Sep 17 00:00:00 2001
From: vezza <vezza@inwind.it>
Date: Wed, 11 Mar 2020 21:57:50 +0100
Subject: [PATCH 1/5] Added wings condensation effect + spray's effects
 improvements

---
 Models/A320-100-CFM.xml                       |  12 +-
 Models/A320-200-CFM.xml                       | 150 ++++++------
 Models/A320-200-IAE.xml                       | 224 +++++++++---------
 Models/A320neo-CFM.xml                        |  80 ++++---
 Models/A320neo-PW.xml                         | 220 +++++++++--------
 Models/Effects/Moisture.xml                   |  40 ++--
 Models/Effects/engine-spray-reverse.xml       | 175 +++++---------
 Models/Effects/wing-condensation-L.xml        | 194 +++++++++++++++
 Models/Effects/wing-condensation-R.xml        | 184 ++++++++++++++
 Models/Engines/NEO/LeapXLeft.xml              | 140 +++++------
 Models/Engines/NEO/LeapXRight.xml             |   6 +-
 Models/Engines/NEO/PW1100GLeft.xml            |   6 +-
 Models/Engines/NEO/PW1100GRight.xml           |   6 +-
 Models/Engines/XMLs/a320.engine.cfm.left.xml  |   6 +-
 Models/Engines/XMLs/a320.engine.cfm.right.xml | 140 +++++------
 Models/Engines/XMLs/a320.engine.iae.left.xml  |   6 +-
 Models/Engines/XMLs/a320.engine.iae.right.xml |   6 +-
 17 files changed, 989 insertions(+), 606 deletions(-)
 create mode 100644 Models/Effects/wing-condensation-L.xml
 create mode 100644 Models/Effects/wing-condensation-R.xml

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 @@
 			</offsets>
 	</model>
 
+	<!-- wing condensation effect -->
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+
 	<!-- Other non-aircraft models -->
 	<model>
 		<name>Pushback</name>
@@ -397,7 +407,7 @@
 		</offsets>
 	</model>
 	
-	<!--Firetruck-->
+	<!-- Firetruck -->
 
 	<model>
 	 <name>Firetruck1</name>
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 @@
 		</offsets>
 	</model>
 
-<!-- Tire smoke and spray effects -->
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-  <name>tyre-smoke-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
- </model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-  <name>tyre-smoke-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-  <name>tyre-smoke-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-  <name>rain-splash-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-  <name>rain-splash-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-  <name>rain-splash-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-  <name>tire-smoke-l</name>
+	<!-- Tire smoke and spray effects -->
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+	  <name>tyre-smoke-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	 </model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+	  <name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-  <name>tire-smoke-r</name>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+	  <name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
+	  <name>rain-splash-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
+	  <name>rain-splash-p</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+	  <name>rain-splash-s</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+	  <name>tire-smoke-l</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>-3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+	  <name>tire-smoke-r</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<!-- wing condensation effect -->
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+	  <name>wing-condensation</name>
+	</model>
 
 	<!-- Other non-aircraft models -->
 	<model>
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 @@
 		</offsets>
 	</model>
 
-<!-- Tire smoke and spray effects -->
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-  <name>tyre-smoke-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
- </model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-  <name>tyre-smoke-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-  <name>tyre-smoke-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-  <name>rain-splash-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-  <name>rain-splash-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-  <name>rain-splash-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-  <name>tire-smoke-l</name>
+	<!-- Tire smoke and spray effects -->
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+	  <name>tyre-smoke-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	 </model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+	  <name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-  <name>tire-smoke-r</name>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+	  <name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
-
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
+	  <name>rain-splash-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
+	  <name>rain-splash-p</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+	  <name>rain-splash-s</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+	  <name>tire-smoke-l</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>-3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+	  <name>tire-smoke-r</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<!-- wing condensation effect -->
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+	
 	<!-- Other non-aircraft models -->
 	<model>
 		<name>Pushback</name>
@@ -426,43 +436,43 @@
 			<z-m>-4.24</z-m>
 		</offsets>
 	</model>
+		
+	<!-- Firetruck -->
 	
-	<!--Firetruck-->
-
-<model>
- <name>Firetruck1</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>60.0</x-m>
-  <y-m>10.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<model>
- <name>Firetruck2</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>80.0</x-m>
-  <y-m>-8.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<animation>
-    <type>select</type>
-    <object-name>Firetruck1</object-name>
-    <object-name>Firetruck2</object-name>
-    <condition>
-        <and>
-            <property>sim/animation/fire-services</property>
-            <less-than>
-                <property>velocities/groundspeed-kt</property>
-                <value>40</value>
-            </less-than>
-        </and>
-    </condition>
-</animation>
+	<model>
+	 <name>Firetruck1</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>60.0</x-m>
+	  <y-m>10.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<model>
+	 <name>Firetruck2</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>80.0</x-m>
+	  <y-m>-8.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<animation>
+	    <type>select</type>
+	    <object-name>Firetruck1</object-name>
+	    <object-name>Firetruck2</object-name>
+	    <condition>
+	        <and>
+	            <property>sim/animation/fire-services</property>
+	            <less-than>
+	                <property>velocities/groundspeed-kt</property>
+	                <value>40</value>
+	            </less-than>
+	        </and>
+	    </condition>
+	</animation>
 	
 	<!-- LIVERY SELECT -->
 	<!-- Animation -->
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 @@
 			</offsets>
 	</model>
 
+	<!-- wing condensation effect -->
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+
 	<!-- Other non-aircraft models -->
 	<model>
 		<name>Pushback</name>
@@ -406,42 +416,42 @@
 		</offsets>
 	</model>
 	
-	<!--Firetruck-->
+	<!-- Firetruck -->
 
-<model>
- <name>Firetruck1</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>60.0</x-m>
-  <y-m>10.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<model>
- <name>Firetruck2</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>80.0</x-m>
-  <y-m>-8.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<animation>
-    <type>select</type>
-    <object-name>Firetruck1</object-name>
-    <object-name>Firetruck2</object-name>
-    <condition>
-        <and>
-            <property>sim/animation/fire-services</property>
-            <less-than>
-                <property>velocities/groundspeed-kt</property>
-                <value>40</value>
-            </less-than>
-        </and>
-    </condition>
-</animation>
+	<model>
+	 <name>Firetruck1</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>60.0</x-m>
+	  <y-m>10.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<model>
+	 <name>Firetruck2</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>80.0</x-m>
+	  <y-m>-8.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<animation>
+	    <type>select</type>
+	    <object-name>Firetruck1</object-name>
+	    <object-name>Firetruck2</object-name>
+	    <condition>
+	        <and>
+	            <property>sim/animation/fire-services</property>
+	            <less-than>
+	                <property>velocities/groundspeed-kt</property>
+	                <value>40</value>
+	            </less-than>
+	        </and>
+	    </condition>
+	</animation>
 	
 	<!-- LIVERY SELECT -->
 	<!-- Animation -->
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 @@
 		</offsets>
 	</model>
 
-<!-- Tire smoke and spray effects -->
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-  <name>tyre-smoke-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
- </model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-  <name>tyre-smoke-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-  <name>tyre-smoke-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-  <name>rain-splash-n</name>
-	<offsets>
-		<x-m>7.83</x-m>
-		<y-m>0</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-  <name>rain-splash-p</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>-3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
- 
-<model>
-  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-  <name>rain-splash-s</name>
-	<offsets>
-		<x-m>20.3180764</x-m>
-		<y-m>3.795</y-m>
-		<z-m>-3.9669424</z-m>
-	</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-  <name>tire-smoke-l</name>
+	<!-- Tire smoke and spray effects -->
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+	  <name>tyre-smoke-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	 </model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+	  <name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
-
-<model>
-  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-  <name>tire-smoke-r</name>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+	  <name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-</model>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
+	  <name>rain-splash-n</name>
+		<offsets>
+			<x-m>7.83</x-m>
+			<y-m>0</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
+	  <name>rain-splash-p</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	 
+	<model>
+	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+	  <name>rain-splash-s</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+	  <name>tire-smoke-l</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>-3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+	  <name>tire-smoke-r</name>
+			<offsets>
+				<x-m>20.3180764</x-m>
+				<y-m>3.795</y-m>
+				<z-m>-3.9669424</z-m>
+			</offsets>
+	</model>
+	
+	<!-- wing condensation effect -->
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+	  <name>wing-condensation</name>
+	</model>
+	<model>
+	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+	  <name>wing-condensation</name>
+	</model>
 
 	<!-- Other non-aircraft models -->
 	<model>
@@ -406,42 +416,42 @@
 		</offsets>
 	</model>
 	
-	<!--Firetruck-->
+	<!-- Firetruck -->
 
-<model>
- <name>Firetruck1</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>60.0</x-m>
-  <y-m>10.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<model>
- <name>Firetruck2</name>
- <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
- <offsets>
-  <x-m>80.0</x-m>
-  <y-m>-8.0</y-m>
-  <z-m>-4.4</z-m>
- </offsets>
-</model>
-
-<animation>
-    <type>select</type>
-    <object-name>Firetruck1</object-name>
-    <object-name>Firetruck2</object-name>
-    <condition>
-        <and>
-            <property>sim/animation/fire-services</property>
-            <less-than>
-                <property>velocities/groundspeed-kt</property>
-                <value>40</value>
-            </less-than>
-        </and>
-    </condition>
-</animation>
+	<model>
+	 <name>Firetruck1</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>60.0</x-m>
+	  <y-m>10.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<model>
+	 <name>Firetruck2</name>
+	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+	 <offsets>
+	  <x-m>80.0</x-m>
+	  <y-m>-8.0</y-m>
+	  <z-m>-4.4</z-m>
+	 </offsets>
+	</model>
+	
+	<animation>
+	    <type>select</type>
+	    <object-name>Firetruck1</object-name>
+	    <object-name>Firetruck2</object-name>
+	    <condition>
+	        <and>
+	            <property>sim/animation/fire-services</property>
+	            <less-than>
+	                <property>velocities/groundspeed-kt</property>
+	                <value>40</value>
+	            </less-than>
+	        </and>
+	    </condition>
+	</animation>
 	
 	<!-- LIVERY SELECT -->
 	<!-- Animation -->
diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
index a9e1964c..ba5a6261 100755
--- a/Models/Effects/Moisture.xml
+++ b/Models/Effects/Moisture.xml
@@ -8,10 +8,10 @@
 		<emissive>false</emissive>
 		<lighting>false</lighting>
 		<offsets>
-			<x-m>3</x-m>
+			<x-m>0.5</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
-			<pitch-deg>-90</pitch-deg>
+			<z-m>-1</z-m>
+			<pitch-deg>0</pitch-deg>
 		</offsets>
 		
 		<attach>local</attach>
@@ -30,18 +30,18 @@
 				<spread>0</spread>
 			</speed>
 			<rotation-speed>
-				<x-min-deg-sec>0</x-min-deg-sec>
-				<y-min-deg-sec>0</y-min-deg-sec>
-				<z-min-deg-sec>0</z-min-deg-sec>
-				<x-max-deg-sec>0</x-max-deg-sec>
-				<y-max-deg-sec>0</y-max-deg-sec>
-				<z-max-deg-sec>0</z-max-deg-sec>
+				<x-min-deg-sec>180</x-min-deg-sec>
+				<y-min-deg-sec>180</y-min-deg-sec>
+				<z-min-deg-sec>180</z-min-deg-sec>
+				<x-max-deg-sec>-180</x-max-deg-sec>
+				<y-max-deg-sec>-180</y-max-deg-sec>
+				<z-max-deg-sec>-180</z-max-deg-sec>
 			</rotation-speed>
 		</shooter>
 		
 		<counter>
 			<particles-per-sec>
-				<value>150</value>
+				<value>100</value>
 				<spread>0</spread>
 			</particles-per-sec>
 		</counter>
@@ -54,7 +54,7 @@
 					<red>
 						<expression>
 							<product>
-								<value>1.0</value>
+								<value>0.9</value>
 								<property>rendering/scene/diffuse/red</property>
 							</product>
 						</expression>
@@ -62,7 +62,7 @@
 					<green>
 						<expression>
 							<product>
-								<value>1.0</value>
+								<value>0.9</value>
 								<property>rendering/scene/diffuse/red</property>
 							</product>
 						</expression>
@@ -70,17 +70,17 @@
 					<blue>
 						<expression>
 							<product>
-								<value>1.0</value>
+								<value>0.9</value>
 								<property>rendering/scene/diffuse/red</property>
 							</product>
 						</expression>
 					</blue>
 					<alpha>
-						<value>0.00000001</value>
+						<value>0.1</value>
 					</alpha>
 				</color>
 				<size>
-					<value>1</value>
+					<value>1.5</value>
 				</size>
 			</start>
 
@@ -89,7 +89,7 @@
 					<red>
 						<expression>
 							<product>
-								<value>0.7</value>
+								<value>0.9</value>
 								<property>rendering/scene/diffuse/red</property>
 							</product>
 						</expression>
@@ -97,7 +97,7 @@
 					<green>
 						<expression>
 							<product>
-								<value>0.7</value>
+								<value>0.9</value>
 								<property>rendering/scene/diffuse/red</property>
 							</product>
 						</expression>
@@ -105,7 +105,7 @@
 					<blue>
 						<expression>
 							<product>
-								<value>0.7</value>
+								<value>0.9</value>
 								<property>rendering/scene/diffuse/red</property>
 							</product>
 						</expression>
@@ -119,14 +119,14 @@
 				</size>
 			</end>
 	
-			<life-sec><value>0.4</value></life-sec>
+			<life-sec><value>0.001</value></life-sec>
 			<mass-kg>0.4</mass-kg>
 			<radius-m>0.1</radius-m>
 		</particle>
 		
 		<program>
 			<fluid>air</fluid>
-			<gravity type="bool">true</gravity>
+			<gravity type="bool">false</gravity>
 			<wind type="bool">false</wind>
 		</program>
 		
diff --git a/Models/Effects/engine-spray-reverse.xml b/Models/Effects/engine-spray-reverse.xml
index bf48ae9b..eb47f1e4 100644
--- a/Models/Effects/engine-spray-reverse.xml
+++ b/Models/Effects/engine-spray-reverse.xml
@@ -5,133 +5,88 @@
 	<particlesystem>
 		<name>engine-spray-reverse</name>
 		<texture>res/smoke.png</texture>
-		<emissive type="bool">false</emissive>
-		<lighting type="bool">false</lighting>
-		<offsets>
-			<x-m>0</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-			<pitch-deg>180</pitch-deg>
-		</offsets>				
+		<emissive>false</emissive>
+		<lighting>false</lighting>
 				
 		<attach>world</attach>
 		
-		<placer>
-			<type>point</type> 
-		</placer>
+			<placer>
+				<type>segments</type>
+				<vertex>
+					<x-m>1</x-m>
+					<y-m>3</y-m>
+					<z-m>-2</z-m>
+				</vertex>
+				<vertex>
+					<x-m>1</x-m>
+					<y-m>-3</y-m>
+					<z-m>-2</z-m>
+				</vertex>
+			</placer>
 		
 		<shooter>
-			<theta-min-deg>-1.5</theta-min-deg>
-			<theta-max-deg>1.5</theta-max-deg>
-			<phi-min-deg>-1.5</phi-min-deg>
-			<phi-max-deg>1.5</phi-max-deg>
-			<speed-mps>
-				<value>0</value>
-				<spread>0</spread>
-			</speed-mps>
-			<rotation-speed>
-				<x-min-deg-sec>0</x-min-deg-sec>
-				<y-min-deg-sec>0</y-min-deg-sec>
-				<z-min-deg-sec>0</z-min-deg-sec>
-				<x-max-deg-sec>0</x-max-deg-sec>
-				<y-max-deg-sec>0</y-max-deg-sec>
-				<z-max-deg-sec>0</z-max-deg-sec>
-			</rotation-speed>
+            <theta-min-deg>0</theta-min-deg>
+            <theta-max-deg>0</theta-max-deg>
+            <phi-min-deg>0</phi-min-deg>
+            <phi-max-deg>0</phi-max-deg>
+            <speed-mps>
+                <value>0</value>
+                <spread>0</spread>
+            </speed-mps>
+            <rotation-speed>
+                <x-max-deg-sec>180</x-max-deg-sec>
+                <x-min-deg-sec>180</x-min-deg-sec>
+                <y-max-deg-sec>180</y-max-deg-sec>
+                <y-min-deg-sec>-180</y-min-deg-sec>
+                <z-max-deg-sec>-180</z-max-deg-sec>
+                <z-min-deg-sec>-180</z-min-deg-sec>
+            </rotation-speed>
 		</shooter>
 		
 		<counter>
 			<particles-per-sec>
 			<value>50</value>
-			<spread>0</spread>
+			<spread>10</spread>
 			</particles-per-sec>
 		</counter>
 		
 		<align>billboard</align>
 		
 		<particle>
-			<start>
-				<color>
-					<red>
-						<expression>
-							<product>
-								<value>0.7</value>
-								<property>rendering/scene/diffuse/red</property>
-							</product>
-						</expression>
-					</red>
-					<green>
-						<expression>
-							<product>
-								<value>0.7</value>
-								<property>rendering/scene/diffuse/red</property>
-							</product>
-						</expression>
-					</green>
-					<blue>
-						<expression>
-							<product>
-								<value>0.7</value>
-								<property>rendering/scene/diffuse/red</property>
-							</product>
-						</expression>
-					</blue>
-					<alpha>
-						<value>0.3</value>
-					</alpha>
-				</color>
-				<size>
-					<value>2</value>
-				</size>
-			</start>
-
-			<end>
-				<color>
-					<red>
-						<expression>
-							<product>
-								<value>1.0</value>
-								<property>rendering/scene/diffuse/red</property>
-							</product>
-						</expression>
-					</red>
-					<green>
-						<expression>
-							<product>
-								<value>1.0</value>
-								<property>rendering/scene/diffuse/red</property>
-							</product>
-						</expression>
-					</green>
-					<blue>
-						<expression>
-							<product>
-								<value>1.0</value>
-								<property>rendering/scene/diffuse/red</property>
-							</product>
-						</expression>
-					</blue>
-					<alpha>
-						<value>0.00000001</value>
-					</alpha>
-				</color>
-				<size>
-					<value>3</value>
-				</size>
-			</end>
-
-			<life-sec>
-				<value>0.4</value>
-			</life-sec>
-
-			<mass-kg>0.5</mass-kg>
-			<radius-m>0.1</radius-m>
+         <start>
+             <color>
+                 <red><value>0.9</value></red>
+                 <green><value>0.9</value></green>
+                 <blue><value>0.9</value></blue>
+                 <alpha><value>0.04</value></alpha>
+             </color>
+             <size>
+                 <value>0.5</value>
+             </size>
+         </start>
+         <end>
+             <color>
+                 <red><value>1</value></red>
+                 <green><value>1</value></green>
+                 <blue><value>1</value></blue>
+                 <alpha><value>0.02</value></alpha>
+             </color>
+             <size>
+                 <value>10</value>
+             </size>
+         </end>
+         <life-sec>
+             <value>1</value>
+         </life-sec>
+         <mass-kg>0.025</mass-kg>
+         <radius-m>0.175</radius-m>
 		</particle>
-
-		<program>
-			<fluid>air</fluid>
-			<gravity type="bool">true</gravity>
-			<wind typ="bool">true</wind>
-		</program>
+				
+      <program>
+	      <fluid>air</fluid>
+	      <gravity>true</gravity>
+	      <wind>true</wind>
+      </program>
 	</particlesystem>
 
 </PropertyList>
\ No newline at end of file
diff --git a/Models/Effects/wing-condensation-L.xml b/Models/Effects/wing-condensation-L.xml
new file mode 100644
index 00000000..bec49baa
--- /dev/null
+++ b/Models/Effects/wing-condensation-L.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList>
+   <particlesystem>
+		<name>wing-condensation</name>
+		<texture>res/smoke.png</texture>
+		<emissive>false</emissive>
+		<lighting>false</lighting>
+		<type>normal</type>
+		<attach>world</attach>
+
+		<condition>
+			<and>
+				<or>
+				   <greater-than-equals>
+						<expression>
+							<sum>
+								<product>
+				         		<property>environment/relative-humidity</property>					         	
+					         	<value>0.1</value>
+								</product>
+								<property>systems/navigation/adr/output/aoa-1</property>						         	
+				         </sum>
+				      </expression>		      
+				      <value>13.5</value>
+				   </greater-than-equals>
+				   <greater-than-equals>
+						<expression>
+							<sum>
+								<product>
+				         		<property>environment/relative-humidity</property>
+					         	<value>0.1</value>
+								</product>						         	
+					         <property>systems/navigation/adr/output/aoa-2</property>
+				         </sum>
+				      </expression>		      
+				      <value>13.5</value>     
+				   </greater-than-equals>
+				   <greater-than-equals>
+						<expression>
+							<sum>
+								<product>
+				         		<property>environment/relative-humidity</property>					         	
+					         	<value>0.1</value>
+								</product>						         	
+				         	<property>systems/navigation/adr/output/aoa-3</property>
+				         </sum>
+				      </expression>		      
+				      <value>13.5</value>
+			   	</greater-than-equals>
+	         </or>
+			   <greater-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>100</value>
+	         </greater-than>
+	         <less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>210</value>
+	         </less-than>
+	         <greater-than>
+					<property>environment/relative-humidity</property>
+					<value>50</value>
+	         </greater-than>
+	         <less-than-equals>
+					<property>environment/temperature-degc</property>
+					<value>28</value>
+	         </less-than-equals>
+      		<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>0</value>
+				</greater-than>
+				<less-than>
+					<property>position/altitude-agl-ft</property>
+					<value>8000</value>
+				</less-than>
+	         <or>
+		         <greater-than>
+		         	<property>systems/navigation/adr/output/aoa-1</property>
+		         	<value>0</value>
+		         </greater-than>
+		         <greater-than>
+		         	<property>systems/navigation/adr/output/aoa-2</property>
+		         	<value>0</value>
+		         </greater-than>
+		         <greater-than>
+		         	<property>systems/navigation/adr/output/aoa-3</property>
+		         	<value>0</value>
+		         </greater-than>
+	         </or>
+			</and>
+		</condition>
+
+		<placer>
+			<type>segments</type>
+			<vertex>
+				<x-m>15</x-m>
+				<y-m>-2.3</y-m>
+				<z-m>0</z-m>
+			</vertex>
+			<vertex>
+				<x-m>23</x-m>
+				<y-m>-16</y-m>
+				<z-m>0.7</z-m>
+			</vertex>
+			<vertex>
+				<x-m>21</x-m>
+				<y-m>-2.3</y-m>
+				<z-m>-1</z-m>
+			</vertex>
+		</placer>
+
+     <shooter>
+         <theta-min-deg>
+   			<!-- <expression>
+					<sum>
+		         	<value>70</value>
+		         	<property>systems/navigation/adr/output/aoa-1</property>
+		         </sum>
+		      </expression> -->
+		      <value>90</value>
+         </theta-min-deg>
+         <theta-max-deg>
+   			<!-- <expression>
+					<sum>
+		         	<value>110</value>
+		         	<property>systems/navigation/adr/output/aoa-1</property>
+		         </sum>
+		      </expression> -->
+		      <value>90</value>        
+         </theta-max-deg>
+         <phi-min-deg>90</phi-min-deg>
+         <phi-max-deg>90</phi-max-deg>
+         <speed-mps>
+            <value>0</value>
+            <spread>0</spread>
+         </speed-mps>
+         <rotation-speed>
+             <x-max-deg-sec>180</x-max-deg-sec>
+             <x-min-deg-sec>180</x-min-deg-sec>
+             <y-max-deg-sec>180</y-max-deg-sec>
+             <y-min-deg-sec>-180</y-min-deg-sec>
+             <z-max-deg-sec>-180</z-max-deg-sec>
+             <z-min-deg-sec>-180</z-min-deg-sec>
+         </rotation-speed>
+     </shooter>
+
+     <counter>
+         <particles-per-sec>
+			<value>400</value>
+			<spread>10</spread>
+         </particles-per-sec>
+     </counter>
+
+     <align>billboard</align>
+
+     <particle>
+         <start>
+             <color>
+                 <red><value>0.9</value></red>
+                 <green><value>0.9</value></green>
+                 <blue><value>0.9</value></blue>
+                 <alpha><value>0.04</value></alpha>
+             </color>
+             <size>
+                 <value>1.5</value>
+             </size>
+         </start>
+         <end>
+             <color>
+                 <red><value>1</value></red>
+                 <green><value>1</value></green>
+                 <blue><value>1</value></blue>
+                 <alpha><value>0.02</value></alpha>
+             </color>
+             <size>
+                 <value>2</value>
+             </size>
+         </end>
+         <life-sec>
+             <value>0.001</value>
+         </life-sec>
+         <mass-kg>0.025</mass-kg>
+         <radius-m>0.175</radius-m>
+     </particle>
+
+     <program>
+         <fluid>air</fluid>
+         <gravity>true</gravity>
+         <wind>true</wind>
+     </program>
+
+	</particlesystem>
+
+</PropertyList>
\ No newline at end of file
diff --git a/Models/Effects/wing-condensation-R.xml b/Models/Effects/wing-condensation-R.xml
new file mode 100644
index 00000000..1fe8b45e
--- /dev/null
+++ b/Models/Effects/wing-condensation-R.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList>
+   <particlesystem>
+		<name>wing-condensation</name>
+		<texture>res/smoke.png</texture>
+		<emissive>false</emissive>
+		<lighting>false</lighting>
+		
+		<attach>world</attach>
+
+		<condition>
+			<and>
+				<or>
+				   <greater-than-equals>
+						<expression>
+							<sum>
+								<product>
+				         		<property>environment/relative-humidity</property>					         	
+					         	<value>0.1</value>
+								</product>
+								<property>systems/navigation/adr/output/aoa-1</property>						         	
+				         </sum>
+				      </expression>		      
+				      <value>13.5</value>
+				   </greater-than-equals>
+				   <greater-than-equals>
+						<expression>
+							<sum>
+								<product>
+				         		<property>environment/relative-humidity</property>
+					         	<value>0.1</value>
+								</product>						         	
+					         <property>systems/navigation/adr/output/aoa-2</property>
+				         </sum>
+				      </expression>		      
+				      <value>13.5</value>     
+				   </greater-than-equals>
+				   <greater-than-equals>
+						<expression>
+							<sum>
+								<product>
+				         		<property>environment/relative-humidity</property>					         	
+					         	<value>0.1</value>
+								</product>						         	
+				         	<property>systems/navigation/adr/output/aoa-3</property>
+				         </sum>
+				      </expression>		      
+				      <value>13.5</value>
+			   	</greater-than-equals>
+	         </or>
+			   <greater-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>100</value>
+	         </greater-than>
+	         <less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>210</value>
+	         </less-than>
+	         <greater-than>
+					<property>environment/relative-humidity</property>
+					<value>50</value>
+	         </greater-than>
+	         <less-than-equals>
+					<property>environment/temperature-degc</property>
+					<value>28</value>
+	         </less-than-equals>
+      		<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>0</value>
+				</greater-than>
+				<less-than>
+					<property>position/altitude-agl-ft</property>
+					<value>8000</value>
+				</less-than>
+	         <or>
+		         <greater-than>
+		         	<property>systems/navigation/adr/output/aoa-1</property>
+		         	<value>0</value>
+		         </greater-than>
+		         <greater-than>
+		         	<property>systems/navigation/adr/output/aoa-2</property>
+		         	<value>0</value>
+		         </greater-than>
+		         <greater-than>
+		         	<property>systems/navigation/adr/output/aoa-3</property>
+		         	<value>0</value>
+		         </greater-than>
+	         </or>
+			</and>
+		</condition>
+
+		<placer>
+			<type>segments</type>
+			<vertex>
+				<x-m>15</x-m>
+				<y-m>2.3</y-m>
+				<z-m>0</z-m>
+			</vertex>
+			<vertex>
+				<x-m>23</x-m>
+				<y-m>16</y-m>
+				<z-m>0.7</z-m>
+			</vertex>
+			<vertex>
+				<x-m>21</x-m>
+				<y-m>2.3</y-m>
+				<z-m>-1</z-m>
+			</vertex>
+		</placer>
+
+     <shooter>
+         <theta-min-deg>90</theta-min-deg>
+         <theta-max-deg>90</theta-max-deg>
+         <phi-min-deg>90</phi-min-deg>
+         <phi-max-deg>90</phi-max-deg>
+         <speed-mps>
+            <!-- <expression>
+            	<product>
+            		<property>velocities/groundspeed-kt</property>
+             		<value>-1</value>
+             	</product>
+				</expression> -->             
+            <value>0</value>
+            <spread>0</spread>
+         </speed-mps>
+         <rotation-speed>
+             <x-max-deg-sec>180</x-max-deg-sec>
+             <x-min-deg-sec>180</x-min-deg-sec>
+             <y-max-deg-sec>180</y-max-deg-sec>
+             <y-min-deg-sec>-180</y-min-deg-sec>
+             <z-max-deg-sec>-180</z-max-deg-sec>
+             <z-min-deg-sec>-180</z-min-deg-sec>
+         </rotation-speed>
+     </shooter>
+
+     <counter>
+         <particles-per-sec>
+			<value>400</value>
+			<spread>10</spread>
+         </particles-per-sec>
+     </counter>
+
+     <align>billboard</align>
+
+     <particle>
+         <start>
+             <color>
+                 <red><value>0.9</value></red>
+                 <green><value>0.9</value></green>
+                 <blue><value>0.9</value></blue>
+                 <alpha><value>0.04</value></alpha>
+             </color>
+             <size>
+                 <value>1.5</value>
+             </size>
+         </start>
+         <end>
+             <color>
+                 <red><value>1</value></red>
+                 <green><value>1</value></green>
+                 <blue><value>1</value></blue>
+                 <alpha><value>0.02</value></alpha>
+             </color>
+             <size>
+                 <value>2</value>
+             </size>
+         </end>
+         <life-sec>
+             <value>0.001</value>
+         </life-sec>
+         <mass-kg>0.025</mass-kg>
+         <radius-m>0.175</radius-m>
+     </particle>
+
+     <program>
+         <fluid>air</fluid>
+         <gravity>true</gravity>
+         <wind>true</wind>
+     </program>
+
+	</particlesystem>
+
+</PropertyList>
\ No newline at end of file
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index c8d5658c..f336412e 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -86,32 +86,32 @@
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
 		<name>moisture</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1</property>
-					<value>60</value>
-				</greater-than>
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>60</value>
+				</greater-than>
+			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -122,33 +122,33 @@
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
 		<name>engine-spray</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-			</and>
+					<value>0</value>
+				</equals>
+			</and>
 		</condition>
 		<offsets>
 			<x-m>4.875</x-m>
@@ -161,34 +161,34 @@
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
 		<name>engine-spray-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0.75</value>
-				</greater-than>
-			</and>
+					<value>0.75</value>
+				</greater-than>
+			</and>
 		</condition>
 		<offsets>
-			<x-m>0.875</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
  
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index 16498a1f..cb14ee2a 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -114,7 +114,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -189,9 +189,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>0.875</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
  
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index 6f25c156..4b9cc78a 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -98,7 +98,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -173,9 +173,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>1.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-1</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index 880418f4..2ff06690 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -98,7 +98,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -173,9 +173,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>1.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-1</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml
index db90d4f7..d0dde8dd 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml
@@ -100,7 +100,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -175,9 +175,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>0.875</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml
index 118b61ab..eced7f50 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml
@@ -75,32 +75,32 @@
 	<model>
 		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1</property>
-					<value>60</value>
-				</greater-than>
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>60</value>
+				</greater-than>
+			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -111,33 +111,33 @@
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
 		<name>engine-spray</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-			</and>
+					<value>0</value>
+				</equals>
+			</and>
 		</condition>
 		<offsets>
 			<x-m>4.875</x-m>
@@ -150,34 +150,34 @@
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
 		<name>engine-spray-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0.75</value>
-				</greater-than>
-			</and>
+					<value>0.75</value>
+				</greater-than>
+			</and>
 		</condition>
 		<offsets>
-			<x-m>0.875</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index c3ec8c37..4ff14096 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -97,7 +97,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -172,9 +172,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>0.875</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
 
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index 82e9b2b9..6d63f568 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -97,7 +97,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>-0.5</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 			<pitch-deg>0</pitch-deg>
@@ -172,9 +172,9 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>0.875</x-m>
+			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>-2.5</z-m>
+			<z-m>0</z-m>
 		</offsets>
 	</model>
 

From 163b191464545b56d518cb0cc94bf61484fac05c Mon Sep 17 00:00:00 2001
From: vezza <vezza@inwind.it>
Date: Mon, 16 Mar 2020 17:01:57 +0100
Subject: [PATCH 2/5] condensation and spray's improvements

---
 Models/Effects/Moisture-neo.xml               | 146 ++++++++++++++++++
 Models/Effects/Moisture.xml                   |  50 +++---
 Models/Effects/engine-spray-reverse.xml       | 111 ++++++++++---
 Models/Effects/engine-spray.xml               | 127 +++++++++++----
 Models/Effects/wing-condensation-L.xml        | 129 ++++++++++++----
 Models/Effects/wing-condensation-R.xml        | 145 +++++++++++++----
 Models/Engines/NEO/LeapXLeft.xml              |  25 +--
 Models/Engines/NEO/LeapXRight.xml             |  25 +--
 Models/Engines/NEO/PW1100GLeft.xml            |  21 +--
 Models/Engines/NEO/PW1100GRight.xml           |  21 +--
 Models/Engines/XMLs/a320.engine.cfm.left.xml  |  21 +--
 Models/Engines/XMLs/a320.engine.cfm.right.xml |  21 +--
 Models/Engines/XMLs/a320.engine.iae.left.xml  |  19 +--
 Models/Engines/XMLs/a320.engine.iae.right.xml |  19 +--
 14 files changed, 583 insertions(+), 297 deletions(-)
 create mode 100644 Models/Effects/Moisture-neo.xml

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 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+	<particlesystem>
+		<!-- <type>trail</type>-->
+		<name>moisture</name>
+		<texture>res/smoke.png</texture>
+		<emissive>false</emissive>
+		<lighting>false</lighting>
+		<offsets>
+			<x-m>0.3</x-m>
+			<y-m>0</y-m>
+			<z-m>-1.3</z-m>
+			<pitch-deg>0</pitch-deg>
+		</offsets>
+		
+		<attach>local</attach>
+		
+		<placer>
+			<type>point</type>
+		</placer>
+		
+		<shooter>
+			<theta-min-deg>0</theta-min-deg>
+			<theta-max-deg>0</theta-max-deg>
+			<phi-min-deg>0</phi-min-deg>
+			<phi-max-deg>0</phi-max-deg>
+			<speed>
+				<value>0</value>
+				<spread>0</spread>
+			</speed>
+			<rotation-speed>
+				<x-min-deg-sec>180</x-min-deg-sec>
+				<y-min-deg-sec>180</y-min-deg-sec>
+				<z-min-deg-sec>180</z-min-deg-sec>
+				<x-max-deg-sec>-180</x-max-deg-sec>
+				<y-max-deg-sec>-180</y-max-deg-sec>
+				<z-max-deg-sec>-180</z-max-deg-sec>
+			</rotation-speed>
+		</shooter>
+		
+		<counter>
+			<particles-per-sec>
+				<value>50</value>
+				<spread>0</spread>
+			</particles-per-sec>
+		</counter>
+		
+		<align>billboard</align>
+		
+		<particle>
+			<start>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.002</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+				<size>
+					<value>1.3</value>
+				</size>
+			</start>
+
+			<end>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.0008</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+				<size>
+					<value>1.6</value>
+				</size>
+			</end>
+	
+			<life-sec><value>0.0001</value></life-sec>
+			<mass-kg>0.4</mass-kg>
+			<radius-m>0.1</radius-m>
+		</particle>
+		
+		<program>
+			<fluid>air</fluid>
+			<gravity type="bool">false</gravity>
+			<wind type="bool">false</wind>
+		</program>
+		
+	</particlesystem>
+
+</PropertyList>
+
diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
index ba5a6261..bd85dcc7 100755
--- a/Models/Effects/Moisture.xml
+++ b/Models/Effects/Moisture.xml
@@ -8,9 +8,9 @@
 		<emissive>false</emissive>
 		<lighting>false</lighting>
 		<offsets>
-			<x-m>0.5</x-m>
+			<x-m>0.3</x-m>
 			<y-m>0</y-m>
-			<z-m>-1</z-m>
+			<z-m>-1.3</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 		
@@ -41,7 +41,7 @@
 		
 		<counter>
 			<particles-per-sec>
-				<value>100</value>
+				<value>50</value>
 				<spread>0</spread>
 			</particles-per-sec>
 		</counter>
@@ -54,33 +54,38 @@
 					<red>
 						<expression>
 							<product>
-								<value>0.9</value>
-								<property>rendering/scene/diffuse/red</property>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
 							</product>
 						</expression>
 					</red>
 					<green>
 						<expression>
 							<product>
-								<value>0.9</value>
-								<property>rendering/scene/diffuse/red</property>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
 							</product>
 						</expression>
 					</green>
 					<blue>
 						<expression>
 							<product>
-								<value>0.9</value>
-								<property>rendering/scene/diffuse/red</property>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
 							</product>
 						</expression>
 					</blue>
 					<alpha>
-						<value>0.1</value>
+						<expression>
+							<product>
+								<value>0.003</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
 					</alpha>
 				</color>
 				<size>
-					<value>1.5</value>
+					<value>1</value>
 				</size>
 			</start>
 
@@ -89,37 +94,42 @@
 					<red>
 						<expression>
 							<product>
-								<value>0.9</value>
-								<property>rendering/scene/diffuse/red</property>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
 							</product>
 						</expression>
 					</red>
 					<green>
 						<expression>
 							<product>
-								<value>0.9</value>
-								<property>rendering/scene/diffuse/red</property>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
 							</product>
 						</expression>
 					</green>
 					<blue>
 						<expression>
 							<product>
-								<value>0.9</value>
-								<property>rendering/scene/diffuse/red</property>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
 							</product>
 						</expression>
 					</blue>
 					<alpha>
-						<value>0.3</value>
+						<expression>
+							<product>
+								<value>0.0009</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
 					</alpha>
 				</color>
 				<size>
-					<value>2</value>
+					<value>1.5</value>
 				</size>
 			</end>
 	
-			<life-sec><value>0.001</value></life-sec>
+			<life-sec><value>0.0001</value></life-sec>
 			<mass-kg>0.4</mass-kg>
 			<radius-m>0.1</radius-m>
 		</particle>
diff --git a/Models/Effects/engine-spray-reverse.xml b/Models/Effects/engine-spray-reverse.xml
index eb47f1e4..55517756 100644
--- a/Models/Effects/engine-spray-reverse.xml
+++ b/Models/Effects/engine-spray-reverse.xml
@@ -15,12 +15,12 @@
 				<vertex>
 					<x-m>1</x-m>
 					<y-m>3</y-m>
-					<z-m>-2</z-m>
+					<z-m>-1</z-m>
 				</vertex>
 				<vertex>
 					<x-m>1</x-m>
 					<y-m>-3</y-m>
-					<z-m>-2</z-m>
+					<z-m>-1</z-m>
 				</vertex>
 			</placer>
 		
@@ -30,23 +30,28 @@
             <phi-min-deg>0</phi-min-deg>
             <phi-max-deg>0</phi-max-deg>
             <speed-mps>
-                <value>0</value>
-                <spread>0</spread>
+                <value>10</value>
+                <spread>1</spread>
             </speed-mps>
             <rotation-speed>
                 <x-max-deg-sec>180</x-max-deg-sec>
-                <x-min-deg-sec>180</x-min-deg-sec>
+                <x-min-deg-sec>-180</x-min-deg-sec>
                 <y-max-deg-sec>180</y-max-deg-sec>
                 <y-min-deg-sec>-180</y-min-deg-sec>
-                <z-max-deg-sec>-180</z-max-deg-sec>
+                <z-max-deg-sec>180</z-max-deg-sec>
                 <z-min-deg-sec>-180</z-min-deg-sec>
             </rotation-speed>
 		</shooter>
 		
 		<counter>
 			<particles-per-sec>
-			<value>50</value>
-			<spread>10</spread>
+				<expression>
+					<product>
+						<property>environment/surface/wetness</property>
+						<value>50</value>
+					</product>
+				</expression>
+				<spread>0</spread>
 			</particles-per-sec>
 		</counter>
 		
@@ -54,29 +59,85 @@
 		
 		<particle>
          <start>
-             <color>
-                 <red><value>0.9</value></red>
-                 <green><value>0.9</value></green>
-                 <blue><value>0.9</value></blue>
-                 <alpha><value>0.04</value></alpha>
-             </color>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.2</value>
+								<property>environment/surface/wetness</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
              <size>
-                 <value>0.5</value>
+                 <value>5</value>
              </size>
          </start>
          <end>
-             <color>
-                 <red><value>1</value></red>
-                 <green><value>1</value></green>
-                 <blue><value>1</value></blue>
-                 <alpha><value>0.02</value></alpha>
-             </color>
-             <size>
-                 <value>10</value>
-             </size>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.1</value>
+								<property>environment/surface/wetness</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+            <size>
+            	<value>10</value>
+            </size>
          </end>
          <life-sec>
-             <value>1</value>
+             <value>0.5</value>
          </life-sec>
          <mass-kg>0.025</mass-kg>
          <radius-m>0.175</radius-m>
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 @@
 			</placer>
 
         <shooter>
-            <theta-min-deg>15</theta-min-deg>
-            <theta-max-deg>60</theta-max-deg>
-            <phi-min-deg>-5</phi-min-deg>
-            <phi-max-deg>5</phi-max-deg>
+            <theta-min-deg>0</theta-min-deg>
+            <theta-max-deg>0</theta-max-deg>
+            <phi-min-deg>0</phi-min-deg>
+            <phi-max-deg>0</phi-max-deg>
             <speed-mps>
                 <value>250</value>
                 <spread>15</spread>
             </speed-mps>
             <rotation-speed>
-                <x-max-deg-sec>15</x-max-deg-sec>
-                <x-min-deg-sec>-15</x-min-deg-sec>
-                <y-max-deg-sec>15</y-max-deg-sec>
-                <y-min-deg-sec>-15</y-min-deg-sec>
-                <z-max-deg-sec>15</z-max-deg-sec>
-                <z-min-deg-sec>-15</z-min-deg-sec>
+                <x-max-deg-sec>180</x-max-deg-sec>
+                <x-min-deg-sec>-180</x-min-deg-sec>
+                <y-max-deg-sec>180</y-max-deg-sec>
+                <y-min-deg-sec>-180</y-min-deg-sec>
+                <z-max-deg-sec>180</z-max-deg-sec>
+                <z-min-deg-sec>-180</z-min-deg-sec>
             </rotation-speed>
         </shooter>
 
         <counter>
-            <particles-per-sec>
-				<value>100</value>
+        	<particles-per-sec>
+				<expression>
+					<product>
+						<property>environment/surface/wetness</property>
+						<value>100</value>
+					</product>
+				</expression>
 				<spread>10</spread>
-            </particles-per-sec>
+        	</particles-per-sec>
         </counter>
 
         <align>billboard</align>
@@ -55,26 +60,82 @@
         <particle>
             <start>
                 <color>
-                    <red><value>0.9</value></red>
-                    <green><value>0.9</value></green>
-                    <blue><value>0.9</value></blue>
-                    <alpha><value>0.04</value></alpha>
-                </color>
-                <size>
-                    <value>0.5</value>
-                </size>
-            </start>
-            <end>
-                <color>
-                    <red><value>1</value></red>
-                    <green><value>1</value></green>
-                    <blue><value>1</value></blue>
-                    <alpha><value>0.02</value></alpha>
-                </color>
-                <size>
-                    <value>10</value>
-                </size>
-            </end>
+						<red>
+							<expression>
+								<product>
+									<value>0.01</value>
+									<property>environment/relative-humidity</property>
+								</product>
+							</expression>
+						</red>
+						<green>
+							<expression>
+								<product>
+									<value>0.01</value>
+									<property>environment/relative-humidity</property>
+								</product>
+							</expression>
+						</green>
+						<blue>
+							<expression>
+								<product>
+									<value>0.01</value>
+									<property>environment/relative-humidity</property>
+								</product>
+							</expression>
+						</blue>
+						<alpha>
+							<expression>
+								<product>
+									<property>environment/surface/wetness</property>
+									<value>0.05</value>
+								</product>
+							</expression>
+						</alpha>
+	             </color>
+	             <size>
+	                 <value>5</value>
+	             </size>
+	         </start>
+	         <end>
+	             <color>
+						<red>
+							<expression>
+								<product>
+									<value>0.01</value>
+									<property>environment/relative-humidity</property>
+								</product>
+							</expression>
+						</red>
+						<green>
+							<expression>
+								<product>
+									<value>0.01</value>
+									<property>environment/relative-humidity</property>
+								</product>
+							</expression>
+						</green>
+						<blue>
+							<expression>
+								<product>
+									<value>0.01</value>
+									<property>environment/relative-humidity</property>
+								</product>
+							</expression>
+						</blue>
+						<alpha>
+							<expression>
+								<product>
+									<property>environment/surface/wetness</property>
+									<value>0.02</value>
+								</product>
+							</expression>
+						</alpha>
+	             </color>
+	             <size>
+	                 <value>10</value>
+	             </size>
+	         </end>
             <life-sec>
                 <value>1.0</value>
             </life-sec>
diff --git a/Models/Effects/wing-condensation-L.xml b/Models/Effects/wing-condensation-L.xml
index bec49baa..b826cdcd 100644
--- a/Models/Effects/wing-condensation-L.xml
+++ b/Models/Effects/wing-condensation-L.xml
@@ -7,7 +7,7 @@
 		<emissive>false</emissive>
 		<lighting>false</lighting>
 		<type>normal</type>
-		<attach>world</attach>
+		<attach>local</attach>
 
 		<condition>
 			<and>
@@ -65,13 +65,13 @@
 					<property>environment/temperature-degc</property>
 					<value>28</value>
 	         </less-than-equals>
-      		<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>0</value>
-				</greater-than>
-				<less-than>
-					<property>position/altitude-agl-ft</property>
-					<value>8000</value>
+      		<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>0</value>
+				</greater-than>
+				<less-than>
+					<property>position/altitude-agl-ft</property>
+					<value>8000</value>
 				</less-than>
 	         <or>
 		         <greater-than>
@@ -98,12 +98,12 @@
 				<z-m>0</z-m>
 			</vertex>
 			<vertex>
-				<x-m>23</x-m>
+				<x-m>22</x-m>
 				<y-m>-16</y-m>
 				<z-m>0.7</z-m>
 			</vertex>
 			<vertex>
-				<x-m>21</x-m>
+				<x-m>19</x-m>
 				<y-m>-2.3</y-m>
 				<z-m>-1</z-m>
 			</vertex>
@@ -131,6 +131,12 @@
          <phi-min-deg>90</phi-min-deg>
          <phi-max-deg>90</phi-max-deg>
          <speed-mps>
+            <!-- <expression>
+            	<product>
+            		<property>velocities/groundspeed-kt</property>
+             		<value>-1</value>
+             	</product>
+				</expression> -->             
             <value>0</value>
             <spread>0</spread>
          </speed-mps>
@@ -146,7 +152,12 @@
 
      <counter>
          <particles-per-sec>
-			<value>400</value>
+			<expression>
+				<product>
+					<value>4</value>
+					<property>environment/relative-humidity</property>
+				</product>
+			</expression>
 			<spread>10</spread>
          </particles-per-sec>
      </counter>
@@ -155,29 +166,85 @@
 
      <particle>
          <start>
-             <color>
-                 <red><value>0.9</value></red>
-                 <green><value>0.9</value></green>
-                 <blue><value>0.9</value></blue>
-                 <alpha><value>0.04</value></alpha>
-             </color>
-             <size>
-                 <value>1.5</value>
-             </size>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.0007</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+				<size>
+					<value>1.5</value>
+				</size>
          </start>
          <end>
-             <color>
-                 <red><value>1</value></red>
-                 <green><value>1</value></green>
-                 <blue><value>1</value></blue>
-                 <alpha><value>0.02</value></alpha>
-             </color>
-             <size>
-                 <value>2</value>
-             </size>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.00001</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+            <size>
+            	<value>2</value>
+            </size>
          </end>
          <life-sec>
-             <value>0.001</value>
+             <value>0.00001</value>
          </life-sec>
          <mass-kg>0.025</mass-kg>
          <radius-m>0.175</radius-m>
@@ -191,4 +258,4 @@
 
 	</particlesystem>
 
-</PropertyList>
\ No newline at end of file
+</PropertyList>
diff --git a/Models/Effects/wing-condensation-R.xml b/Models/Effects/wing-condensation-R.xml
index 1fe8b45e..62d524a4 100644
--- a/Models/Effects/wing-condensation-R.xml
+++ b/Models/Effects/wing-condensation-R.xml
@@ -6,8 +6,8 @@
 		<texture>res/smoke.png</texture>
 		<emissive>false</emissive>
 		<lighting>false</lighting>
-		
-		<attach>world</attach>
+		<type>normal</type>
+		<attach>local</attach>
 
 		<condition>
 			<and>
@@ -65,13 +65,13 @@
 					<property>environment/temperature-degc</property>
 					<value>28</value>
 	         </less-than-equals>
-      		<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>0</value>
-				</greater-than>
-				<less-than>
-					<property>position/altitude-agl-ft</property>
-					<value>8000</value>
+      		<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>0</value>
+				</greater-than>
+				<less-than>
+					<property>position/altitude-agl-ft</property>
+					<value>8000</value>
 				</less-than>
 	         <or>
 		         <greater-than>
@@ -98,20 +98,36 @@
 				<z-m>0</z-m>
 			</vertex>
 			<vertex>
-				<x-m>23</x-m>
+				<x-m>22</x-m>
 				<y-m>16</y-m>
 				<z-m>0.7</z-m>
 			</vertex>
 			<vertex>
-				<x-m>21</x-m>
+				<x-m>19</x-m>
 				<y-m>2.3</y-m>
 				<z-m>-1</z-m>
 			</vertex>
 		</placer>
 
      <shooter>
-         <theta-min-deg>90</theta-min-deg>
-         <theta-max-deg>90</theta-max-deg>
+         <theta-min-deg>
+   			<!-- <expression>
+					<sum>
+		         	<value>70</value>
+		         	<property>systems/navigation/adr/output/aoa-1</property>
+		         </sum>
+		      </expression> -->
+		      <value>90</value>
+         </theta-min-deg>
+         <theta-max-deg>
+   			<!-- <expression>
+					<sum>
+		         	<value>110</value>
+		         	<property>systems/navigation/adr/output/aoa-1</property>
+		         </sum>
+		      </expression> -->
+		      <value>90</value>        
+         </theta-max-deg>
          <phi-min-deg>90</phi-min-deg>
          <phi-max-deg>90</phi-max-deg>
          <speed-mps>
@@ -136,7 +152,12 @@
 
      <counter>
          <particles-per-sec>
-			<value>400</value>
+			<expression>
+				<product>
+					<value>4</value>
+					<property>environment/relative-humidity</property>
+				</product>
+			</expression>
 			<spread>10</spread>
          </particles-per-sec>
      </counter>
@@ -145,29 +166,85 @@
 
      <particle>
          <start>
-             <color>
-                 <red><value>0.9</value></red>
-                 <green><value>0.9</value></green>
-                 <blue><value>0.9</value></blue>
-                 <alpha><value>0.04</value></alpha>
-             </color>
-             <size>
-                 <value>1.5</value>
-             </size>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.0007</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+				<size>
+					<value>1.5</value>
+				</size>
          </start>
          <end>
-             <color>
-                 <red><value>1</value></red>
-                 <green><value>1</value></green>
-                 <blue><value>1</value></blue>
-                 <alpha><value>0.02</value></alpha>
-             </color>
-             <size>
-                 <value>2</value>
-             </size>
+				<color>
+					<red>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</red>
+					<green>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</green>
+					<blue>
+						<expression>
+							<product>
+								<value>0.01</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</blue>
+					<alpha>
+						<expression>
+							<product>
+								<value>0.00001</value>
+								<property>environment/relative-humidity</property>
+							</product>
+						</expression>
+					</alpha>
+				</color>
+            <size>
+            	<value>2</value>
+            </size>
          </end>
          <life-sec>
-             <value>0.001</value>
+             <value>0.00001</value>
          </life-sec>
          <mass-kg>0.025</mass-kg>
          <radius-m>0.175</radius-m>
@@ -181,4 +258,4 @@
 
 	</particlesystem>
 
-</PropertyList>
\ No newline at end of file
+</PropertyList>
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index f336412e..5c4f9b4f 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -51,24 +51,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[0]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[0]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
@@ -84,7 +67,7 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/Moisture-neo.xml</path>
 		<name>moisture</name>
 		<condition>
 			<and>
@@ -113,7 +96,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
+			<z-m>0.4</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
@@ -186,7 +169,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>0</x-m>
+			<x-m>-1.0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 		</offsets>
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index cb14ee2a..97de13b0 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -51,24 +51,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[1]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[1]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
@@ -84,7 +67,7 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/Moisture-neo.xml</path>
 		<name>moisture</name>
 		<condition>
 			<and>
@@ -116,7 +99,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
+			<z-m>0.4</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
@@ -189,7 +172,7 @@
 			</and>
 		</condition>
 		<offsets>
-			<x-m>0</x-m>
+			<x-m>-1.0</x-m>
 			<y-m>0</y-m>
 			<z-m>0</z-m>
 		</offsets>
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index 4b9cc78a..bd6f2c98 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -38,24 +38,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[0]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[0]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
@@ -71,7 +54,7 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/Moisture-neo.xml</path>
 		<name>moisture</name>
 		<condition>
 			<and>
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index 2ff06690..c36d3b8c 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -38,24 +38,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[1]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[1]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
@@ -71,7 +54,7 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+		<path>Aircraft/A320-family/Models/Effects/Moisture-neo.xml</path>
 		<name>moisture</name>
 		<condition>
 			<and>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml
index d0dde8dd..da757af4 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml
@@ -40,24 +40,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[0]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[0]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
@@ -102,7 +85,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
+			<z-m>0.3</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml
index eced7f50..5fc32f21 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml
@@ -40,24 +40,7 @@
 		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[1]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[1]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
@@ -102,7 +85,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
+			<z-m>0.3</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index 4ff14096..c2437dcc 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -37,24 +37,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>		
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[0]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[0]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index 6d63f568..1c40e9cd 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -37,24 +37,7 @@
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<name>contrail</name>
 		<condition>
-			<and>
-				<greater-than>
-					<property>engines/engine[1]/n2-actual</property>
-					<value>50</value>
-				</greater-than>
-				<greater-than>
-					<property>position/altitude-ft</property>
-					<value>19000</value>
-				</greater-than>
-				<less-than>
-					<property>environment/temperature-degc</property>
-					<value>-30</value>
-				</less-than>
-				<equals>
-					<property>engines/engine[1]/state</property>
-					<value>3</value>
-				</equals>
-			</and>
+			<property>environment/contrail</property>
 		</condition>
 		<overlay>
 			<params>

From 1d1e8a44dae77868f935131746ccbb0384a85d1c Mon Sep 17 00:00:00 2001
From: vezza <vezza@inwind.it>
Date: Mon, 16 Mar 2020 21:12:19 +0100
Subject: [PATCH 3/5] fix IAE engine's condensation position

---
 Models/Effects/Moisture.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
index bd85dcc7..50f883d2 100755
--- a/Models/Effects/Moisture.xml
+++ b/Models/Effects/Moisture.xml
@@ -10,7 +10,7 @@
 		<offsets>
 			<x-m>0.3</x-m>
 			<y-m>0</y-m>
-			<z-m>-1.3</z-m>
+			<z-m>-1</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 		

From ccb07400814e531169099d4f976136ae6f6a96ea Mon Sep 17 00:00:00 2001
From: vezza <vezza@inwind.it>
Date: Tue, 17 Mar 2020 17:21:23 +0100
Subject: [PATCH 4/5] fix IAE engine's moisture position

---
 Models/Effects/Moisture.xml                   | 4 ++--
 Models/Engines/XMLs/a320.engine.iae.left.xml  | 2 +-
 Models/Engines/XMLs/a320.engine.iae.right.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
index 50f883d2..60339b46 100755
--- a/Models/Effects/Moisture.xml
+++ b/Models/Effects/Moisture.xml
@@ -85,7 +85,7 @@
 					</alpha>
 				</color>
 				<size>
-					<value>1</value>
+					<value>1.0</value>
 				</size>
 			</start>
 
@@ -125,7 +125,7 @@
 					</alpha>
 				</color>
 				<size>
-					<value>1.5</value>
+					<value>1.4</value>
 				</size>
 			</end>
 	
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index c2437dcc..75b42c6f 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -82,7 +82,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
+			<z-m>0.3</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index 1c40e9cd..fb91e1ea 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -82,7 +82,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0</z-m>
+			<z-m>0.3</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>

From 51f7b1cd6f63f398c5876ba3146ac906cc6d7898 Mon Sep 17 00:00:00 2001
From: fly <merspieler@airmail.cc>
Date: Wed, 18 Mar 2020 21:29:23 +0000
Subject: [PATCH 5/5] Stop moisture effect from leaking through the model

Signed-off-by: fly <merspieler@airmail.cc>
---
 Models/Engines/XMLs/a320.engine.iae.left.xml  | 2 +-
 Models/Engines/XMLs/a320.engine.iae.right.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index 75b42c6f..987352f5 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -82,7 +82,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0.3</z-m>
+			<z-m>0.5</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index fb91e1ea..0242b1d0 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -82,7 +82,7 @@
 		<offsets>
 			<x-m>0</x-m>
 			<y-m>0</y-m>
-			<z-m>0.3</z-m>
+			<z-m>0.5</z-m>
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>