From 4c667be946355af5ac59ca96f9b68e5b597d865d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 22 May 2012 22:17:48 +0200 Subject: [PATCH] fixed vehicles driving backwards also fixed the bazooka for quad --- OpenRA.Utility/Command.cs | 31 +++++-------------------------- mods/d2k/bits/mcv.shp | Bin 75230 -> 0 bytes mods/d2k/rules/structures.yaml | 14 +++++++------- mods/d2k/rules/vehicles.yaml | 2 +- ripD2kGameFiles.sh | 2 +- 5 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 mods/d2k/bits/mcv.shp diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs index f398117cb1..51ebff6a9d 100644 --- a/OpenRA.Utility/Command.cs +++ b/OpenRA.Utility/Command.cs @@ -123,14 +123,14 @@ namespace OpenRA.Utility int x = 0; - if (args.Contains("--vehicle")) //complex resorting to RA/CnC compatible frame order + if (args.Contains("--vehicle")) //resorting to RA/CnC compatible counter-clockwise frame order { - endFrame = endFrame - (FrameCount / 2); + frame = srcImage[startFrame]; + + endFrame--; startFrame--; for (int f = endFrame; f > startFrame; f--) { - frame = srcImage[f]; - OffsetX = frame.FrameWidth/2 - frame.OffsetX; OffsetY = frame.FrameHeight/2 - frame.OffsetY; @@ -147,29 +147,8 @@ namespace OpenRA.Utility bitmap.UnlockBits(data); x += frame.FrameWidth; - } - endFrame = endFrame + (FrameCount / 2) - 1; - startFrame = startFrame + (FrameCount / 2) + 1; - for (int f = endFrame; f > startFrame; f--) - { + frame = srcImage[f]; - - OffsetX = frame.FrameWidth/2 - frame.OffsetX; - OffsetY = frame.FrameHeight/2 - frame.OffsetY; - - Console.WriteLine("calculated OffsetX: {0}", OffsetX); - Console.WriteLine("calculated OffsetY: {0}", OffsetY); - - var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Width, frame.Height), ImageLockMode.WriteOnly, - PixelFormat.Format8bppIndexed); - - for (var i = 0; i < frame.Height; i++) - Marshal.Copy(frame.Image, i * frame.Width, - new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); - - bitmap.UnlockBits(data); - - x += frame.FrameWidth; } } else diff --git a/mods/d2k/bits/mcv.shp b/mods/d2k/bits/mcv.shp deleted file mode 100644 index 68b0a1fb47be211963192777b7c4861dfe6c90c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75230 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 e^j^zfU|Bve*%hu(?PN*- diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 5483a3b75f..857f61b73a 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -45,8 +45,8 @@ PWRA: Prerequisite: anypower Building: Power: 100 - Footprint: xx xx - Dimensions: 2,2 + Footprint: xx xx xx + Dimensions: 2,3 Health: HP: 400 Armor: @@ -145,7 +145,7 @@ REFA: Description: Harvesters unload spice here. Building: Power: -30 - Footprint: _x_ xxx x== + Footprint: xxx xxx x== Dimensions: 3,3 Health: HP: 900 @@ -211,8 +211,8 @@ LIGHTA: Description: light vehicles. Building: Power: -30 - Footprint: xxx xxx - Dimensions: 3,2 + Footprint: xxx xxx xxx + Dimensions: 3,3 Health: HP: 1500 Armor: @@ -224,8 +224,8 @@ LIGHTA: PlayerPalette: d2kplayer RallyPoint: Exit@1: - SpawnOffset: 5,0 - ExitCell: 1,1 + SpawnOffset: 10,0 + ExitCell: 1,3 Production: Produces: Vehicle PrimaryBuilding: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 9e6d90569b..77aa3e9845 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -93,7 +93,7 @@ QUAD: RenderUnit: PlayerPalette: d2kplayer AttackFrontal: - PrimaryWeapon: RedEye + PrimaryWeapon: Dragon PrimaryOffset: 0,0,0,-2 PrimaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25 AutoTarget: \ No newline at end of file diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh index 5e599aa582..df9b77d707 100755 --- a/ripD2kGameFiles.sh +++ b/ripD2kGameFiles.sh @@ -38,7 +38,7 @@ mono OpenRA.Utility.exe --r8 $R8 $PAL 1859 1890 "combataturret" --vehicle mono OpenRA.Utility.exe --shp combataturret.png 48 mono OpenRA.Utility.exe --r8 $R8 $PAL 1891 1922 "siegeturret" --vehicle mono OpenRA.Utility.exe --shp siegeturret.png 48 -mono OpenRA.Utility.exe --r8 $R8 $PAL 1923 1954 "carryall" --vehicle # requires some reordering (again) +mono OpenRA.Utility.exe --r8 $R8 $PAL 1923 1954 "carryall" --vehicle mono OpenRA.Utility.exe --shp carryall.png 64 mono OpenRA.Utility.exe --r8 $R8 $PAL 1955 2050 "orni" --vehicle mono OpenRA.Utility.exe --shp orni.png 48