From b6a8e88793311db9cf5900294abee5b8ad05c633 Mon Sep 17 00:00:00 2001
From: "Nikolai V. Chr" <emptyyetfull@gmail.com>
Date: Mon, 20 Nov 2023 16:16:43 +0100
Subject: [PATCH] Model: Fix livery on YF-16 over MP.

---
 Models/F-16.xml                | 10 +++---
 Models/Liveries/yf/72-1568.xml | 28 +++++++---------
 Models/Liveries/yf/75-0745.xml | 61 ++++++++++++++++------------------
 3 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/Models/F-16.xml b/Models/F-16.xml
index 236ea34c..92e0c5c4 100644
--- a/Models/F-16.xml
+++ b/Models/F-16.xml
@@ -24,16 +24,18 @@
     var idVal = id.getValue();
     var folder = "Aircraft/f16/Models/Liveries";
     if (idVal != nil) {
-      if (idVal == 3) {
-        folder = "Aircraft/f16/Models/Liveries/Block30"
+      if (idVal == 0) {
+        folder = "Aircraft/f16/Models/Liveries/yf"
       } elsif (idVal == 1) {
         folder = "Aircraft/f16/Models/Liveries/Block10"
       } elsif (idVal == 2) {
         folder = "Aircraft/f16/Models/Liveries/Block20"
-      } elsif (idVal == 5) {
-        folder = "Aircraft/f16/Models/Liveries/Block50"
+      } elsif (idVal == 3) {
+        folder = "Aircraft/f16/Models/Liveries/Block30"
       } elsif (idVal == 4) {
         folder = "Aircraft/f16/Models/Liveries/Block40"
+      } elsif (idVal == 5) {
+        folder = "Aircraft/f16/Models/Liveries/Block50"
       } elsif (idVal == 6) {
         folder = "Aircraft/f16/Models/Liveries/Block60"
       }
diff --git a/Models/Liveries/yf/72-1568.xml b/Models/Liveries/yf/72-1568.xml
index 2840c739..a9d3cf86 100644
--- a/Models/Liveries/yf/72-1568.xml
+++ b/Models/Liveries/yf/72-1568.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-
 <PropertyList>
     <sim>
         <model>
             <livery>
                 <name type="string">USAF Testbed #568 "Combat Gray"</name>
-                <texture>Liveries/yf/72-1568.png</texture> 
+                <texture type="string">Liveries/yf/72-1568.png</texture>
                 <owner type="string">USAF</owner>
                 <pilot type="string"></pilot>
                 <scheme type="string">Gray camo</scheme>
@@ -15,21 +14,18 @@
                 <year type="string">1975</year>
             </livery>
             <livery-logo>
-                <texture>Liveries/standard.logos.color.png</texture>
+                <texture type="string">Liveries/standard.logos.color.png</texture>
             </livery-logo>
-
-        <livery-patch>
-            <texture>Liveries/patch.default.png</texture>
-        </livery-patch>
-
-        <livery-pod>
-        <texture>Armament/External-stores/MXU-648.png</texture>
-        </livery-pod>
-
-        <f16>
-            <dragchute type="bool">false</dragchute>
-        </f16>
-        <livery-specular type="double">0.15</livery-specular>
+            <livery-patch>
+                <texture type="string">Liveries/patch.default.png</texture>
+            </livery-patch>
+            <livery-pod>
+                <texture type="string">Armament/External-stores/MXU-648.png</texture>
+            </livery-pod>
+            <f16>
+                <dragchute type="bool">false</dragchute>
+            </f16>
+            <livery-specular type="double">0.15</livery-specular>
         </model>
     </sim>
 </PropertyList>
diff --git a/Models/Liveries/yf/75-0745.xml b/Models/Liveries/yf/75-0745.xml
index 1212b9bc..c26f8643 100644
--- a/Models/Liveries/yf/75-0745.xml
+++ b/Models/Liveries/yf/75-0745.xml
@@ -1,36 +1,31 @@
 <?xml version="1.0"?>
-
 <PropertyList>
- <sim>
-  <model>
-   <livery>
-    <name type="string">YF-16 Prototype</name>
-    <texture>Liveries/yf/75-0745.png</texture>
-    <owner type="string">USAF</owner>
-    <pilot type="string"></pilot>
-    <scheme type="string">Special Color</scheme>
-    <block type="int">0</block>
-    <serial type="string">75-0745</serial>
-    <squad type="string">USAF</squad>
-    <year type="string">1976</year>
-   </livery>
-
-   <livery-logo>
-    <texture>Liveries/yf/yf16-transp.png</texture>
-   </livery-logo>
-
-   <livery-patch>
-            <texture>Liveries/patch.default.png</texture>
-    </livery-patch>
-
-    <livery-pod>
-        <texture>Armament/External-stores/MXU-648.png</texture>
-    </livery-pod>
-
-    <f16>
-        <dragchute type="bool">false</dragchute>
-    </f16>
-    <livery-specular type="double">0.4</livery-specular>
-  </model>
- </sim>
+    <sim>
+        <model>
+            <livery>
+                <name type="string">YF-16 Prototype</name>
+                <texture type="string">Liveries/yf/75-0745.png</texture>
+                <owner type="string">USAF</owner>
+                <pilot type="string"></pilot>
+                <scheme type="string">Special Color</scheme>
+                <block type="int">0</block>
+                <serial type="string">75-0745</serial>
+                <squad type="string">USAF</squad>
+                <year type="string">1976</year>
+            </livery>
+            <livery-logo>
+                <texture type="string">Liveries/yf/yf16-transp.png</texture>
+            </livery-logo>
+            <livery-patch>
+                <texture type="string">Liveries/patch.default.png</texture>
+            </livery-patch>
+            <livery-pod>
+                <texture type="string">Armament/External-stores/MXU-648.png</texture>
+            </livery-pod>
+            <f16>
+                <dragchute type="bool">false</dragchute>
+            </f16>
+            <livery-specular type="double">0.4</livery-specular>
+        </model>
+    </sim>
 </PropertyList>