From d0d2c7a49bbe00f0d6c2e9f4b7d5fddda7284871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 11 Aug 2013 21:18:41 +0200
Subject: [PATCH] load Dune 2000 aircraft directly from DATA.R8

---
 .../Widgets/Logic/D2kExtractGameFilesLogic.cs | 15 ------------
 mods/d2k/sequences/aircraft.yaml              | 23 ++++++++++---------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
index e75089a835..4b58f6dcb8 100644
--- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
@@ -98,7 +98,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] { "--r8", pathToDataR8, pathToPalette, "1859", "1890", Path.Combine(pathToSHPs, "combataturret"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "1891", "1922", Path.Combine(pathToSHPs, "siegeturret"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "1923", "1954", Path.Combine(pathToSHPs, "carryall"), "--vehicle" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "1955", "2050", Path.Combine(pathToSHPs, "orni"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "2051", "2082", Path.Combine(pathToSHPs, "combath"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "2083", "2114", Path.Combine(pathToSHPs, "devast"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "2115", "2146", Path.Combine(pathToSHPs, "combathturret"), "--vehicle" },
@@ -107,7 +106,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] { "--r8", pathToDataR8, pathToPalette, "2421", "2452", Path.Combine(pathToSHPs, "raider"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "2453", "2484", Path.Combine(pathToSHPs, "combato"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "2485", "2516", Path.Combine(pathToSHPs, "combatoturret"), "--vehicle" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "2517", "2517", Path.Combine(pathToSHPs, "frigate"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "3014", "3014", Path.Combine(pathToSHPs, "unknown3"), "--projectile" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "3015", "3078", Path.Combine(pathToSHPs, "rpg"), "--projectile" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "3079", "3087", Path.Combine(pathToSHPs, "unknown4"), "--projectile" },
@@ -314,7 +312,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] { "--shp", Path.Combine(pathToSHPs, "combataturret.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "siegeturret.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "carryall.png"), "64" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "orni.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "combath.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "devast.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "combathturret.png"), "48" },
@@ -464,11 +461,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] { "--shp", Path.Combine(pathToSHPs, "spice0.png"), "32" },
 			};
 
-			var shpToTranspose = new string[][]
-			{
-				new string[] { "--transpose", Path.Combine(pathToSHPs, "orni.shp"), Path.Combine(pathToSHPs, "orni.shp"), "0", "32", "3" },
-			};
-
 			var onError = (Action<string>)(s => Game.RunAfterTick(() =>
 			{
 				statusLabel.GetText = () => "Error: " + s;
@@ -495,13 +487,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 						File.Delete(shpToCreate[i][1]);
 					}
 
-					for (int i = 0; i < shpToTranspose.Length; i++)
-					{
-						progressBar.Percentage = i * 100 / shpToTranspose.Count();
-						statusLabel.GetText = () => "Transposing...";
-						Utility.Command.TransposeShp(shpToTranspose[i]);
-					}
-
 					statusLabel.GetText = () => "Building tilesets...";
 					int c = 0;
 					string[] TilesetArray = new string[] { "BASE", "BAT", "BGBS", "ICE", "TREE", "WAST" };
diff --git a/mods/d2k/sequences/aircraft.yaml b/mods/d2k/sequences/aircraft.yaml
index eddbd5be7d..c98a23e5fc 100644
--- a/mods/d2k/sequences/aircraft.yaml
+++ b/mods/d2k/sequences/aircraft.yaml
@@ -1,19 +1,20 @@
 carryall:
-	idle:
-		Start: 0
-		Facings: 32
-	unload:
-		Start: 0
-		Facings: 32
+	idle: DATA.R8
+		Start: 1923
+		Facings: -32
+	unload: DATA.R8
+		Start: 1923
+		Facings: -32
 
 orni:
-	idle:
-		Start: 0
-		Facings: 32
+	idle: DATA.R8
+		Start: 1955
+		Facings: -32
 		Length: 3
 		Tick: 120
+		Transpose: true
 
 frigate:
-	idle:
-		Start: 0
+	idle: DATA.R8
+		Start: 2517
 		Facings: 1
\ No newline at end of file