diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index 9511d4f3fd..08ee276faa 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2012 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -43,7 +43,6 @@ namespace OpenRA.Mods.RA.Widgets List>> buttons = new List>>(); List>> tabs = new List>>(); Animation cantBuild; - Animation ready; Animation clock; public readonly string BuildPaletteOpen = "bleep13.aud"; public readonly string BuildPaletteClose = "bleep13.aud"; @@ -60,8 +59,6 @@ namespace OpenRA.Mods.RA.Widgets cantBuild = new Animation("clock"); cantBuild.PlayFetchIndex("idle", () => 0); - ready = new Animation("pips"); - ready.PlayRepeating("ready"); clock = new Animation("clock"); paletteOrigin = paletteClosedOrigin; VisibleQueues = new List(); @@ -240,17 +237,7 @@ namespace OpenRA.Mods.RA.Widgets var repeats = queue.AllQueued().Count(a => a.Item == item.Name); if (repeats > 1 || queue.CurrentItem() != firstOfThis) - { - var offset = -40; - var digits = repeats.ToString(); - foreach (var d in digits) - { - ready.PlayFetchIndex("groups", () => d - '0'); - ready.Tick(); - overlayBits.Add(Pair.New(ready.Image, overlayPos + new float2(offset, -14))); - offset += 6; - } - } + textBits.Add(Pair.New(overlayPos + new float2(-24, -14), repeats.ToString())); } else if (!buildableItems.Any(a => a.Name == item.Name)) diff --git a/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs index ea612e8e80..ea76439f58 100755 --- a/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2012 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, diff --git a/mods/d2k/TODO b/mods/d2k/TODO index 07e33dff5f..24beb575fb 100644 --- a/mods/d2k/TODO +++ b/mods/d2k/TODO @@ -33,4 +33,7 @@ # gamefile extraction (setup/setup.z) from CD fails # support patch 1.06 gamefiles: DATA.R8 has more frames and currently fails to extract, also featuring new terrain with white houses and new unit: grenade thrower # infantry-only areas (Rough) do not show the dark-green mouse cursor -# put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI) \ No newline at end of file +# put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI) +# group number metrics are off, should use DrawText not pips SHP +# AcceptSmudges should be a string and not a boolean or array to seperate SmudgeTypes +# start the game after getting the game-file \ No newline at end of file diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index c7c40c1548..8e2b7a4ddb 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -20,7 +20,7 @@ CARRYALL: Helicopter: InitialFacing: 0 ROT: 5 - Speed: 20 + Speed: 14 LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune RepairBuildings: repaira,repairo,repairh RearmBuildings: hightecha diff --git a/mods/ra/sequences.yaml b/mods/ra/sequences.yaml index e748e8a4f5..f2a2f01a32 100644 --- a/mods/ra/sequences.yaml +++ b/mods/ra/sequences.yaml @@ -868,10 +868,10 @@ pips: Length: 10 medic: Start: 20 - ready: - Start: 3 - hold: - Start: 4 +# ready: +# Start: 3 +# hold: +# Start: 4 tag-fake: Start: 18 tag-primary: