From 2b1b72de828ad4799dc6af3979dd8372ecc87521 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 23 Jun 2017 12:52:13 -0400
Subject: [PATCH] A3XX: Fix PFD Conditions

---
 Models/Instruments/PFD/PFD1.xml | 59 ++++++++++++++++++++++++---------
 Models/Instruments/PFD/PFD2.xml | 59 ++++++++++++++++++++++++---------
 2 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index 80a7eb43..77c433b4 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -35,29 +35,57 @@
 		<object-name>sidestick-max</object-name>
 		<object-name>sidestick-pos</object-name>
 		<condition>
-				<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>
-					<or>
+			<and>
+				<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>
+				</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>
 						</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>
-						<not><property>/gear/gear[1]/wow</property></not>
-						<not><property>/gear/gear[2]/wow</property></not>
-					</or>
-				</and>
+					</and>
+				</or>
+			</and>
 		</condition>
 	</animation>
 	
@@ -667,6 +695,7 @@
     <animation>
     	<type>textranslate</type>
     	<object-name>alt-tape-2</object-name>
+		<property>octal</property>
     	<property>instrumentation/altimeter/indicated-altitude-ft</property>
     	<factor>0.009999725</factor>
     	<axis>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 4c9a52c6..d770098d 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -35,29 +35,57 @@
 		<object-name>sidestick-max</object-name>
 		<object-name>sidestick-pos</object-name>
 		<condition>
-				<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>
-					<or>
+			<and>
+				<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>
+				</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>
 						</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>
-						<not><property>/gear/gear[1]/wow</property></not>
-						<not><property>/gear/gear[2]/wow</property></not>
-					</or>
-				</and>
+					</and>
+				</or>
+			</and>
 		</condition>
 	</animation>
 	
@@ -667,6 +695,7 @@
     <animation>
     	<type>textranslate</type>
     	<object-name>alt-tape-2</object-name>
+		<property>octal</property>
     	<property>instrumentation/altimeter/indicated-altitude-ft</property>
     	<factor>0.009999725</factor>
     	<axis>