From 93f51dfea3f7030e27f2bcc3c8d2e459a7985903 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 9 Nov 2016 17:25:51 -0500
Subject: [PATCH] fix wings/livery over MP -thanks jomo

---
 A319-200-IAE-set.xml                  |  3 ++-
 A320-200-IAE-set.xml                  |  3 ++-
 A320-main.xml                         |  5 +++--
 A321-200-IAE-set.xml                  |  3 ++-
 Models/A319-200.xml                   |  5 +++--
 Models/A320-200.xml                   |  5 +++--
 Models/A321-200.xml                   |  5 +++--
 Models/FlightDeck/a320.flightdeck.xml | 14 ++++++++++----
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/A319-200-IAE-set.xml b/A319-200-IAE-set.xml
index 314e54f7..c6e7e85a 100644
--- a/A319-200-IAE-set.xml
+++ b/A319-200-IAE-set.xml
@@ -16,7 +16,6 @@
 			<path>Aircraft/A320Family/Models/A319-200.xml</path>
 			<livery>
 				<file>Liveries/A319/USAirwaysStar</file>
-				<texture>Liveries/A319/USAirwaysStar.png</texture>
 			</livery>
 		</model>
 
@@ -75,6 +74,8 @@
 		</menubar>
 	</sim>
 	
+	<engine-type>1</engine-type>
+	
 	<nasal>
 		<A320>
 			<file>Aircraft/A320Family/Nasal/engines.nas</file>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index fc35f484..dd6a1afc 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -16,7 +16,6 @@
 			<path>Aircraft/A320Family/Models/A320-200.xml</path>
 			<livery>
 				<file>Liveries/A320/Airbus</file>
-				<texture>Liveries/A320/Airbus.png</texture>
 			</livery>
 		</model>
 
@@ -67,6 +66,8 @@
 		</menubar>
 	</sim>
 	
+	<engine-type>1</engine-type>
+	
 	<nasal>
 		<A320>
 			<file>Aircraft/A320Family/Nasal/engines.nas</file>
diff --git a/A320-main.xml b/A320-main.xml
index 85285e59..50b8ae7e 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -125,6 +125,7 @@
 			<generic>
 				<float n="0" alias="/controls/lighting/dome-norm" />
 				<float n="1" alias="/controls/lighting/interior" />
+				<float n="2" alias="/engine-type" />
 				<int n="2" alias="/controls/lighting/landing-lights[0]" />
 				<int n="3" alias="/controls/lighting/landing-lights[1]" />
 				<int n="4" alias="/controls/lighting/landing-lights[2]" />
@@ -237,12 +238,12 @@
 		<pitch>
 			<umin>-0.25</umin>
 			<umax>0.25</umax>
-			<kp>-0.07</kp>
+			<kp>-0.05</kp>
 		</pitch>
 		<flch>
 			<umin>-0.25</umin>
 			<umax>0.25</umax>
-			<kp>-0.08</kp>
+			<kp>-0.03</kp>
 		</flch>
 		<gs>
 			<kp>0.10</kp>
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index 0d6fb51b..e7084c5f 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -16,7 +16,6 @@
 			<path>Aircraft/A320Family/Models/A321-200.xml</path>
 			<livery>
 				<file>Liveries/A321/Airbus</file>
-				<texture>Liveries/A321/Airbus.png</texture>
 			</livery>
 		</model>
 
@@ -75,6 +74,8 @@
 		</menubar>
 	</sim>
 	
+	<engine-type>1</engine-type>
+	
 	<nasal>
 		<A320>
 			<file>Aircraft/A320Family/Nasal/engines.nas</file>
diff --git a/Models/A319-200.xml b/Models/A319-200.xml
index 80f1b84e..1f045fd9 100644
--- a/Models/A319-200.xml
+++ b/Models/A319-200.xml
@@ -73,8 +73,8 @@
 		<path>Aircraft/A320Family/Models/Wings/a320.wings.iae.xml</path>
 		<condition>
 			<equals>
-				<property>/sim/aero</property>
-				<value>A319-200-IAE</value>
+				<property>/sim/multiplay/generic/float[2]</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<offsets>
@@ -233,6 +233,7 @@
 		<!-- Fuselage -->
 		<property-base>sim/model/livery</property-base>
 		<texture-prop>texture</texture-prop>
+		<texture>A319.png</texture>
 	</animation>
 
 	<!-- Nasal code -->
diff --git a/Models/A320-200.xml b/Models/A320-200.xml
index f9a11836..91e5af36 100644
--- a/Models/A320-200.xml
+++ b/Models/A320-200.xml
@@ -74,8 +74,8 @@
 		<path>Aircraft/A320Family/Models/Wings/a320.wings.iae.xml</path>
 		<condition>
 			<equals>
-				<property>/sim/aero</property>
-				<value>A320-200-IAE</value>
+				<property>/sim/multiplay/generic/float[2]</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<offsets>
@@ -238,6 +238,7 @@
 		<!-- Fuselage -->
 		<property-base>sim/model/livery</property-base>
 		<texture-prop>texture</texture-prop>
+		<texture>A320.png</texture>
 	</animation>
 
 	<!-- Nasal code -->
diff --git a/Models/A321-200.xml b/Models/A321-200.xml
index 8bd0645a..bb46fab7 100644
--- a/Models/A321-200.xml
+++ b/Models/A321-200.xml
@@ -73,8 +73,8 @@
 		<path>Aircraft/A320Family/Models/Wings/a320.wings.iae.xml</path>
 		<condition>
 			<equals>
-				<property>/sim/aero</property>
-				<value>A321-200-IAE</value>
+				<property>/sim/multiplay/generic/float[2]</property>
+				<value>1</value>
 			</equals>
 		</condition>
 		<offsets>
@@ -233,6 +233,7 @@
 		<!-- Fuselage -->
 		<property-base>sim/model/livery</property-base>
 		<texture-prop>texture</texture-prop>
+		<texture>A321.png</texture>
 	</animation>
 
 	<!-- Nasal code -->
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index f285ca08..a4aeeaee 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -256,10 +256,16 @@
         <type>select</type>
         <object-name>lat.dash</object-name>
         <condition>
-            <equals>
-                <property>/it-autoflight/aplatmode</property>
-                <value>1</value>
-            </equals>
+			<or>
+				<equals>
+					<property>/it-autoflight/aplatmode</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/it-autoflight/aplatmode</property>
+					<value>2</value>
+				</equals>
+			</or>
         </condition>
     </animation>