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

Merge branch 'master' of git://github.com/chrisforbes/OpenRA

Browse Source
This commit is contained in:
Paul Chote
2010-01-07 23:23:23 +13:00
parent fc28d768f1 e5e76d071a
commit 11ca6b4be9
7 changed files with 68 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRa.Game/Effects/FlashTarget.cs Normal file
View File

@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRa.Game.Traits;
using OpenRa.Game.Graphics;
namespace OpenRa.Game.Effects
{
class FlashTarget : IEffect
{
Actor target;
int remainingTicks = 4;
public FlashTarget(Actor target)
{
this.target = target;
foreach (var e in Game.world.Effects.OfType<FlashTarget>().Where(a => a.target == target).ToArray())
Game.world.Remove(e);
}
public void Tick()
{
if (--remainingTicks == 0)
Game.world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render()
{
if (remainingTicks % 2 == 0)
foreach (var r in target.Render())
yield return r.WithPalette(PaletteType.Highlight);
}
}
}

7
OpenRa.Game/Graphics/HardwarePalette.cs
View File

@@ -6,7 +6,7 @@ namespace OpenRa.Game.Graphics
public enum PaletteType
{
Gold, Blue, Red, Orange, Teal, Salmon, Green, Gray,
Shadow, Invuln, Chrome, Shroud,
Shadow, Invuln, Chrome, Shroud, Highlight,
};
class HardwarePalette : Sheet
@@ -21,12 +21,13 @@ namespace OpenRa.Game.Graphics
AddPalette(pal);
foreach (string remap in new string[] { "blue", "red", "orange", "teal", "salmon", "green", "gray" })
AddPalette(new Palette(pal, new PaletteRemap(FileSystem.Open(remap + ".rem"))));
AddPalette(new Palette(pal, new PlayerColorRemap(FileSystem.Open(remap + ".rem"))));
AddPalette(new Palette(pal, new PaletteRemap(Color.FromArgb(140, 0, 0, 0))));
AddPalette(new Palette(pal, new SingleColorRemap(Color.FromArgb(140, 0, 0, 0))));
AddPalette(pal); // iron curtain. todo: remap!
AddPalette(pal); // chrome (it's like gold, but we're not going to hax it in palettemods)
AddPalette(new Palette(pal, new ShroudPaletteRemap()));
AddPalette(new Palette(pal, new SingleColorRemap(Color.FromArgb(128, 255, 255, 255))));
}
int AddPalette(Palette p)

1
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -82,6 +82,7 @@
<Compile Include="Combat.cs" />
<Compile Include="Effects\Corpse.cs" />
<Compile Include="Effects\DelayedAction.cs" />
<Compile Include="Effects\FlashTarget.cs" />
<Compile Include="Effects\MoveFlash.cs" />
<Compile Include="Effects\RepairIndicator.cs" />
<Compile Include="Effects\Smoke.cs" />

3
OpenRa.Game/Traits/AttackBase.cs
View File

@@ -155,6 +155,9 @@ namespace OpenRa.Game.Traits
{
self.CancelActivity();
QueueAttack(self, order);
if (self.Owner == Game.LocalPlayer)
Game.world.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
}
else
target = null;