load projectiles, muzzles and explosions from DATA.R8

2013-08-11 21:54:39 +02:00
parent d0d2c7a49b
commit 8718a9cb44
15 changed files with 116 additions and 280 deletions
--- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
@@ -63,30 +63,12 @@ namespace OpenRA.Mods.D2k.Widgets.Logic

 			var extractGameFiles = new string[][]
 			{
-				new string[] { "--r8", pathToDataR8, pathToPalette, "0", "2", Path.Combine(pathToSHPs, "overlay") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3", "3", Path.Combine(pathToSHPs, "repairing") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "4", "4", Path.Combine(pathToSHPs, "black") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "5", "8", Path.Combine(pathToSHPs, "selectionedges") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "9", "9", Path.Combine(pathToSHPs, "bar1") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "10", "10", Path.Combine(pathToSHPs, "bar2") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "11", "11", Path.Combine(pathToSHPs, "bar3") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "12", "12", Path.Combine(pathToSHPs, "bar4") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "13", "13", Path.Combine(pathToSHPs, "bar5") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "14", "14", Path.Combine(pathToSHPs, "bar6") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "15", "16", Path.Combine(pathToSHPs, "dots") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "17", "26", Path.Combine(pathToSHPs, "numbers") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "27", "37", Path.Combine(pathToSHPs, "credits") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "40", "101", Path.Combine(pathToSHPs, "d2kshadow") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "102", "105", Path.Combine(pathToSHPs, "crates") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "107", "109", Path.Combine(pathToSHPs, "spicebloom") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "110", "111", Path.Combine(pathToSHPs, "stars") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "112", "113", Path.Combine(pathToSHPs, "greenuparrow") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "114", "129", Path.Combine(pathToSHPs, "rockcrater1") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "130", "145", Path.Combine(pathToSHPs, "rockcrater2") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "146", "161", Path.Combine(pathToSHPs, "sandcrater1") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "162", "177", Path.Combine(pathToSHPs, "sandcrater2") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "178", "193", Path.Combine(pathToSHPs, "unknown") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "194", "205", Path.Combine(pathToSHPs, "unknown2") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "1603", "1634", Path.Combine(pathToSHPs, "missiletank"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "1635", "1666", Path.Combine(pathToSHPs, "trike"), "--vehicle" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "1667", "1698", Path.Combine(pathToSHPs, "quad"), "--vehicle" },
@@ -106,67 +88,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, "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" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3088", "3247", Path.Combine(pathToSHPs, "missile"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3248", "3279", Path.Combine(pathToSHPs, "doubleblast"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3280", "3283", Path.Combine(pathToSHPs, "bombs"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3284", "3287", Path.Combine(pathToSHPs, "unknown6"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3288", "3289", Path.Combine(pathToSHPs, "unknown7"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3290", "3303", Path.Combine(pathToSHPs, "unknown8"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3304", "3305", Path.Combine(pathToSHPs, "unknown9"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3306", "3369", Path.Combine(pathToSHPs, "missile2"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3370", "3380", Path.Combine(pathToSHPs, "unload"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3381", "3385", Path.Combine(pathToSHPs, "harvest"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3386", "3389", Path.Combine(pathToSHPs, "miniboom"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3390", "3402", Path.Combine(pathToSHPs, "mediboom"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3403", "3417", Path.Combine(pathToSHPs, "mediboom2"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3418", "3420", Path.Combine(pathToSHPs, "minifire"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3421", "3428", Path.Combine(pathToSHPs, "miniboom2"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3429", "3432", Path.Combine(pathToSHPs, "minibooms"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3433", "3447", Path.Combine(pathToSHPs, "bigboom"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3448", "3470", Path.Combine(pathToSHPs, "bigboom2"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3471", "3493", Path.Combine(pathToSHPs, "bigboom3"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3494", "3501", Path.Combine(pathToSHPs, "unknown10"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3502", "3509", Path.Combine(pathToSHPs, "unknown11"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3510", "3511", Path.Combine(pathToSHPs, "unknown12"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3512", "3530", Path.Combine(pathToSHPs, "movingsand"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3531", "3534", Path.Combine(pathToSHPs, "unknown13"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3535", "3539", Path.Combine(pathToSHPs, "unknown14"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3540", "3543", Path.Combine(pathToSHPs, "unknown15"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3544", "3548", Path.Combine(pathToSHPs, "unknown16"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3549", "3564", Path.Combine(pathToSHPs, "wormjaw"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3565", "3585", Path.Combine(pathToSHPs, "wormdust"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3586", "3600", Path.Combine(pathToSHPs, "wormsigns1") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3601", "3610", Path.Combine(pathToSHPs, "wormsigns2") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3611", "3615", Path.Combine(pathToSHPs, "wormsigns3") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3616", "3620", Path.Combine(pathToSHPs, "wormsigns4") },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3621", "3625", Path.Combine(pathToSHPs, "rings"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3626", "3630", Path.Combine(pathToSHPs, "minipiff"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3631", "3678", Path.Combine(pathToSHPs, "movingsand2"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3679", "3686", Path.Combine(pathToSHPs, "selling"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3687", "3693", Path.Combine(pathToSHPs, "shockwave"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3694", "3711", Path.Combine(pathToSHPs, "electroplosion"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3712", "3722", Path.Combine(pathToSHPs, "fire"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3723", "3734", Path.Combine(pathToSHPs, "fire2"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3735", "3738", Path.Combine(pathToSHPs, "unknown21"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3739", "3742", Path.Combine(pathToSHPs, "unknown22"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3743", "3774", Path.Combine(pathToSHPs, "doublemuzzle"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3775", "3806", Path.Combine(pathToSHPs, "muzzle"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3807", "3838", Path.Combine(pathToSHPs, "doubleblastmuzzle"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3839", "3870", Path.Combine(pathToSHPs, "minimuzzle"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3871", "3872", Path.Combine(pathToSHPs, "unknown17"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3873", "3875", Path.Combine(pathToSHPs, "unknown18"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3876", "3876", Path.Combine(pathToSHPs, "unknown19"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3877", "3884", Path.Combine(pathToSHPs, "burst"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3885", "3898", Path.Combine(pathToSHPs, "fire3"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3899", "3910", Path.Combine(pathToSHPs, "energy"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3911", "3946", Path.Combine(pathToSHPs, "reveal"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3947", "3964", Path.Combine(pathToSHPs, "orbit"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3965", "3979", Path.Combine(pathToSHPs, "mushroomcloud"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3980", "3987", Path.Combine(pathToSHPs, "mediboom3"), "--projectile" },
-				new string[] { "--r8", pathToDataR8, pathToPalette, "3988", "4010", Path.Combine(pathToSHPs, "largeboom"), "--projectile" },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "4011", "4011", Path.Combine(pathToSHPs, "rifleicon") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "4012", "4012", Path.Combine(pathToSHPs, "bazookaicon") },
 				new string[] { "--r8", pathToDataR8, pathToPalette, "4013", "4013", Path.Combine(pathToSHPs, "engineericon") },
@@ -277,30 +198,10 @@ namespace OpenRA.Mods.D2k.Widgets.Logic

 			var shpToCreate = new string[][]
 			{
-				new string[] { "--shp", Path.Combine(pathToSHPs, "overlay.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "repairing.png"), "24" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "black.png"), "60" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "selectionedges.png"), "8" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bar1.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bar2.png"), "24" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bar3.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bar4.png"), "64" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bar5.png"), "96" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bar6.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "dots.png"), "4" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "numbers.png"), "8" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "credits.png"), "10" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "d2kshadow.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "crates.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "spicebloom.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "stars.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "greenuparrow.png"), "16" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "rockcrater1.png"), "32" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "rockcrater2.png"), "32" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "sandcrater1.png"), "32" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "sandcrater2.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown.png"), "64" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown2.png"), "64" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "missiletank.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "trike.png"), "32" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "quad.png"), "32" },
@@ -315,72 +216,10 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				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" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "deathhandmissile.png"), "24" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "deviatortank.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "raider.png"), "32" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "combato.png"), "48" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "combatoturret.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown3.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "rpg.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown4.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "missile.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "doubleblast.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bombs.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown6.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown7.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown8.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown9.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "missile2.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unload.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "harvest.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "miniboom.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "mediboom.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "mediboom2.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "minifire.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "miniboom2.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "minibooms.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bigboom.png"), "64" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bigboom2.png"), "72" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "bigboom3.png"), "72" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown10.png"), "24" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown11.png"), "84" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown12.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "movingsand.png"), "72" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown13.png"), "72" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown14.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown15.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown16.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "wormjaw.png"), "68" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "wormdust.png"), "68" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "wormsigns1.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "wormsigns2.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "wormsigns3.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "wormsigns4.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "rings.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "minipiff.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "movingsand2.png"), "64" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "selling.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "shockwave.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "electroplosion.png"), "64" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "fire.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "fire2.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown21.png"), "12" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown22.png"), "24" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "doublemuzzle.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "muzzle.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "doubleblastmuzzle.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "minimuzzle.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown17.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown18.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "unknown19.png"), "16" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "burst.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "fire3.png"), "120" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "energy.png"), "48" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "reveal.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "orbit.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "mushroomcloud.png"), "72" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "mediboom3.png"), "32" },
-				new string[] { "--shp", Path.Combine(pathToSHPs, "largeboom.png"), "72" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "rifleicon.png"), "60" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "bazookaicon.png"), "60" },
 				new string[] { "--shp", Path.Combine(pathToSHPs, "engineericon.png"), "60" },
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -141,7 +141,7 @@ namespace OpenRA.Utility

 			frame = srcImage[startFrame];

-			if (args.Contains("--vehicle") || args.Contains("--projectile"))
+			if (args.Contains("--vehicle"))
 			{
 				frame = srcImage[startFrame];

--- a/OpenRA.Utility/Program.cs
+++ b/OpenRA.Utility/Program.cs
@@ -64,7 +64,7 @@ namespace OpenRA.Utility
 			Console.WriteLine("  --extract MOD[,MOD]* FILES [--userdir]     Extract files from mod packages to the current (or user) directory");
 			Console.WriteLine("  --tmp-png MOD[,MOD]* THEATER FILES      Extract terrain tiles to PNG");
 			Console.WriteLine("  --remap SRCMOD:PAL DESTMOD:PAL SRCSHP DESTSHP     Remap SHPs to another palette");
-			Console.WriteLine("  --r8 R8FILE PALETTE START END FILENAME [--noshadow] [--vehicle] [--projectile] [--tileset]     Convert Dune 2000 DATA.R8 to PNGs choosing start- and endframe as well as type for correct offset to append multiple frames to one PNG named by filename optionally removing the shadow.");
+			Console.WriteLine("  --r8 R8FILE PALETTE START END FILENAME [--noshadow] [--vehicle] [--tileset]     Convert Dune 2000 DATA.R8 to PNGs choosing start- and endframe as well as type for correct offset to append multiple frames to one PNG named by filename optionally removing the shadow.");
 			Console.WriteLine("  --transpose SRCSHP DESTSHP START N M [START N M ...]     Transpose the N*M block of frames starting at START.");
 			Console.WriteLine("  --docs MOD     Generate trait documentation in MarkDown format.");
 			Console.WriteLine("  --map-hash MAPFILE     Generate hash of specified oramap file.");
--- a/mods/d2k/bits/bigboom.shp
+++ b/mods/d2k/bits/bigboom.shp
--- a/mods/d2k/bits/deathhandmissile.shp
+++ b/mods/d2k/bits/deathhandmissile.shp
--- a/mods/d2k/bits/doubleblast.shp
+++ b/mods/d2k/bits/doubleblast.shp
--- a/mods/d2k/bits/doubleblastmuzzle.shp
+++ b/mods/d2k/bits/doubleblastmuzzle.shp
--- a/mods/d2k/bits/fire1.shp
+++ b/mods/d2k/bits/fire1.shp
--- a/mods/d2k/bits/fire2.shp
+++ b/mods/d2k/bits/fire2.shp
--- a/mods/d2k/bits/fire3.shp
+++ b/mods/d2k/bits/fire3.shp
--- a/mods/d2k/bits/fire4.shp
+++ b/mods/d2k/bits/fire4.shp
--- a/mods/d2k/bits/shockwave.shp
+++ b/mods/d2k/bits/shockwave.shp
--- a/mods/d2k/bits/temperat.pal
+++ b/mods/d2k/bits/temperat.pal
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -299,7 +299,7 @@ World:
 		AllowModifiers: false
 	PaletteFromFile@effect:
 		Name: effect
-		Filename: temperat.pal
+		Filename: d2k.pal
 		ShadowIndex: 4
 	PaletteFromFile@colorpicker:
 		Name: colorpicker
--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -1,52 +1,45 @@
 explosion:
-	piff: minipiff
-		Start: 0
-		Length: *
-	piffs: minipiff
-		Start: 0
-		Length: *
-	small_explosion: veh-hit3
-		Start: 0
-		Length: *
-	med_explosion: frag1
-		Start: 0
-		Length: *
-	large_explosion: bigboom
-		Start: 0
-		Length: *
-	small_artillery: veh-hit2
-		Start: 0
-		Length: *
-	artillery: art-exp1
-		Start: 0
-		Length: *
-	self_destruct: art-exp1
-		Start: 0
-		Length: *
-	small_building: veh-hit1
-		Start: 0
-		Length: *
-	building: fball1
-		Start: 0
-		Length: *
-	small_napalm: napalm1
-		Start: 0
-		Length: *
-	napalm: napalm2
-		Start: 0
-		Length: *
-	napalm2: napalm2
-		Start: 0
-		Length: *
+	piff: DATA.R8
+		Start: 3626
+		Length: 5
+	piffs: DATA.R8
+		Start: 3626
+		Length: 5
+	small_explosion: DATA.R8
+		Start: 3386
+		Length: 4
+	med_explosion: DATA.R8
+		Start: 3390
+		Length: 12
+	napalm: DATA.R8
+		Start: 3390
+		Length: 12
+	nuke: DATA.R8
+		Start: 3965
+		Length: 14
 		Tick: 60
-	shockwave: shockwave
-		Start: 0
-		Length: *
-		Tick: 30
-	nuke: atomsfx
-		Start: 0
-		Length: *
+	napalm2: DATA.R8
+		Start: 3403
+		Length: 15
 		Tick: 60
+	self_destruct: DATA.R8
+		Start: 3433
+		Length: 15
+	building: DATA.R8
+		Start: 3448
+		Length: 22
+	large_explosion: DATA.R8
+		Start: 3988
+		Length: 22
+	artillery: DATA.R8
+		Start: 3988
+		Length: 22
+	small_artillery: DATA.R8
+		Start: 3988
+		Length: 22
+	small_napalm: DATA.R8
+		Start: 3421
+		Length: 8

 90mm:
 	idle: 
@@ -54,20 +47,20 @@ explosion:
 		Facings: 32

 laserfire:
-	idle: miniboom
-		Start: 0
-		Length: *
+	idle: DATA.R8
+		Start: 3386
+		Length: 3

 pips:
-	groups: numbers
-		Start: 0
+	groups: DATA.R8
+		Start: 17
 		Length: 10
-	tag-primary: stars
-		Start: 0
-	pip-empty: dots
-		Start: 0
-	pip-green: dots
-		Start: 1
+	tag-primary: DATA.R8
+		Start: 110
+	pip-empty: DATA.R8
+		Start: 15
+	pip-green: DATA.R8
+		Start: 16

 clock:
 	idle:
@@ -90,16 +83,21 @@ rank:
 		Length: *

 overlay:
-	build-valid-arrakis:
+	build-valid-arrakis: DATA.R8
 		Start: 0
-	build-invalid:
+		Offset: -20,-20
+	build-invalid: DATA.R8
 		Start: 1
-	target-select:
+		Offset: -20,-20
+	target-select: DATA.R8
 		Start: 2
-	target-valid-arrakis:
+		Offset: -20,-20
+	target-valid-arrakis: DATA.R8
 		Start: 0
-	target-invalid:
+		Offset: -20,-20
+	target-invalid: DATA.R8
 		Start: 1
+		Offset: -20,-20

 rallypoint:
 	flag:flagfly
@@ -111,84 +109,83 @@ rallypoint:
 		Length: *

 rpg:
-	idle:
-		Start: 0
+	idle: DATA.R8
+		Start: 3015
 		Facings: 32

 crate-effects:
-	dollar: selling
-		Start: 0
-		Length: *
-	reveal-map: orbit
-		Start: 0
-		Length: *
-	hide-map: reveal
-		Start: 0
-		Length: *
+	dollar: DATA.R8
+		Start: 3679
+		Length: 8
+	reveal-map: DATA.R8
+		Start: 3947
+		Length: 18
+	hide-map: DATA.R8
+		Start: 3911
+		Length: 36
 	levelup: levelup
 		Start: 0
 		Length: *
 		Tick: 200

 allyrepair:
-	repair:
-		Start: 0
-		Length: *
-		Tick: 160
+	repair: DATA.R8
+		Start: 3
+		Length: 1

 missile:
-	idle:
-		Start: 0
-		Facings: 32
+	idle: DATA.R8
+		Start: 3088
+		Facings: -32

 missile2:
-	idle:
-		Start: 0
-		Facings: 32
+	idle: DATA.R8
+		Start: 3306
+		Facings: -32

 atomic:
-	up: deathhandmissile
-		Start: 0
+	up: DATA.R8
+		Start: 2147
 		Length: 1
-	down: deathhandmissile
-		Start: 1
+	down: DATA.R8
+		Start: 2148
 		Length: 1

 fire:
-	1: fire2
-		Start: 0
-		Length: *
+	1: DATA.R8
+		Start: 3712
+		Length: 10
 		Offset: 0,-3
-	2: fire2
-		Start: 0
-		Length: *
+	2: DATA.R8
+		Start: 3723
+		Length: 11
 		Offset: 0,-3
-	3: fire3
-		Start: 0
-		Length: *
+	3: DATA.R8
+		Start: 3885
+		Length: 13
 		Offset: 0,-3
-	4: fire
-		Start: 0
-		Length: *
+	4: DATA.R8
+		Start: 3712
+		Length: 10
 		Offset: 0,-3

 smoke_m:
-	idle: minifire
-		Start: 0
-		Length: *
-	loop: minifire
-		Start: 0
-		Length: *
-	end: minifire
-		Start: 0
+	idle: DATA.R8
+		Start: 3418
+		Length: 2
+	loop: DATA.R8
+		Start: 3418
+		Length: 2
+	end: DATA.R8
+		Start: 3418
 		Length: 3

 bombs:
-	open:
-		Start: 0
+	open: DATA.R8
+		Start: 3280
 		Length: 4
-	idle:
-		Start: 0
+	idle: DATA.R8
+		Start: 3280
 		Length: 4

 parach:
@@ -210,10 +207,10 @@ waypoint:
 		Length: *

 sietch:
-	idle:
-		Start: 0
+	idle: DATA.R8
+		Start: 2998

 doubleblast:
-	idle: 
-		Start: 0
-		Facings: 16
+	idle: DATA.R8
+		Start: 3279
+		Facings: -16