From d9a8492949e5a8047a4a36507898c78c90f7a3bf Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 5 Oct 2017 13:11:30 -0400
Subject: [PATCH] Revert "Add surprise to ACCONFIG."

This reverts commit 8484e84af19716c351e625544562a103cf7367f6.
---
 AircraftConfig/acconfig.nas           | 4 ----
 Models/FlightDeck/a320.flightdeck.xml | 4 ++--
 Nasal/libraries.nas                   | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index c5526ae9..cab96cdd 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -85,10 +85,6 @@ setprop("/systems/acconfig/new-revision", "");
 setprop("/systems/acconfig/out-of-date", 0);
 setprop("/systems/acconfig/mismatch-code", "0x000");
 setprop("/systems/acconfig/mismatch-reason", "XX");
-
-# Surprise
-setprop("/systems/acconfig/surprise", 1);
-
 var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/IDG-A32X/AircraftConfig/main.xml");
 var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/IDG-A32X/AircraftConfig/welcome.xml");
 var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/IDG-A32X/AircraftConfig/psload.xml");
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index caffcd4c..aa2393ae 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -5825,7 +5825,7 @@
 		<condition>
 			<and>
 				<equals>
-					<property>systems/acconfig/surprise</property>
+					<property>controls/tray/surprise</property>
 					<value>1</value>
 				</equals>
 				<equals>
@@ -5843,7 +5843,7 @@
 			<button>0</button>
 			<binding>
 				<command>property-toggle</command>
-				<property>systems/acconfig/surprise</property>
+				<property>controls/tray/surprise</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 6b856cb5..779872a4 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -14,6 +14,9 @@ setprop("/controls/lighting/ndl-norm", 1);
 setprop("/controls/lighting/ndr-norm", 1);
 setprop("/controls/lighting/upper-norm", 1);
 
+# Surprise
+setprop("/controls/tray/surprise", 1);
+
 # Lights
 setprop("/sim/model/lights/nose-lights", 0);
 setprop("/sim/model/lights/turnoffsw", 0);