From 1861c18e423800cbc11a47ec07fff1cf646bd208 Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 30 Jul 2019 18:53:34 -0400
Subject: [PATCH] VC: Sort the OH Fire animations

---
 Models/Instruments/OHpanel/OHpanel.xml | 219 +++++++++----------------
 1 file changed, 78 insertions(+), 141 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 05a04f65..196b669d 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -6193,25 +6193,17 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
-				<condition>
-					<equals>
-						<property>controls/engines/engine[0]/fire-btn-cover</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>property-toggle</command>
-				<property>controls/engines/engine[0]/fire-btn</property>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/engines/engine[0]/fire-btn</property>
-						<value>0</value>
-					</equals>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/engines/engine[0]/fire-btn-cover</property>
-				<value>0</value>
+				<command>nasal</command>
+				<script>
+					if (getprop("/controls/engines/engine[0]/fire-btn") == 1) {
+						setprop("/controls/engines/engine[0]/fire-btn", 0);
+						setprop("/controls/engines/engine[0]/fire-btn-cover", 0);
+					} else if (getprop("/controls/engines/engine[0]/fire-btn-cover") == 1) {
+						setprop("/controls/engines/engine[0]/fire-btn", 1);
+					} else if (getprop("/devices/status/keyboard/shift") == 1) {
+						setprop("/controls/engines/engine[0]/fire-btn-cover", 1);
+					}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -6222,30 +6214,19 @@
 		<object-name>Eng1FireBtn</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
-				<condition>
-					<property>devices/status/keyboard/shift</property>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/engines/engine[0]/fire-btn-cover</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<condition>
-					<and>
-						<not>
-							<property>devices/status/keyboard/shift</property>
-						</not>
-						<equals>
-							<property>controls/engines/engine[0]/fire-btn</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/engines/engine[0]/fire-btn-cover</property>
-				<value>0</value>
+				<command>nasal</command>
+				<script>
+					if (getprop("/controls/engines/engine[0]/fire-btn") == 1) {
+						setprop("/controls/engines/engine[0]/fire-btn", 0);
+						setprop("/controls/engines/engine[0]/fire-btn-cover", 0);
+					} else if (getprop("/controls/engines/engine[0]/fire-btn-cover") == 1) {
+						setprop("/controls/engines/engine[0]/fire-btn-cover", 0);
+					} else if (getprop("/devices/status/keyboard/shift") == 1) {
+						setprop("/controls/engines/engine[0]/fire-btn-cover", 1);
+					}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -6269,7 +6250,7 @@
         <type>translate</type>
 		<object-name>Eng1FireBtn</object-name>
         <property>controls/engines/engine[0]/fire-btn</property>
-        <factor>0.0025</factor>
+        <factor>0.025</factor>
         <axis>
             <x>1</x>
             <y>0</y>
@@ -6279,14 +6260,12 @@
 	
 	<animation>
 		<type>material</type>
-		<object-name>Eng1FireBtn</object-name>
-		<condition>
-			<property>systems/fire/engine1/warning-active</property>
-		</condition>
+		<object-name>firebtn1</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
+			<factor-prop>systems/fire/engine1/warning-active</factor-prop>
 		</emission>
 	</animation>
 	
@@ -6458,25 +6437,17 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
-				<condition>
-					<equals>
-						<property>controls/APU/fire-btn-cover</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>property-toggle</command>
-				<property>controls/APU/fire-btn</property>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/APU/fire-btn</property>
-						<value>0</value>
-					</equals>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/APU/fire-btn-cover</property>
-				<value>0</value>
+				<command>nasal</command>
+				<script>
+					if (getprop("/controls/APU/fire-btn") == 1) {
+						setprop("/controls/APU/fire-btn", 0);
+						setprop("/controls/APU/fire-btn-cover", 0);
+					} else if (getprop("/controls/APU/fire-btn-cover") == 1) {
+						setprop("/controls/APU/fire-btn", 1);
+					} else if (getprop("/devices/status/keyboard/shift") == 1) {
+						setprop("/controls/APU/fire-btn-cover", 1);
+					}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -6487,30 +6458,19 @@
 		<object-name>APUFireBtn</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
-				<condition>
-					<property>devices/status/keyboard/shift</property>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/APU/fire-btn-cover</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<condition>
-					<and>
-						<not>
-							<property>devices/status/keyboard/shift</property>
-						</not>
-						<equals>
-							<property>controls/APU/fire-btn</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/APU/fire-btn-cover</property>
-				<value>0</value>
+				<command>nasal</command>
+				<script>
+					if (getprop("/controls/APU/fire-btn") == 1) {
+						setprop("/controls/APU/fire-btn", 0);
+						setprop("/controls/APU/fire-btn-cover", 0);
+					} else if (getprop("/controls/APU/fire-btn-cover") == 1) {
+						setprop("/controls/APU/fire-btn-cover", 0);
+					} else if (getprop("/devices/status/keyboard/shift") == 1) {
+						setprop("/controls/APU/fire-btn-cover", 1);
+					}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -6534,7 +6494,7 @@
         <type>translate</type>
 		<object-name>APUFireBtn</object-name>
         <property>controls/APU/fire-btn</property>
-        <factor>0.0025</factor>
+        <factor>0.025</factor>
         <axis>
             <x>1</x>
             <y>0</y>
@@ -6544,14 +6504,12 @@
 	
 	<animation>
 		<type>material</type>
-		<object-name>APUFireBtn</object-name>
-		<condition>
-			<property>systems/fire/apu/warning-active</property>
-		</condition>
+		<object-name>firebtnapu</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
+			<factor-prop>systems/fire/apu/warning-active</factor-prop>
 		</emission>
 	</animation>
 	
@@ -6621,25 +6579,17 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
-				<condition>
-					<equals>
-						<property>controls/engines/engine[1]/fire-btn-cover</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>property-toggle</command>
-				<property>controls/engines/engine[1]/fire-btn</property>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/engines/engine[1]/fire-btn</property>
-						<value>0</value>
-					</equals>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/engines/engine[1]/fire-btn-cover</property>
-				<value>0</value>
+				<command>nasal</command>
+				<script>
+					if (getprop("/controls/engines/engine[1]/fire-btn") == 1) {
+						setprop("/controls/engines/engine[1]/fire-btn", 0);
+						setprop("/controls/engines/engine[1]/fire-btn-cover", 0);
+					} else if (getprop("/controls/engines/engine[1]/fire-btn-cover") == 1) {
+						setprop("/controls/engines/engine[1]/fire-btn", 1);
+					} else if (getprop("/devices/status/keyboard/shift") == 1) {
+						setprop("/controls/engines/engine[1]/fire-btn-cover", 1);
+					}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -6650,30 +6600,19 @@
 		<object-name>Eng2FireBtn</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
-				<condition>
-					<property>devices/status/keyboard/shift</property>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/engines/engine[1]/fire-btn-cover</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<condition>
-					<and>
-						<not>
-							<property>devices/status/keyboard/shift</property>
-						</not>
-						<equals>
-							<property>controls/engines/engine[1]/fire-btn</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</condition>
-				<command>property-assign</command>
-				<property>controls/engines/engine[1]/fire-btn-cover</property>
-				<value>0</value>
+				<command>nasal</command>
+				<script>
+					if (getprop("/controls/engines/engine[1]/fire-btn") == 1) {
+						setprop("/controls/engines/engine[1]/fire-btn", 0);
+						setprop("/controls/engines/engine[1]/fire-btn-cover", 0);
+					} else if (getprop("/controls/engines/engine[1]/fire-btn-cover") == 1) {
+						setprop("/controls/engines/engine[1]/fire-btn-cover", 0);
+					} else if (getprop("/devices/status/keyboard/shift") == 1) {
+						setprop("/controls/engines/engine[1]/fire-btn-cover", 1);
+					}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -6697,7 +6636,7 @@
         <type>translate</type>
 		<object-name>Eng2FireBtn</object-name>
         <property>controls/engines/engine[1]/fire-btn</property>
-        <factor>0.0025</factor>
+        <factor>0.025</factor>
         <axis>
             <x>1</x>
             <y>0</y>
@@ -6707,14 +6646,12 @@
 	
 	<animation>
 		<type>material</type>
-		<object-name>Eng2FireBtn</object-name>
-		<condition>
-			<property>systems/fire/engine2/warning-active</property>
-		</condition>
+		<object-name>firebtn2</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
+			<factor-prop>systems/fire/engine2/warning-active</factor-prop>
 		</emission>
 	</animation>