From 44f07ac27225a5bf15b78fb62eab35528221baf6 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Tue, 2 Jun 2020 15:20:16 +0100
Subject: [PATCH] Add effects to V2500

---
 Models/Engines/XMLs/a320.cfm.xml   |  39 +-
 Models/Engines/XMLs/a320.v2500.xml | 665 +++++++++++++++--------------
 2 files changed, 364 insertions(+), 340 deletions(-)

diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml
index c7dd355f..9919b1d2 100644
--- a/Models/Engines/XMLs/a320.cfm.xml
+++ b/Models/Engines/XMLs/a320.cfm.xml
@@ -69,7 +69,7 @@
 					<value>1.63</value>
 				</less-than-equals>
 				<greater-than>
-					<property>engines/engine[0]/n1</property>
+					<property>engines/engine[3]/n1</property>
 					<value>65</value>
 				</greater-than>
 			</and>
@@ -104,7 +104,7 @@
 					<value>1.63</value>
 				</less-than-equals>
 				<greater-than>
-					<property>engines/engine[1]/n1</property>
+					<property>engines/engine[4]/n1</property>
 					<value>65</value>
 				</greater-than>
 			</and>
@@ -139,7 +139,7 @@
 					<value>1.63</value>
 				</less-than-equals>
 				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
+					<property>engines/engine[3]/n1</property>
 					<value>65</value>
 				</greater-than>
 				<equals>
@@ -177,7 +177,7 @@
 					<value>1.63</value>
 				</less-than-equals>
 				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
+					<property>engines/engine[4]/n1</property>
 					<value>65</value>
 				</greater-than>
 				<equals>
@@ -211,7 +211,7 @@
 					<value>1.63</value>
 				</less-than-equals>
 				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
+					<property>engines/engine[3]/n1</property>
 					<value>65</value>
 				</greater-than>
 				<greater-than>
@@ -245,7 +245,7 @@
 					<value>1.63</value>
 				</less-than-equals>
 				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
+					<property>engines/engine[4]/n1</property>
 					<value>65</value>
 				</greater-than>
 				<greater-than>
@@ -293,7 +293,20 @@
 		<type>spin</type>
 		<object-name>FanLCFM56</object-name>
 		<factor>-67</factor>
-		<property>engines/engine[0]/n1</property>
+		<property>engines/engine[3]/n1</property>
+		<axis>
+			<x>-1</x>
+			<y>0</y>
+			<z>0</z>
+		</axis>
+	</animation>
+	
+	<animation>
+		<name>Fan spinning animation (slow)</name>
+		<type>spin</type>
+		<object-name>FanLCFM56</object-name>
+		<factor>-67</factor>
+		<property>engines/engine[4]/n1</property>
 		<axis>
 			<x>-1</x>
 			<y>0</y>
@@ -306,7 +319,7 @@
 		<object-name>FanSpinningCFM56</object-name>
 		<condition>
 			<greater-than>
-				<property>engines/engine[0]/n1</property>
+				<property>engines/engine[3]/n1</property>
 				<value>40.0</value>
 			</greater-than>
 		</condition>
@@ -317,7 +330,7 @@
 		<object-name>FanLCFM56</object-name>
 		<condition>
 			<less-than-equals>
-				<property>engines/engine[0]/n1</property>
+				<property>engines/engine[3]/n1</property>
 				<value>40.0</value>
 			</less-than-equals>
 		</condition>
@@ -338,12 +351,4 @@
 		<object-name>ExxhaustCFM56</object-name>
 		<object-name>IntakeCFM56</object-name>
 	</effect>
-	
-	<!--<animation>
-        <type>shader</type>
-        <shader>chrome</shader>
-        <texture>Aircraft/A320-family/Models/Engines/Models/chrome.png</texture>
-		<object-name>ExxhaustCFM56</object-name>
-		<object-name>IntakeCFM56</object-name>
-	</animation>-->
 </PropertyList>
diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml
index e235d21f..4902212f 100644
--- a/Models/Engines/XMLs/a320.v2500.xml
+++ b/Models/Engines/XMLs/a320.v2500.xml
@@ -3,330 +3,349 @@
 <!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <PropertyList>
-	<path>Aircraft/A320-family/Models/Engines/Models/IAEV2500.ac</path>
-	
-	<params>
-		<contrail1>engines/engine[0]/contrail</contrail1>
-		<contrail2>engines/engine[1]/contrail</contrail2>
-	</params>
+    <path>Aircraft/A320-family/Models/Engines/Models/IAEV2500.ac</path>
+    
+    <params>
+        <contrail1>engines/engine[0]/contrail</contrail1>
+        <contrail2>engines/engine[1]/contrail</contrail2>
+    </params>
 
-	<!-- Particle Effects -->
-	<!--<model>
-		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
-		<name>contrailLeft</name>
-		<condition>
-			<property>environment/contrail</property>
-		</condition>
-		<overlay>
-			<params>
-				<contrail alias="../../../../params/contrail1" />
-			</params>
-		</overlay>
-		<offsets>
-			<x-m>4.875</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
-		<name>contrailRight</name>
-		<condition>
-			<property>environment/contrail</property>
-		</condition>
-		<overlay>
-			<params>
-				<contrail alias="../../../../params/contrail2" />
-			</params>
-		</overlay>
-		<offsets>
-			<x-m>4.875</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</offsets>
-	</model>
+    <!-- Particle Effects -->
+    <!--<model>
+        <path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+        <name>contrailLeft</name>
+        <condition>
+            <property>environment/contrail</property>
+        </condition>
+        <overlay>
+            <params>
+                <contrail alias="../../../../params/contrail1" />
+            </params>
+        </overlay>
+        <offsets>
+            <x-m>4.875</x-m>
+            <y-m>0</y-m>
+            <z-m>0</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
+        <name>contrailRight</name>
+        <condition>
+            <property>environment/contrail</property>
+        </condition>
+        <overlay>
+            <params>
+                <contrail alias="../../../../params/contrail2" />
+            </params>
+        </overlay>
+        <offsets>
+            <x-m>4.875</x-m>
+            <y-m>0</y-m>
+            <z-m>0</z-m>
+        </offsets>
+    </model>
 
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<name>moistureLeft</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1</property>
-					<value>65</value>
-				</greater-than>
-			</and>
-		</condition>
-		<offsets>
-			<x-m>0</x-m>
-			<y-m>0</y-m>
-			<z-m>0.3</z-m>
-			<pitch-deg>0</pitch-deg>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<name>moistureRight</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1</property>
-					<value>65</value>
-				</greater-than>
-			</and>
-		</condition>
-		<offsets>
-			<x-m>0</x-m>
-			<y-m>0</y-m>
-			<z-m>0.3</z-m>
-			<pitch-deg>0</pitch-deg>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-left</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
-				</greater-than>
-				<equals>
-					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-			</and>
-		</condition>
-		<offsets>
-			<x-m>4.875</x-m>
-			<y-m>0</y-m>
-			<z-m>-5</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-right</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
-				</greater-than>
-				<equals>
-					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-			</and>
-		</condition>
-		<offsets>
-			<x-m>4.875</x-m>
-			<y-m>0</y-m>
-			<z-m>-5</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
-				</greater-than>
-				<greater-than>
-					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0.75</value>
-				</greater-than>
-			</and>
-		</condition>
-		<offsets>
-			<x-m>0</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</offsets>
-	</model>
-	
-	<model>
-		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
-				</greater-than>
-				<greater-than>
-					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0.75</value>
-				</greater-than>
-			</and>
-		</condition>
-		<offsets>
-			<x-m>0</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</offsets>
-	</model>
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+        <name>moistureLeft</name>
+        <condition>
+            <and>
+                <greater-than>
+                    <property>position/altitude-agl-ft</property>
+                    <value>1</value>
+                </greater-than>
+                <greater-than>
+                    <property>environment/relative-humidity</property>
+                    <value>45</value>
+                </greater-than>
+                <less-than-equals>
+                    <property>position/altitude-agl-ft</property>
+                    <value>75</value>
+                </less-than-equals>
+                <less-than-equals>
+                    <property>sim/time/sun-angle-rad</property>
+                    <value>1.63</value>
+                </less-than-equals>
+                <greater-than>
+                    <property>engines/engine[3]/n1</property>
+                    <value>65</value>
+                </greater-than>
+            </and>
+        </condition>
+        <offsets>
+            <x-m>0</x-m>
+            <y-m>0</y-m>
+            <z-m>0.3</z-m>
+            <pitch-deg>0</pitch-deg>
+        </offsets>
+    </model>
+    
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
+        <name>moistureRight</name>
+        <condition>
+            <and>
+                <greater-than>
+                    <property>position/altitude-agl-ft</property>
+                    <value>1</value>
+                </greater-than>
+                <greater-than>
+                    <property>environment/relative-humidity</property>
+                    <value>45</value>
+                </greater-than>
+                <less-than-equals>
+                    <property>position/altitude-agl-ft</property>
+                    <value>75</value>
+                </less-than-equals>
+                <less-than-equals>
+                    <property>sim/time/sun-angle-rad</property>
+                    <value>1.63</value>
+                </less-than-equals>
+                <greater-than>
+                    <property>engines/engine[4]/n1</property>
+                    <value>65</value>
+                </greater-than>
+            </and>
+        </condition>
+        <offsets>
+            <x-m>0</x-m>
+            <y-m>0</y-m>
+            <z-m>0.3</z-m>
+            <pitch-deg>0</pitch-deg>
+        </offsets>
+    </model>
+    
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+        <name>engine-spray-left</name>
+        <condition>
+            <and>
+                <greater-than>
+                    <property>position/altitude-agl-ft</property>
+                    <value>1</value>
+                </greater-than>
+                <greater-than>
+                    <property>environment/surface/wetness</property>
+                    <value>0.3</value>
+                </greater-than>
+                <less-than-equals>
+                    <property>position/altitude-agl-ft</property>
+                    <value>15</value>
+                </less-than-equals>
+                <less-than-equals>
+                    <property>sim/time/sun-angle-rad</property>
+                    <value>1.63</value>
+                </less-than-equals>
+                <greater-than>
+                    <property>engines/engine[3]/n1</property>
+                    <value>65</value>
+                </greater-than>
+                <equals>
+                    <property>engines/engine[0]/reverser-pos-norm</property>
+                    <value>0</value>
+                </equals>
+            </and>
+        </condition>
+        <offsets>
+            <x-m>4.875</x-m>
+            <y-m>0</y-m>
+            <z-m>-5</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
+        <name>engine-spray-right</name>
+        <condition>
+            <and>
+                <greater-than>
+                    <property>position/altitude-agl-ft</property>
+                    <value>1</value>
+                </greater-than>
+                <greater-than>
+                    <property>environment/surface/wetness</property>
+                    <value>0.3</value>
+                </greater-than>
+                <less-than-equals>
+                    <property>position/altitude-agl-ft</property>
+                    <value>15</value>
+                </less-than-equals>
+                <less-than-equals>
+                    <property>sim/time/sun-angle-rad</property>
+                    <value>1.63</value>
+                </less-than-equals>
+                <greater-than>
+                    <property>engines/engine[4]/n1</property>
+                    <value>65</value>
+                </greater-than>
+                <equals>
+                    <property>engines/engine[1]/reverser-pos-norm</property>
+                    <value>0</value>
+                </equals>
+            </and>
+        </condition>
+        <offsets>
+            <x-m>4.875</x-m>
+            <y-m>0</y-m>
+            <z-m>-5</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+        <name>engine-spray-reverse</name>
+        <condition>
+            <and>
+                <greater-than>
+                    <property>position/altitude-agl-ft</property>
+                    <value>1</value>
+                </greater-than>
+                <greater-than>
+                    <property>environment/surface/wetness</property>
+                    <value>0.3</value>
+                </greater-than>
+                <less-than-equals>
+                    <property>sim/time/sun-angle-rad</property>
+                    <value>1.63</value>
+                </less-than-equals>
+                <greater-than>
+                    <property>engines/engine[3]/n1</property>
+                    <value>65</value>
+                </greater-than>
+                <greater-than>
+                    <property>engines/engine[0]/reverser-pos-norm</property>
+                    <value>0.75</value>
+                </greater-than>
+            </and>
+        </condition>
+        <offsets>
+            <x-m>0</x-m>
+            <y-m>0</y-m>
+            <z-m>0</z-m>
+        </offsets>
+    </model>
+    
+    <model>
+        <path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
+        <name>engine-spray-reverse</name>
+        <condition>
+            <and>
+                <greater-than>
+                    <property>position/altitude-agl-ft</property>
+                    <value>1</value>
+                </greater-than>
+                <greater-than>
+                    <property>environment/surface/wetness</property>
+                    <value>0.3</value>
+                </greater-than>
+                <less-than-equals>
+                    <property>sim/time/sun-angle-rad</property>
+                    <value>1.63</value>
+                </less-than-equals>
+                <greater-than>
+                    <property>engines/engine[4]/n1</property>
+                    <value>65</value>
+                </greater-than>
+                <greater-than>
+                    <property>engines/engine[1]/reverser-pos-norm</property>
+                    <value>0.75</value>
+                </greater-than>
+            </and>
+        </condition>
+        <offsets>
+            <x-m>0</x-m>
+            <y-m>0</y-m>
+            <z-m>0</z-m>
+        </offsets>
+    </model>
 
-	<model>
-		<name>Engine fire left</name>
-		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
-		<offsets>
-			<x-m>2.774</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</offsets>
-		<condition>
-			<property>systems/failures/engine-left-fire</property>
-		</condition>
-	</model>
-	
-	<model>
-		<name>Engine fire right</name>
-		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
-		<offsets>
-			<x-m>2.774</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</offsets>
-		<condition>
-			<property>systems/failures/engine-right-fire</property>
-		</condition>
-	</model>-->
-	
-	<!-- Animations -->
-	<!--<animation>
-		<name>Fan spinning animation (slow)</name>
-		<type>spin</type>
-		<object-name>FanLIAE</object-name>
-		<factor>-67</factor>
-		<property>engines/engine[0]/n1</property>
-		<axis>
-			<x>-1</x>
-			<y>0</y>
-			<z>0</z>
-		</axis>
-	</animation>-->
-	
-	<animation>
-		<type>select</type>
-		<object-name>FanSpinningIAE</object-name>
-		<condition>
-			<greater-than>
-				<property>engines/engine[0]/n1</property>
-				<value>40.0</value>
-			</greater-than>
-		</condition>
-	</animation>
-	
-	<animation>
-		<type>select</type>
-		<object-name>FanLIAE</object-name>
-		<condition>
-			<less-than-equals>
-				<property>engines/engine[0]/n1</property>
-				<value>40.0</value>
-			</less-than-equals>
-		</condition>
-	</animation>
-	
-	<!-- Effect -->
-	<effect>
-		<inherits-from>Aircraft/A320-family/Models/Effects/reflection</inherits-from>
-		<object-name>EngineIAEV2500</object-name>
-		<object-name>ReverserLDoor</object-name>
-	</effect>
+    <model>
+        <name>Engine fire left</name>
+        <path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
+        <offsets>
+            <x-m>2.774</x-m>
+            <y-m>0</y-m>
+            <z-m>0</z-m>
+        </offsets>
+        <condition>
+            <property>systems/failures/engine-left-fire</property>
+        </condition>
+    </model>
+    
+    <model>
+        <name>Engine fire right</name>
+        <path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
+        <offsets>
+            <x-m>2.774</x-m>
+            <y-m>0</y-m>
+            <z-m>0</z-m>
+        </offsets>
+        <condition>
+            <property>systems/failures/engine-right-fire</property>
+        </condition>
+    </model>-->
+    
+    <!-- Animations -->
+    <!--<animation>
+        <name>Fan spinning animation (slow)</name>
+        <type>spin</type>
+        <object-name>FanLIAE</object-name>
+        <factor>-67</factor>
+        <property>engines/engine[3]/n1</property>
+        <axis>
+            <x>-1</x>
+            <y>0</y>
+            <z>0</z>
+        </axis>
+    </animation>
+    
+    <animation>
+        <name>Fan spinning animation (slow)</name>
+        <type>spin</type>
+        <object-name>FanLIAE</object-name>
+        <factor>-67</factor>
+        <property>engines/engine[4]/n1</property>
+        <axis>
+            <x>-1</x>
+            <y>0</y>
+            <z>0</z>
+        </axis>
+    </animation>-->
+    
+    <animation>
+        <type>select</type>
+        <object-name>FanSpinningIAE</object-name>
+        <condition>
+            <greater-than>
+                <property>engines/engine[3]/n1</property>
+                <value>40.0</value>
+            </greater-than>
+        </condition>
+    </animation>
+    
+    <animation>
+        <type>select</type>
+        <object-name>FanLIAE</object-name>
+        <condition>
+            <less-than-equals>
+                <property>engines/engine[3]/n1</property>
+                <value>40.0</value>
+            </less-than-equals>
+        </condition>
+    </animation>
+    
+    <!-- Effect -->
+    <effect>
+        <inherits-from>Aircraft/A320-family/Models/Effects/reflection</inherits-from>
+        <object-name>EngineIAEV2500</object-name>
+        <object-name>ReverserLDoor</object-name>
+    </effect>
+    
+    <effect>
+        <inherits-from>Aircraft/A320-family/Models/Effects/reflection-chrome</inherits-from>
+        <object-name>ExhaustIAEV2500</object-name>
+        <object-name>IntakeIAEV2500</object-name>
+    </effect>
 </PropertyList>