epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added Jes suggestions on d2k R8 to SHP conversion

Browse Source 
- windtrapzaps is actually the IX structure animation
- rpg, missile, missile2: frame order reversed like vehicles
This commit is contained in:
Matthias Mailänder
2012-12-10 20:00:10 +01:00
parent 18b457af37
commit f80180509c
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
View File

@@ -373,7 +373,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--r8", PathToDataR8, PathToPalette, "4674", "4721", Path.Combine(PathToSHPs, "heavyweld"), "--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, "4722", "4744", Path.Combine(PathToSHPs, "unknown20"), "--building"},
new string[] {"--r8", PathToDataR8, PathToPalette, "4745", "4759", Path.Combine(PathToSHPs, "marker"), "--building"}, new string[] {"--r8", PathToDataR8, PathToPalette, "4745", "4759", Path.Combine(PathToSHPs, "marker"), "--building"},
new string[] {"--r8", PathToDataR8, PathToPalette, "4760", "4819", Path.Combine(PathToSHPs, "windtrapzaps"), "--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", PathToDataR8, PathToPalette, "4820", "4840", Path.Combine(PathToSHPs, "deathhandlaunch"), "--building"},
new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/MOUSE.R8"), PathToPalette, "0", "264", Path.Combine(PathToSHPs, "mouse")}, new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/MOUSE.R8"), PathToPalette, "0", "264", Path.Combine(PathToSHPs, "mouse")},
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, "0", "799", Path.Combine(PathToTilesets, "BASE"), "--tileset"},
@@ -676,7 +676,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
new string[] {"--shp", Path.Combine(PathToSHPs, "heavyweld.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, "unknown20.png"), "96"},
new string[] {"--shp", Path.Combine(PathToSHPs, "marker.png"), "96"}, new string[] {"--shp", Path.Combine(PathToSHPs, "marker.png"), "96"},
new string[] {"--shp", Path.Combine(PathToSHPs, "windtrapzaps.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, "deathhandlaunch.png"), "96"},
new string[] {"--shp", Path.Combine(PathToSHPs, "mouse.png"), "48"}, new string[] {"--shp", Path.Combine(PathToSHPs, "mouse.png"), "48"},
new string[] {"--shp", Path.Combine(PathToSHPs, "spice0.png"), "32"}, new string[] {"--shp", Path.Combine(PathToSHPs, "spice0.png"), "32"},

8
OpenRA.Utility/Command.cs
View File

@@ -175,7 +175,8 @@ namespace OpenRA.Utility
Console.WriteLine("FrameCount: {0}", FrameCount); Console.WriteLine("FrameCount: {0}", FrameCount);
} }
} }
else if (args.Contains("--vehicle")) //resorting to RA/CnC compatible counter-clockwise frame order //resorting to RA/CnC compatible counter-clockwise frame order
else if (args.Contains("--vehicle") || args.Contains("--projectile"))
{ {
frame = srcImage[startFrame]; frame = srcImage[startFrame];
@@ -296,11 +297,6 @@ namespace OpenRA.Utility
OffsetX = frame.FrameWidth/2 - frame.Width/2; OffsetX = frame.FrameWidth/2 - frame.Width/2;
OffsetY = frame.FrameHeight/2 - frame.Height/2; OffsetY = frame.FrameHeight/2 - frame.Height/2;
} }
else if (args.Contains("--projectile"))
{
OffsetX = frame.FrameWidth/2 - frame.OffsetX;
OffsetY = frame.FrameHeight/2 - frame.OffsetY;
}
else if (args.Contains("--building")) else if (args.Contains("--building"))
{ {
if (frame.OffsetX < 0) { frame.OffsetX = 0 - frame.OffsetX; } if (frame.OffsetX < 0) { frame.OffsetX = 0 - frame.OffsetX; }