diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs index 6c18e9e843..77df3ca09a 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs @@ -133,10 +133,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "2573", "2588", Path.Combine(pathToSHPs, "guntowera"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2589", "2620", Path.Combine(pathToSHPs, "gunturreta"), "--turret" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2621", "2636", Path.Combine(pathToSHPs, "rockettowera"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2637", "2668", Path.Combine(pathToSHPs, "rocketturreta"), "--turret" }, 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" }, @@ -150,10 +146,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "2733", "2748", Path.Combine(pathToSHPs, "guntowerh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2749", "2780", Path.Combine(pathToSHPs, "gunturreth"), "--turret" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2781", "2796", Path.Combine(pathToSHPs, "rockettowerh"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2797", "2828", Path.Combine(pathToSHPs, "rocketturreth"), "--turret" }, 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" }, @@ -167,10 +159,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "2893", "2908", Path.Combine(pathToSHPs, "guntowero"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2909", "2940", Path.Combine(pathToSHPs, "gunturreto"), "--turret" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2941", "2956", Path.Combine(pathToSHPs, "rockettowero"), "--building" }, - new string[] { "--r8", pathToDataR8, pathToPalette, "2957", "2988", Path.Combine(pathToSHPs, "rocketturreto"), "--turret" }, 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" }, @@ -454,10 +442,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "guntowera.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "gunturreta.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "rockettowera.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "rocketturreta.png"), "48" }, 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" }, @@ -471,10 +455,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "guntowerh.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "gunturreth.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "rockettowerh.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "rocketturreth.png"), "48" }, 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" }, @@ -488,10 +468,6 @@ namespace OpenRA.Mods.D2k.Widgets.Logic 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, "guntowero.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "gunturreto.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "rockettowero.png"), "48" }, - new string[] { "--shp", Path.Combine(pathToSHPs, "rocketturreto.png"), "48" }, 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" }, diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index 7495679c2f..141d8de25b 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -53,38 +53,136 @@ wallo: Offset: -16,16 guntowera: - idle: - Start: 0 + idle: DATA.R8 + Start: 2573 Facings: 1 - recoil: - Start: 0 + Offset: -24,24 + recoil: DATA.R8 + Start: 2573 Facings: 1 - damaged-idle: - Start: 0 + Offset: -24,24 + damaged-idle: DATA.R8 + Start: 2573 Facings: 1 - damaged-recoil: - Start: 0 + Offset: -24,24 + damaged-recoil: DATA.R8 + Start: 2573 Facings: 1 - turret: gunturreta - Start: 0 - Facings: 32 + Offset: -24,24 + turret: DATA.R8 + Start: 2589 + Facings: -32 + Offset: -24,24 + +guntowerh: + idle: DATA.R8 + Start: 2733 + Facings: 1 + Offset: -24,24 + recoil: DATA.R8 + Start: 2733 + Facings: 1 + Offset: -24,24 + damaged-idle: DATA.R8 + Start: 2733 + Facings: 1 + Offset: -24,24 + damaged-recoil: DATA.R8 + Start: 2733 + Facings: 1 + Offset: -24,24 + turret: DATA.R8 + Start: 2749 + Facings: -32 + Offset: -24,24 + +guntowero: + idle: DATA.R8 + Start: 2893 + Facings: 1 + Offset: -24,24 + recoil: DATA.R8 + Start: 2893 + Facings: 1 + Offset: -24,24 + damaged-idle: DATA.R8 + Start: 2893 + Facings: 1 + Offset: -24,24 + damaged-recoil: DATA.R8 + Start: 2893 + Facings: 1 + Offset: -24,24 + turret: DATA.R8 + Start: 2909 + Facings: -32 + Offset: -24,24 rockettowera: - idle: - Start: 0 + idle: DATA.R8 + Start: 2733 Facings: 1 - recoil: - Start: 0 + Offset: -24,24 + recoil: DATA.R8 + Start: 2733 Facings: 1 - damaged-idle: - Start: 0 + Offset: -24,24 + damaged-idle: DATA.R8 + Start: 2733 Facings: 1 - damaged-recoil: - Start: 0 + Offset: -24,24 + damaged-recoil: DATA.R8 + Start: 2733 Facings: 1 - turret: rocketturreta - Start: 0 - Facings: 32 + Offset: -24,24 + turret: DATA.R8 + Start: 2637 + Facings: -32 + Offset: -24,24 + +rockettowerh: + idle: DATA.R8 + Start: 2781 + Facings: 1 + Offset: -24,24 + recoil: DATA.R8 + Start: 2781 + Facings: 1 + Offset: -24,24 + damaged-idle: DATA.R8 + Start: 2781 + Facings: 1 + Offset: -24,24 + damaged-recoil: DATA.R8 + Start: 2781 + Facings: 1 + Offset: -24,24 + turret: DATA.R8 + Start: 2828 + Facings: -32 + Offset: -24,24 + +rockettowero: + idle: DATA.R8 + Start: 2941 + Facings: 1 + Offset: -24,24 + recoil: DATA.R8 + Start: 2941 + Facings: 1 + Offset: -24,24 + damaged-idle: DATA.R8 + Start: 2941 + Facings: 1 + Offset: -24,24 + damaged-recoil: DATA.R8 + Start: 2941 + Facings: 1 + Offset: -24,24 + turret: DATA.R8 + Start: 2988 + Facings: -32 + Offset: -24,24 conyarda: idle: