From 4cbe52517888ebf50720804abcc25c3fc1012204 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 27 Dec 2017 13:11:32 -0500
Subject: [PATCH] A3XX: Add LVR ASYM flashing and logic

---
 Models/Instruments/PFD/PFD.nas | 10 +++++++---
 Nasal/fadec-common.nas         | 16 +++++++++-------
 revision.txt                   |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index 903f0bc9..02e80f32 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -276,10 +276,14 @@ var canvas_PFD_base = {
 			me["FMA_flxtemp"].hide();
 		}
 		
-		if (getprop("/systems/thrust/eng-out") == 1) {
-			me["FMA_lvrclb"].setText("LVR MCT");
+		if ((state1 == "CL" and state2 != "CL") or (state1 != "CL" and state2 == "CL") and getprop("/systems/thrust/eng-out") != 1) {
+			me["FMA_lvrclb"].setText("LVR ASYM");
 		} else {
-			me["FMA_lvrclb"].setText("LVR CLB");
+			if (getprop("/systems/thrust/eng-out") == 1) {
+				me["FMA_lvrclb"].setText("LVR MCT");
+			} else {
+				me["FMA_lvrclb"].setText("LVR CLB");
+			}
 		}
 		
 		if (athr == 1 and getprop("/systems/thrust/lvrclb") == 1) {
diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas
index 58d0f663..609ec6ee 100644
--- a/Nasal/fadec-common.nas
+++ b/Nasal/fadec-common.nas
@@ -21,7 +21,7 @@ setprop("/controls/engines/epr-limit", 0.0);
 setprop("/controls/engines/n1-limit", 0.0);
 setprop("/systems/thrust/state1", "IDLE");
 setprop("/systems/thrust/state2", "IDLE");
-setprop("/systems/thrust/lvrclb", "0");
+setprop("/systems/thrust/lvrclb", 0);
 setprop("/systems/thrust/clbreduc-ft", "1500");
 setprop("/systems/thrust/toga-lim", 0.0);
 setprop("/systems/thrust/mct-lim", 0.0);
@@ -272,25 +272,27 @@ var thrust_loop = func {
 	}
 	
 	if (state1 == "CL" and state2 == "CL" and getprop("/systems/thrust/eng-out") != 1) {
-		setprop("/systems/thrust/lvrclb", "0");
+		setprop("/systems/thrust/lvrclb", 0);
 	} else if (state1 == "MCT" and state2 == "MCT" and getprop("/systems/thrust/lim-flex") != 1 and getprop("/systems/thrust/eng-out") == 1) {
-		setprop("/systems/thrust/lvrclb", "0");
+		setprop("/systems/thrust/lvrclb", 0);
 	} else {
 		var status = getprop("/systems/thrust/lvrclb");
 		if (status == 0) {
 			if (getprop("/gear/gear[0]/wow") == 0) {
 				if (getprop("/systems/thrust/state1") == "MAN" or getprop("/systems/thrust/state2") == "MAN") {
-					setprop("/systems/thrust/lvrclb", "1");
+					setprop("/systems/thrust/lvrclb", 1);
 				} else {
 					if (getprop("/instrumentation/altimeter/indicated-altitude-ft") >= getprop("/systems/thrust/clbreduc-ft") and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) {
-						setprop("/systems/thrust/lvrclb", "1");
+						setprop("/systems/thrust/lvrclb", 1);
+					} else if ((state1 == "CL" and state2 != "CL") or (state1 != "CL" and state2 == "CL") and getprop("/systems/thrust/eng-out") != 1) {
+						setprop("/systems/thrust/lvrclb", 1);
 					} else {
-						setprop("/systems/thrust/lvrclb", "0");
+						setprop("/systems/thrust/lvrclb", 0);
 					}
 				}
 			}
 		} else if (status == 1) {
-			setprop("/systems/thrust/lvrclb", "0");
+			setprop("/systems/thrust/lvrclb", 0);
 		}
 	}
 	
diff --git a/revision.txt b/revision.txt
index 42f4078d..08b8908d 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4113
\ No newline at end of file
+4114
\ No newline at end of file