diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs index 77df3ca09a..61c842c72b 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs @@ -124,51 +124,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "2518", "2520", Path.Combine(pathToSHPs, "heavya"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2521", "2522", Path.Combine(pathToSHPs, "radara"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2523", "2524", Path.Combine(pathToSHPs, "pwra"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2525", "2526", Path.Combine(pathToSHPs, "barra"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2559", "2560", Path.Combine(pathToSHPs, "conyarda"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2561", "2563", Path.Combine(pathToSHPs, "refa"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2564", "2565", Path.Combine(pathToSHPs, "hightecha"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2566", "2570", Path.Combine(pathToSHPs, "siloa"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2571", "2572", Path.Combine(pathToSHPs, "repaira"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2669", "2670", Path.Combine(pathToSHPs, "researcha"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2671", "2672", Path.Combine(pathToSHPs, "starporta"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2673", "2675", Path.Combine(pathToSHPs, "lighta"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2676", "2677", Path.Combine(pathToSHPs, "palacea"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2678", "2680", Path.Combine(pathToSHPs, "heavyh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2681", "2682", Path.Combine(pathToSHPs, "radarh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2683", "2684", Path.Combine(pathToSHPs, "pwrh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2685", "2686", Path.Combine(pathToSHPs, "barrh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2719", "2720", Path.Combine(pathToSHPs, "conyardh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2721", "2723", Path.Combine(pathToSHPs, "refh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2724", "2725", Path.Combine(pathToSHPs, "hightechh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2726", "2730", Path.Combine(pathToSHPs, "siloh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2731", "2732", Path.Combine(pathToSHPs, "repairh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2829", "2830", Path.Combine(pathToSHPs, "researchh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2831", "2832", Path.Combine(pathToSHPs, "starporth"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2833", "2835", Path.Combine(pathToSHPs, "lighth"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2836", "2837", Path.Combine(pathToSHPs, "palaceh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2838", "2840", Path.Combine(pathToSHPs, "heavyo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2841", "2842", Path.Combine(pathToSHPs, "radaro"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2843", "2844", Path.Combine(pathToSHPs, "pwro"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2845", "2846", Path.Combine(pathToSHPs, "barro"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2879", "2880", Path.Combine(pathToSHPs, "conyardo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2881", "2883", Path.Combine(pathToSHPs, "refo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2884", "2885", Path.Combine(pathToSHPs, "hightecho"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2886", "2890", Path.Combine(pathToSHPs, "siloo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2891", "2892", Path.Combine(pathToSHPs, "repairo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2989", "2990", Path.Combine(pathToSHPs, "researcho"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2991", "2992", Path.Combine(pathToSHPs, "starporto"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2993", "2995", Path.Combine(pathToSHPs, "lighto"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2996", "2997", Path.Combine(pathToSHPs, "palaceo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2998", "2998", Path.Combine(pathToSHPs, "sietch"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2999", "3000", Path.Combine(pathToSHPs, "starportc"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "3001", "3003", Path.Combine(pathToSHPs, "heavyc"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "3004", "3005", Path.Combine(pathToSHPs, "palacec"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "3006", "3007", Path.Combine(pathToSHPs, "conyardh2"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "3008", "3013", Path.Combine(pathToSHPs, "plates") }, 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" }, @@ -328,38 +283,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] { "--r8", pathToDataR8, pathToPalette, "4106", "4106", Path.Combine(pathToSHPs, "radaraicon2") }, new string[] { "--r8", pathToDataR8, pathToPalette, "4107", "4107", Path.Combine(pathToSHPs, "radaraicon3") }, new string[] { "--r8", pathToDataR8, pathToPalette, "4108", "4108", Path.Combine(pathToSHPs, "conyardaicon3") }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4109", "4150", Path.Combine(pathToSHPs, "conmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4151", "4174", Path.Combine(pathToSHPs, "wtrpmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4175", "4194", Path.Combine(pathToSHPs, "barramake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4195", "4212", Path.Combine(pathToSHPs, "barrhmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4213", "4230", Path.Combine(pathToSHPs, "barromake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4231", "4253", Path.Combine(pathToSHPs, "refmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4254", "4273", Path.Combine(pathToSHPs, "radarmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4274", "4294", Path.Combine(pathToSHPs, "highmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4295", "4312", Path.Combine(pathToSHPs, "lightmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4313", "4327", Path.Combine(pathToSHPs, "silomake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4328", "4346", Path.Combine(pathToSHPs, "heavymake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4347", "4369", Path.Combine(pathToSHPs, "starportmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4370", "4390", Path.Combine(pathToSHPs, "repairmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4391", "4412", Path.Combine(pathToSHPs, "researchmake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4413", "4435", Path.Combine(pathToSHPs, "palacemake"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4436", "4449", Path.Combine(pathToSHPs, "cranea"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4450", "4463", Path.Combine(pathToSHPs, "craneh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4464", "4477", Path.Combine(pathToSHPs, "craneo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4478", "4491", Path.Combine(pathToSHPs, "cranea2"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4492", "4501", Path.Combine(pathToSHPs, "windtrapa"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4502", "4511", Path.Combine(pathToSHPs, "windtraph"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4512", "4521", Path.Combine(pathToSHPs, "windtrapo"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4522", "4552", Path.Combine(pathToSHPs, "disha"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4553", "4582", Path.Combine(pathToSHPs, "dishh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4583", "4613", Path.Combine(pathToSHPs, "disho"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4614", "4643", Path.Combine(pathToSHPs, "highweld"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4644", "4673", Path.Combine(pathToSHPs, "lightweld"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4674", "4721", Path.Combine(pathToSHPs, "heavyweld"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4722", "4744", Path.Combine(pathToSHPs, "unknown20"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4745", "4759", Path.Combine(pathToSHPs, "marker"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4760", "4819", Path.Combine(pathToSHPs, "researchzaps"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "4820", "4840", Path.Combine(pathToSHPs, "deathhandlaunch"), "--building" }, new string[] { "--r8", Path.Combine(Platform.SupportDir, "Content/d2k/BLOXBASE.R8"), pathToPalette, "0", "799", Path.Combine(pathToTilesets, "BASE"), "--tileset" }, new string[] { "--r8", Path.Combine(Platform.SupportDir, "Content/d2k/BLOXBASE.R8"), pathToPalette, "748", "749", Path.Combine(pathToSHPs, "spice0") }, new string[] { "--r8", Path.Combine(Platform.SupportDir, "Content/d2k/BLOXBAT.R8"), pathToPalette, "0", "799", Path.Combine(pathToTilesets, "BAT"), "--tileset" }, @@ -432,52 +355,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "frigate.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "heavya.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "radara.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "pwra.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "barra.png"), "80" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "conyarda.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "refa.png"), "120" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "hightecha.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "siloa.png"), "32" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "repaira.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "researcha.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "starporta.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "lighta.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "palacea.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "heavyh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "radarh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "pwrh.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "barrh.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "conyardh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "refh.png"), "120" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "hightechh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "siloh.png"), "32" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "repairh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "researchh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "starporth.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "lighth.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "palaceh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "heavyo.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "radaro.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "pwro.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "barro.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "conyardo.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "refo.png"), "120" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "hightecho.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "siloo.png"), "32" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "repairo.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "researcho.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "starporto.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "lighto.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "palaceo.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "sietch.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "starportc.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "heavyc.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "palacec.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "conyardh2.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "plates.png"), "32" }, 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" }, @@ -616,37 +493,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic new string[] { "--shp", Path.Combine(pathToSHPs, "palaceaicon.png"), "60" }, new string[] { "--shp", Path.Combine(pathToSHPs, "palacehicon.png"), "60" }, new string[] { "--shp", Path.Combine(pathToSHPs, "palaceoicon.png"), "60" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "conmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "wtrpmake.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "barramake.png"), "80" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "barrhmake.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "barromake.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "refmake.png"), "120" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "radarmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "highmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "lightmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "silomake.png"), "32" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "heavymake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "starportmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "repairmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "researchmake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "palacemake.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "cranea.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "craneh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "craneo.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "windtrapa.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "windtraph.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "windtrapo.png"), "64" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "disha.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "dishh.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "disho.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "highweld.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "lightweld.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "heavyweld.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "unknown20.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "marker.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "researchzaps.png"), "96" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "deathhandlaunch.png"), "96" }, new string[] { "--shp", Path.Combine(pathToSHPs, "spice0.png"), "32" }, }; diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs index 3675d4aa4c..0911469df5 100644 --- a/OpenRA.Utility/Command.cs +++ b/OpenRA.Utility/Command.cs @@ -272,11 +272,6 @@ namespace OpenRA.Utility offsetX = frame.FrameSize.Width / 2 - frame.Size.Width / 2; offsetY = frame.FrameSize.Height / 2 - frame.Size.Height / 2; } - else if (args.Contains("--building")) - { - offsetX = Math.Abs(frame.Offset.X); - offsetY = frame.FrameSize.Height - Math.Abs(frame.Offset.Y); - } Console.WriteLine("calculated OffsetX: {0}", offsetX); Console.WriteLine("calculated OffsetY: {0}", offsetY); diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index f5ab0b5ada..e88e33fdb9 100644 --- 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] [--infrantry] [--vehicle] [--projectile] [--building] [--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] [--infrantry] [--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(" --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."); diff --git a/mods/d2k/bits/palaceh.shp b/mods/d2k/bits/palaceh.shp deleted file mode 100644 index d72467ae4a..0000000000 Binary files a/mods/d2k/bits/palaceh.shp and /dev/null differ diff --git a/mods/d2k/bits/pwra.shp b/mods/d2k/bits/pwra.shp deleted file mode 100644 index d536efdcf5..0000000000 Binary files a/mods/d2k/bits/pwra.shp and /dev/null differ diff --git a/mods/d2k/bits/pwrh.shp b/mods/d2k/bits/pwrh.shp deleted file mode 100644 index 4d033a0f31..0000000000 Binary files a/mods/d2k/bits/pwrh.shp and /dev/null differ diff --git a/mods/d2k/bits/pwro.shp b/mods/d2k/bits/pwro.shp deleted file mode 100644 index 0d7b0e9d93..0000000000 Binary files a/mods/d2k/bits/pwro.shp and /dev/null differ diff --git a/mods/d2k/bits/repair.shp b/mods/d2k/bits/repair.shp deleted file mode 100644 index 554dd84165..0000000000 Binary files a/mods/d2k/bits/repair.shp and /dev/null differ diff --git a/mods/d2k/bits/research.shp b/mods/d2k/bits/research.shp deleted file mode 100644 index a87f480055..0000000000 Binary files a/mods/d2k/bits/research.shp and /dev/null differ diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index b4bac470bb..ecc9d08a54 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -523,6 +523,8 @@ REPAIR: ValuePercentage: 50 RallyPoint: RallyPoint: 1,3 + RenderBuilding: + Image: repaira ^HIGHTECH: Inherits: ^Building @@ -581,8 +583,8 @@ RESEARCH: FlareType: Building: Power: -40 - Footprint: xxx xxx - Dimensions: 3,2 + Footprint: _x_ xxx xxx + Dimensions: 3,3 Bib: Health: HP: 1000 @@ -592,6 +594,8 @@ RESEARCH: Range: 4 ProvidesCustomPrerequisite: Prerequisite: Ix + RenderBuilding: + Image: researcha ^PALACE: Inherits: ^Building @@ -609,8 +613,8 @@ RESEARCH: Description: Unlocks elite infantry\n Special Ability: Ornithopter Strike Building: Power: -50 - Footprint: _x_ xxx =xx - Dimensions: 3,3 + Footprint: xxx xxx + Dimensions: 3,2 Bib: Health: HP: 2000 diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index 141d8de25b..63aac8da31 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -185,632 +185,958 @@ rockettowero: Offset: -24,24 conyarda: - idle: - Start: 0 - make: conmake + idle: DATA.R8 + Start: 2559 + Offset: -48,64 + make: DATA.R8 # TODO: overlay + Start: 4109 + Length: 42 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2560 + Offset: -48,64 +# build: DATA.R8 # TODO: overlay +# Start: 4436 +# Length: 14 +# Offset: -48,64 +# damaged-build: DATA.R8 # TODO: overlay +# Start: 4436 +# Length: 14 +# Offset: -48,64 + bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * - damaged-idle: - Start: 1 - bib: bib3x - Start: 0 - Length: * - #build: cranea - # Start: 0 - # Length: 14 - # Tick: 75 - #damaged-build: cranea - # Start: 0 - # Length: 14 - # Tick: 75 -repair: - idle: - Start: 0 +repaira: + make: DATA.R8 # TODO: overlay + Start: 4370 + Length: 20 + Offset: -48,48 + idle: DATA.R8 + Start: 2571 + Offset: -48,48 ZOffset: -1c511 - active: - Start: 0 - Length: 10 +# active: DATA.R8 # TODO: overlay +# Start: 4746 +# Length: 14 +# Offset: -48,48 +# ZOffset: -1c511 +# damaged-active: DATA.R8 # TODO: overlay +# Start: 4746 +# Length: 14 +# Tick: 60 +# Offset: -48,48 +# ZOffset: -1c511 + damaged-idle: DATA.R8 + Start: 2572 + Offset: -48,48 + ZOffset: -1c511 + +repairh: + make: DATA.R8 # TODO: overlay + Start: 4370 + Length: 20 + Offset: -48,48 + idle: DATA.R8 + Start: 2731 + Offset: -48,48 + ZOffset: -1c511 + active: DATA.R8 # TODO: overlay + Start: 4746 + Length: 14 + Offset: -48,48 + ZOffset: -1c511 + damaged-active: DATA.R8 # TODO: overlay + Start: 4746 + Length: 14 Tick: 60 + Offset: -48,48 ZOffset: -1c511 - damaged-idle: - Start: 10 + damaged-idle: DATA.R8 + Start: 2732 + Offset: -48,48 ZOffset: -1c511 - damaged-active: - Start: 10 - Length: 10 + +repairo: + make: DATA.R8 # TODO: overlay + Start: 4370 + Length: 20 + Offset: -48,48 + idle: DATA.R8 + Start: 2891 + Offset: -48,48 + ZOffset: -1c511 + active: DATA.R8 # TODO: overlay + Start: 4746 + Length: 14 + Offset: -48,48 + ZOffset: -1c511 + damaged-active: DATA.R8 # TODO: overlay + Start: 4746 + Length: 14 Tick: 60 + Offset: -48,48 + ZOffset: -1c511 + damaged-idle: DATA.R8 + Start: 2892 + Offset: -48,48 ZOffset: -1c511 - make: repairmake - Start: 0 - Length: * starporta: - idle: - Start: 0 + idle: DATA.R8 + Start: 2671 ZOffset: -1c511 - active: - Start: 0 + Offset: -48,64 + active: DATA.R8 + Start: 2671 Length: 1 ZOffset: -1c511 - damaged-idle: - Start: 1 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2672 ZOffset: -1c511 - damaged-active: - Start: 1 + Offset: -48,64 + damaged-active: DATA.R8 + Start: 2672 ZOffset: -1c511 - make: starportmake - Start: 0 - Length: * + Offset: -48,64 + make: DATA.R8 + Start: 4347 + Length: 22 + Offset: -48,64 bib: bib3x Start: 0 Length: * pwra: - idle: - Start: 0 - Length: 6 - Tick: 160 - make: wtrpmake - Start: 0 - Length: * - damaged-idle: - Start: 6 + idle: DATA.R8 + Start: 2523 + Offset: -32,64 + make: DATA.R8 + Start: 4151 + Length: 24 + Offset: -32,64 + damaged-idle: DATA.R8 + Start: 2524 + Offset: -32,64 + active: DATA.R8 # TODO: not wired up + Start: 4492 + Length: 10 + Offset: -32,64 bib: bib2x Start: 0 Length: * barra: - idle: - Start: 0 - make: barramake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2525 + Offset: -32,64 + make: DATA.R8 + Start: 4175 + Length: 20 + Offset: -32,64 + damaged-idle: DATA.R8 + Start: 2526 + Offset: -32,64 bib: bib2x Start: 0 Length: * radara: - idle: - Start: 0 - make: radarmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2521 + Offset: -48,80 + make: DATA.R8 + Start: 4254 + Length: 19 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2522 + Offset: -48,80 + active: DATA.R8 # TODO: wire it up + Start: 4522 + Length: 30 + Offset: -48,80 bib: bib3x Start: 0 Length: * refa: - idle: - Start: 0 + idle: DATA.R8 + Start: 2561 Length: 1 - make: refmake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 - Length: 1 - damaged-build-top: - Start: 2 - Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + make: DATA.R8 + Start: 4231 + Length: 22 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2561 + Offset: -48,64 + idle-top: DATA.R8 + Start: 2562 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 2563 + Offset: -48,64 bib: bib3x Start: 0 Length: * siloa: - idle: - Start: 0 + idle: DATA.R8 + Start: 2566 Length: 4 - damaged-idle: - Start: 4 + Offset: -16,16 + damaged-idle: DATA.R8 + Start: 2569 Length: 1 - make: silomake - Start: 0 - Length: * + Offset: -16,16 + make: DATA.R8 + Start: 4313 + Length: 14 + Offset: -16,16 hightecha: - idle: - Start: 0 - make: highmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2564 + Offset: -48,80 + make: DATA.R8 + Start: 4274 + Length: 20 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2565 + Offset: -48,80 + active: DATA.R8 # TODO: not wired up + Start: 4614 + Length: 30 + Offset: -48,80 bib: bib3x Start: 0 Length: * -research: - idle: - Start: 0 - Length: 20 - Tick: 80 - make: researchmake +researcha: + idle: DATA.R8 + Start: 2669 + Offset: -48,80 + make: DATA.R8 + Start: 4391 + Length: 21 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2670 + Offset: -48,80 + active: DATA.R8 # TODO: wire it up + Start: 4760 + Length: 80 + Offset: -48,80 + bib: bib3x Start: 0 Length: * - damaged-idle: - Start: 20 - Length: 20 - Tick: 80 + +researchh: + idle: DATA.R8 + Start: 2829 + Offset: -48,80 + make: DATA.R8 + Start: 4391 + Length: 21 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2830 + Offset: -48,80 + active: DATA.R8 # TODO: wire it up + Start: 4760 + Length: 80 + Offset: -48,80 + bib: bib3x + Start: 0 + Length: * + +researcho: + idle: DATA.R8 + Start: 2989 + Offset: -48,80 + make: DATA.R8 + Start: 4391 + Length: 21 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2990 + Offset: -48,80 + active: DATA.R8 # TODO: wire it up + Start: 4760 + Length: 80 + Offset: -48,80 bib: bib3x Start: 0 Length: * palacea: - idle: - Start: 0 - make: palacemake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2676 + Offset: -48,48 + make: DATA.R8 + Start: 4413 + Length: 22 + Offset: -48,48 + damaged-idle: DATA.R8 + Start: 2677 + Offset: -48,48 bib: bib3x Start: 0 Length: * lighta: - idle: - Start: 0 + idle: DATA.R8 + Start: 2673 Length: 1 - make: lightmake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,64 + make: DATA.R8 + Start: 4295 + Length: 7 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2673 + Offset: -48,64 + build-top: DATA.R8 + Start: 2674 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,64 + damaged-build-top: DATA.R8 + Start: 2675 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + idle-top: DATA.R8 + Start: 2674 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 2675 + Offset: -48,64 + active: DATA.R8 # TODO: not wired up + Start: 4644 + Length: 30 + Offset: -48,64 bib: bib3x Start: 0 Length: * heavya: - idle: - Start: 0 + idle: DATA.R8 + Start: 2518 Length: 1 - make: heavymake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,80 + make: DATA.R8 + Start: 4328 + Length: 18 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2518 + Offset: -48,80 + build-top: DATA.R8 + Start: 2519 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,80 + damaged-build-top: DATA.R8 + Start: 2520 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,80 + idle-top: DATA.R8 + Start: 2519 + Offset: -48,80 + damaged-idle-top: DATA.R8 + Start: 2520 + Offset: -48,80 + active: DATA.R8 # TODO: not wired up + Start: 4674 + Length: 47 + Offset: -48,80 bib: bib3x Start: 0 Length: * conyardh: - idle: - Start: 0 - make: conmake - Start: 0 - Length: * - damaged-idle: - Start: 1 - bib: bib3x + idle: DATA.R8 + Start: 2719 + Offset: -48,64 + make: DATA.R8 # TODO: overlay + Start: 4109 + Length: 41 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2720 + Offset: -48,64 +# build: DATA.R8 # TODO: overlay +# Start: 4450 +# Length: 14 +# Offset: -48,64 +# damaged-build: DATA.R8 # TODO: overlay +# Start: 4450 +# Length: 14 +# Offset: -48,64 + bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * starporth: - idle: - Start: 0 + idle: DATA.R8 + Start: 2831 ZOffset: -1c511 - active: - Start: 0 + Offset: -48,64 + active: DATA.R8 + Start: 2831 Length: 1 + Offset: -48,64 ZOffset: -1c511 - damaged-idle: - Start: 1 + damaged-idle: DATA.R8 + Start: 2832 + Offset: -48,64 ZOffset: -1c511 - damaged-active: - Start: 1 + damaged-active: DATA.R8 + Start: 2832 + Offset: -48,64 + ZOffset: -1c511 + make: DATA.R8 + Start: 4347 + Length: 22 + Offset: -48,64 ZOffset: -1c511 - make: starportmake - Start: 0 - Length: * bib: bib3x Start: 0 Length: * pwrh: - idle: - Start: 0 - Length: 6 - Tick: 160 - make: wtrpmake - Start: 0 - Length: * - damaged-idle: - Start: 6 + idle: DATA.R8 + Start: 2683 + Offset: -32,64 + make: DATA.R8 + Start: 4151 + Length: 24 + Offset: -32,64 + damaged-idle: DATA.R8 + Start: 2684 + Offset: -32,64 + active: DATA.R8 # TODO: not wired up + Start: 4502 + Length: 10 + Offset: -32,64 bib: bib2x Start: 0 Length: * barrh: - idle: - Start: 0 - make: barrhmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2685 + Offset: -32,64 + make: DATA.R8 + Start: 4195 + Length: 17 + Offset: -32,64 + damaged-idle: DATA.R8 + Start: 2686 + Offset: -32,64 bib: bib2x Start: 0 Length: * radarh: - idle: - Start: 0 - make: radarmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2681 + Offset: -48,80 + make: DATA.R8 + Start: 4254 + Length: 19 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2682 + Offset: -48,80 + active: DATA.R8 # TODO: wire it up + Start: 4553 + Length: 30 + Offset: -48,80 bib: bib3x Start: 0 Length: * refh: - idle: - Start: 0 + idle: DATA.R8 + Start: 2721 Length: 1 - make: refmake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 - Length: 1 - damaged-build-top: - Start: 2 - Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + make: DATA.R8 + Start: 4231 + Length: 22 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2721 + Offset: -48,64 + idle-top: DATA.R8 + Start: 2722 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 2723 + Offset: -48,64 bib: bib3x Start: 0 Length: * siloh: - idle: - Start: 0 + idle: DATA.R8 + Start: 2726 Length: 4 - damaged-idle: - Start: 4 + Offset: -16,16 + damaged-idle: DATA.R8 + Start: 2730 Length: 1 - make: silomake - Start: 0 - Length: * + Offset: -16,16 + make: DATA.R8 + Start: 4313 + Length: 14 + Offset: -16,16 hightechh: - idle: - Start: 0 - make: highmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2724 + Offset: -48,80 + make: DATA.R8 + Start: 4274 + Length: 20 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2725 + Offset: -48,80 + active: DATA.R8 # TODO: not wired up + Start: 4614 + Length: 30 + Offset: -48,80 bib: bib3x Start: 0 Length: * palaceh: - idle: - Start: 0 - make: palacemake - Start: 0 - Length: * - damaged-idle: - Start: 7 - active: - Start: 1 - Length: 6 - Tick: 160 - damaged-active: - Start: 8 - Length: 6 - Tick: 160 + idle: DATA.R8 + Start: 2836 + Offset: -48,64 + make: DATA.R8 + Start: 4413 + Length: 22 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2837 + Offset: -48,64 +# active: DATA.R8 # TODO: overlay +# Start: 4820 +# Length: 20 +# Offset: -48,64 + damaged-active: DATA.R8 + Start: 4820 + Length: 20 + Offset: -48,64 bib: bib3x Start: 0 Length: * lighth: - idle: - Start: 0 + idle: DATA.R8 + Start: 2833 Length: 1 - make: lightmake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,64 + make: DATA.R8 + Start: 4295 + Length: 7 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2833 + Offset: -48,64 + build-top: DATA.R8 + Start: 2834 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,64 + damaged-build-top: DATA.R8 + Start: 2835 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + idle-top: DATA.R8 + Start: 2834 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 2835 + Offset: -48,64 + active: DATA.R8 # TODO: not wired up + Start: 4644 + Length: 30 + Offset: -48,64 bib: bib3x Start: 0 Length: * heavyh: - idle: - Start: 0 + idle: DATA.R8 + Start: 2678 Length: 1 - make: heavymake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,80 + make: DATA.R8 + Start: 4328 + Length: 18 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2678 + Offset: -48,80 + build-top: DATA.R8 + Start: 2679 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,80 + damaged-build-top: DATA.R8 + Start: 2680 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,80 + idle-top: DATA.R8 + Start: 2679 + Offset: -48,80 + damaged-idle-top: DATA.R8 + Start: 2680 + Offset: -48,80 + active: DATA.R8 # TODO: not wired up + Start: 4674 + Length: 47 + Offset: -48,80 bib: bib3x Start: 0 Length: * conyardo: - idle: - Start: 0 - make: conmake - Start: 0 - Length: * - damaged-idle: - Start: 1 - bib: bib3x + idle: DATA.R8 + Start: 2879 + Offset: -48,64 + make: DATA.R8 # TODO: overlay + Start: 4109 + Length: 41 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2880 + Offset: -48,64 +# build: DATA.R8 # TODO: overlay +# Start: 4464 +# Length: 14 +# Offset: -48,64 +# damaged-build: DATA.R8 # TODO: overlay +# Start: 4464 +# Length: 14 +# Offset: -48,64 + bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * starporto: - idle: - Start: 0 + idle: DATA.R8 + Start: 2991 + Offset: -48,64 ZOffset: -1c511 - active: - Start: 0 + active: DATA.R8 + Start: 2991 Length: 1 + Offset: -48,64 ZOffset: -1c511 - damaged-idle: - Start: 1 + damaged-idle: DATA.R8 + Start: 2992 + Offset: -48,64 ZOffset: -1c511 - damaged-active: - Start: 1 + damaged-active: DATA.R8 + Start: 2992 + Offset: -48,64 ZOffset: -1c511 - make: starportmake - Start: 0 - Length: * + make: DATA.R8 + Start: 4347 + Length: 22 + Offset: -48,64 bib: bib3x Start: 0 Length: * pwro: - idle: - Start: 0 - Length: 6 - Tick: 160 - make: wtrpmake - Start: 0 - Length: * - damaged-idle: - Start: 6 + idle: DATA.R8 + Start: 2843 + Length: 1 + Offset: -32,64 + make: DATA.R8 + Start: 4151 + Length: 24 + Offset: -32,64 + damaged-idle: DATA.R8 + Start: 2844 + Offset: -32,64 + active: DATA.R8 # TODO: not wired up + Start: 4512 + Length: 10 + Offset: -32,64 bib: bib2x Start: 0 Length: * barro: - idle: - Start: 0 - make: barromake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2845 + Offset: -32,64 + make: DATA.R8 + Start: 4213 + Length: 17 + Offset: -32,64 + damaged-idle: DATA.R8 + Start: 2846 + Offset: -32,64 bib: bib2x Start: 0 Length: * radaro: - idle: - Start: 0 - make: radarmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2841 + Offset: -48,80 + make: DATA.R8 + Start: 4254 + Length: 19 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2842 + Offset: -48,80 + active: DATA.R8 # TODO: wire it up + Start: 4583 + Length: 30 + Offset: -48,80 bib: bib3x Start: 0 Length: * refo: - idle: - Start: 0 + idle: DATA.R8 + Start: 2881 Length: 1 - make: refmake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 - Length: 1 - damaged-build-top: - Start: 2 - Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + make: DATA.R8 + Start: 4231 + Length: 22 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2881 + Offset: -48,64 + idle-top: DATA.R8 + Start: 2882 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 2883 + Offset: -48,64 bib: bib3x Start: 0 Length: * siloo: - idle: - Start: 0 + idle: DATA.R8 + Start: 2886 Length: 4 - damaged-idle: - Start: 4 + Offset: -16,16 + damaged-idle: DATA.R8 + Start: 2890 Length: 1 - make: silomake - Start: 0 - Length: * + Offset: -16,16 + make: DATA.R8 + Start: 4313 + Length: 14 + Offset: -16,16 hightecho: - idle: - Start: 0 - make: highmake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2884 + Offset: -48,80 + make: DATA.R8 + Start: 4274 + Length: 20 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2885 + Offset: -48,80 + active: DATA.R8 # TODO: not wired up + Start: 4614 + Length: 30 + Offset: -48,80 bib: bib3x Start: 0 Length: * palaceo: - idle: - Start: 0 - make: palacemake - Start: 0 - Length: * - damaged-idle: - Start: 1 + idle: DATA.R8 + Start: 2996 + Offset: -48,64 + make: DATA.R8 + Start: 4413 + Length: 22 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2997 + Offset: -48,64 bib: bib3x Start: 0 Length: * lighto: - idle: - Start: 0 + idle: DATA.R8 + Start: 2993 Length: 1 - make: lightmake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,64 + make: DATA.R8 + Start: 4295 + Length: 7 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 2993 + Offset: -48,64 + build-top: DATA.R8 + Start: 2994 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,64 + damaged-build-top: DATA.R8 + Start: 2995 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + idle-top: DATA.R8 + Start: 2994 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 2995 + Offset: -48,64 bib: bib3x Start: 0 Length: * heavyo: - idle: - Start: 0 + idle: DATA.R8 + Start: 2838 Length: 1 - make: heavymake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,80 + make: DATA.R8 + Start: 4328 + Length: 18 + Offset: -48,80 + damaged-idle: DATA.R8 + Start: 2838 + Offset: -48,80 + build-top: DATA.R8 + Start: 2839 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,80 + damaged-build-top: DATA.R8 + Start: 2840 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,80 + idle-top: DATA.R8 + Start: 2839 + Offset: -48,80 + damaged-idle-top: DATA.R8 + Start: 2840 + Offset: -48,80 + active: DATA.R8 # TODO: not wired up + Start: 4674 + Length: 47 + Offset: -48,80 bib: bib3x Start: 0 Length: * -palacec: - idle: - Start: 0 - damaged-idle: - Start: 1 +palacec: # TODO: unused + idle: DATA.R8 + Start: 3004 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 3005 + Offset: -48,64 bib: bib3x Start: 0 Length: * -starportc: - idle: - Start: 0 +starportc: # TODO: unused + idle: DATA.R8 + Start: 2999 + Offset: -48,64 ZOffset: -1c511 - active: - Start: 0 + active: DATA.R8 + Start: 2999 Length: 1 + Offset: -48,64 ZOffset: -1c511 - damaged-idle: - Start: 1 + damaged-idle: DATA.R8 + Start: 3000 + Offset: -48,64 ZOffset: -1c511 - damaged-active: - Start: 1 + damaged-active: DATA.R8 + Start: 3000 + Offset: -48,64 ZOffset: -1c511 - make: starportmake - Start: 0 - Length: * + make: DATA.R8 + Start: 4347 + Length: 22 + Offset: -48,64 bib: bib3x Start: 0 Length: * -heavyc: - idle: - Start: 0 +heavyc: # TODO: unused + idle: DATA.R8 + Start: 3001 Length: 1 - make: heavymake - Start: 0 - Length: * - damaged-idle: - Start: 0 - build-top: - Start: 1 + Offset: -48,64 + make: DATA.R8 + Start: 4328 + Length: 18 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 3001 + Offset: -48,64 + build-top: DATA.R8 + Start: 3002 Length: 1 - damaged-build-top: - Start: 2 + Offset: -48,64 + damaged-build-top: DATA.R8 + Start: 3003 Length: 1 - idle-top: - Start: 1 - damaged-idle-top: - Start: 2 + Offset: -48,64 + idle-top: DATA.R8 + Start: 3002 + Offset: -48,64 + damaged-idle-top: DATA.R8 + Start: 3003 + Offset: -48,64 + active: DATA.R8 # TODO: not wired up + Start: 4674 + Length: 47 + Offset: -48,64 bib: bib3x Start: 0 Length: * + +conyardc: # TODO: unused + idle: DATA.R8 + Start: 3006 + Offset: -48,64 + make: DATA.R8 # TODO: overlay + Start: 4109 + Length: 41 + Offset: -48,64 + damaged-idle: DATA.R8 + Start: 3007 + Offset: -48,64 +# build: DATA.R8 # TODO: overlay +# Start: 4478 +# Length: 14 +# Offset: -48,64 +# damaged-build: DATA.R8 # TODO: overlay +# Start: 4478 +# Length: 14 +# Offset: -48,64 + bib: bib3x # TODO: read this from BLOXBAT.R8 + Start: 0 + Length: * + +plates: # TODO: unused + idle: DATA.R8 + Start: 3008 + Length: 6