From 0dec7f174e134e74ee6e6070a905c6fa43547328 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 5 Jul 2017 00:59:45 -0400
Subject: [PATCH] A3XX: Fix FBW Law Degrading

---
 AircraftConfig/fail.xml |  2 +-
 Nasal/it-fbw.nas        | 31 ++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml
index 8e2b7d1c..e074a2e1 100644
--- a/AircraftConfig/fail.xml
+++ b/AircraftConfig/fail.xml
@@ -12,7 +12,7 @@
         <layout>hbox</layout>
         <text>
             <halign>left</halign>
-            <label>System Failures (1)</label>
+            <label>System Failures</label>
         </text>
         <button>
             <halign>right</halign>
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index e471708e..2a0e2760 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -55,20 +55,21 @@ var update_loop = func {
 	var sec3_fail = getprop("/systems/failures/sec3");
 	var fac1_fail = getprop("/systems/failures/fac1");
 	var fac2_fail = getprop("/systems/failures/fac2");
+	var ac_ess = getprop("/systems/electrical/bus/ac-ess");
 	
-	if (elac1_sw and !elac1_fail) {
+	if (elac1_sw and !elac1_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/elac1", 1);
 	} else {
 		setprop("/systems/fctl/elac1", 0);
 	}
 	
-	if (elac2_sw and !elac2_fail) {
+	if (elac2_sw and !elac2_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/elac2", 1);
 	} else {
 		setprop("/systems/fctl/elac2", 0);
 	}
 	
-	if (sec1_sw and !sec1_fail) {
+	if (sec1_sw and !sec1_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/sec1", 1);
 		setprop("/systems/failures/spoiler-l3", 0);
 		setprop("/systems/failures/spoiler-r3", 0);
@@ -82,7 +83,7 @@ var update_loop = func {
 		setprop("/systems/failures/spoiler-r4", 1);
 	}
 	
-	if (sec2_sw and !sec2_fail) {
+	if (sec2_sw and !sec2_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/sec2", 1);
 		setprop("/systems/failures/spoiler-l5", 0);
 		setprop("/systems/failures/spoiler-r5", 0);
@@ -92,7 +93,7 @@ var update_loop = func {
 		setprop("/systems/failures/spoiler-r5", 1);
 	}
 	
-	if (sec3_sw and !sec3_fail) {
+	if (sec3_sw and !sec3_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/sec3", 1);
 		setprop("/systems/failures/spoiler-l2", 0);
 		setprop("/systems/failures/spoiler-r2", 0);
@@ -102,7 +103,7 @@ var update_loop = func {
 		setprop("/systems/failures/spoiler-r2", 1);
 	}
 	
-	if (fac1_sw and !fac1_fail) {
+	if (fac1_sw and !fac1_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/fac1", 1);
 		setprop("/systems/failures/rudder", 0);
 	} else {
@@ -112,7 +113,7 @@ var update_loop = func {
 		}
 	}
 	
-	if (fac2_sw and !fac2_fail) {
+	if (fac2_sw and !fac2_fail and ac_ess >= 110) {
 		setprop("/systems/fctl/fac2", 1);
 	} else {
 		setprop("/systems/fctl/fac2", 0);
@@ -136,19 +137,23 @@ var update_loop = func {
 			if (law == 0) {
 				setprop("/it-fbw/degrade-law", 1);
 			}
-		} else if (getprop("/systems/electrical/bus/ac-ess") >= 110 and getprop("/systems/hydraulic/blue-psi") >= 1500 and getprop("/systems/hydraulic/green-psi") < 1500 and getprop("/systems/hydraulic/yellow-psi") < 1500) {
+		}
+		if (getprop("/systems/electrical/bus/ac-ess") >= 110 and getprop("/systems/hydraulic/blue-psi") >= 1500 and getprop("/systems/hydraulic/green-psi") < 1500 and getprop("/systems/hydraulic/yellow-psi") < 1500) {
 			if (law == 0 or law == 1) {
 				setprop("/it-fbw/degrade-law", 2);
 			}
-		} else if (getprop("/controls/gear/gear-down") == 1) {
-			if (law == 1) {
-				setprop("/it-fbw/degrade-law", 2);
-			}
-		} else if (getprop("/systems/electrical/bus/ac-ess") < 110 or (getprop("/systems/hydraulic/blue-psi") < 1500 and getprop("/systems/hydraulic/green-psi") < 1500 and getprop("/systems/hydraulic/yellow-psi") < 1500)) {
+		}
+		if (getprop("/systems/electrical/bus/ac-ess") < 110 or (getprop("/systems/hydraulic/blue-psi") < 1500 and getprop("/systems/hydraulic/green-psi") < 1500 and getprop("/systems/hydraulic/yellow-psi") < 1500)) {
 			setprop("/it-fbw/degrade-law", 3);
 		}
 	}
 	
+	if (getprop("/controls/gear/gear-down") == 1) {
+		if (law == 1) {
+			setprop("/it-fbw/degrade-law", 2);
+		}
+	}
+	
 	var law = getprop("/it-fbw/law");
 	
 	# Mech Backup can always return to direct, if it can.