From 99b0427de6a644cc6101680608fbb5ffd05570b9 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 23 Jun 2017 13:49:36 -0400
Subject: [PATCH] A3XX: Again fix condition

---
 Models/Instruments/PFD/PFD1.xml | 82 ++++++++++++++++-----------------
 Models/Instruments/PFD/PFD2.xml | 82 ++++++++++++++++-----------------
 2 files changed, 78 insertions(+), 86 deletions(-)

diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index e70f477b..5b6c3749 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -35,57 +35,53 @@
 		<object-name>sidestick-max</object-name>
 		<object-name>sidestick-pos</object-name>
 		<condition>
-			<and>
-				<or>
-					<property>/gear/gear[1]/wow</property>
-					<property>/gear/gear[2]/wow</property>
-					<and>
-						<property>/options/pfd/sidestick-pos</property>
+			<or>
+				<property>/gear/gear[1]/wow</property>
+				<property>/gear/gear[2]/wow</property>
+				<and>
+					<property>/options/pfd/sidestick-pos</property>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+				</and>
+				<and>
+					<or>
 						<equals>
-							<property>/it-autoflight/output/ap1</property>
+							<property>/FMGC/status/phase</property>
 							<value>0</value>
 						</equals>
 						<equals>
-							<property>/it-autoflight/output/ap1</property>
+							<property>/FMGC/status/phase</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/engines/engine[0]/state</property>
+						<value>3</value>
+					</equals>
+				</and>
+				<and>
+					<or>
+						<equals>
+							<property>/FMGC/status/phase</property>
 							<value>0</value>
 						</equals>
-					</and>
-				</or>
-				<or>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
 						<equals>
-							<property>/engines/engine[0]/state</property>
-							<value>3</value>
+							<property>/FMGC/status/phase</property>
+							<value>1</value>
 						</equals>
-					</and>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
-						<equals>
-							<property>/engines/engine[1]/state</property>
-							<value>3</value>
-						</equals>
-					</and>
-				</or>
-			</and>
+					</or>
+					<equals>
+						<property>/engines/engine[1]/state</property>
+						<value>3</value>
+					</equals>
+				</and>
+			</or>
 		</condition>
 	</animation>
 	
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 180d3e3a..085b8b50 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -35,57 +35,53 @@
 		<object-name>sidestick-max</object-name>
 		<object-name>sidestick-pos</object-name>
 		<condition>
-			<and>
-				<or>
-					<property>/gear/gear[1]/wow</property>
-					<property>/gear/gear[2]/wow</property>
-					<and>
-						<property>/options/pfd/sidestick-pos</property>
+			<or>
+				<property>/gear/gear[1]/wow</property>
+				<property>/gear/gear[2]/wow</property>
+				<and>
+					<property>/options/pfd/sidestick-pos</property>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+				</and>
+				<and>
+					<or>
 						<equals>
-							<property>/it-autoflight/output/ap1</property>
+							<property>/FMGC/status/phase</property>
 							<value>0</value>
 						</equals>
 						<equals>
-							<property>/it-autoflight/output/ap1</property>
+							<property>/FMGC/status/phase</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/engines/engine[0]/state</property>
+						<value>3</value>
+					</equals>
+				</and>
+				<and>
+					<or>
+						<equals>
+							<property>/FMGC/status/phase</property>
 							<value>0</value>
 						</equals>
-					</and>
-				</or>
-				<or>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
 						<equals>
-							<property>/engines/engine[0]/state</property>
-							<value>3</value>
+							<property>/FMGC/status/phase</property>
+							<value>1</value>
 						</equals>
-					</and>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
-						<equals>
-							<property>/engines/engine[1]/state</property>
-							<value>3</value>
-						</equals>
-					</and>
-				</or>
-			</and>
+					</or>
+					<equals>
+						<property>/engines/engine[1]/state</property>
+						<value>3</value>
+					</equals>
+				</and>
+			</or>
 		</condition>
 	</animation>