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

Merge pull request #3725 from ScottNZ/flash

Browse Source 
Make buildings being captured flash the colour of the captor's owner
This commit is contained in:
Matthias Mailänder
2013-08-23 08:53:59 -07:00
parent 0854cd33fa 3e0dd12db6
commit dce04c9d11
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Effects/FlashTarget.cs
View File

@@ -11,23 +11,27 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Effects namespace OpenRA.Effects
{ {
public class FlashTarget : IEffect public class FlashTarget : IEffect
{ {
Actor target; Actor target;
Player player;
int remainingTicks = 4; int remainingTicks = 4;
public FlashTarget(Actor target) public FlashTarget(Actor target)
: this(target, null) { }
public FlashTarget(Actor target, Player asPlayer)
{ {
this.target = target; this.target = target;
player = asPlayer;
foreach (var e in target.World.Effects.OfType<FlashTarget>().Where(a => a.target == target).ToArray()) foreach (var e in target.World.Effects.OfType<FlashTarget>().Where(a => a.target == target).ToArray())
target.World.Remove(e); target.World.Remove(e);
} }
public void Tick( World world ) public void Tick(World world)
{ {
if (--remainingTicks == 0 || !target.IsInWorld) if (--remainingTicks == 0 || !target.IsInWorld)
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
@@ -37,7 +41,7 @@ namespace OpenRA.Effects
{ {
if (target.IsInWorld && remainingTicks % 2 == 0) if (target.IsInWorld && remainingTicks % 2 == 0)
{ {
var palette = wr.Palette("highlight"); var palette = wr.Palette(player == null ? "highlight" : "highlight" + player.InternalName);
return target.Render(wr) return target.Render(wr)
.Where(r => !r.IsDecoration) .Where(r => !r.IsDecoration)
.Select(r => r.WithPalette(palette)); .Select(r => r.WithPalette(palette));

4
OpenRA.Game/Traits/World/PlayerColorPalette.cs
View File

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using System.Drawing;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Graphics; using OpenRA.Graphics;
@@ -45,6 +46,9 @@ namespace OpenRA.Traits
{ {
var remap = new PlayerColorRemap(info.RemapIndex, owner.Color, info.Ramp); var remap = new PlayerColorRemap(info.RemapIndex, owner.Color, info.Ramp);
wr.AddPalette(info.BaseName+owner.InternalName, new Palette(wr.Palette(info.BasePalette).Palette, remap), info.AllowModifiers); wr.AddPalette(info.BaseName+owner.InternalName, new Palette(wr.Palette(info.BasePalette).Palette, remap), info.AllowModifiers);
var argb = (uint)Color.FromArgb(128, owner.Color.RGB).ToArgb();
wr.AddPalette("highlight" + owner.InternalName, new Palette(Exts.MakeArray(256, i => i == 0 ? 0 : argb)), false);
} }
} }
} }

2
OpenRA.Mods.RA/Activities/CaptureActor.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.RA.Activities
if (capturable.CaptureProgressTime % 25 == 0) if (capturable.CaptureProgressTime % 25 == 0)
{ {
self.World.Add(new FlashTarget(target.Actor)); // TODO: building should flash captor's color self.World.Add(new FlashTarget(target.Actor, self.Owner));
self.World.Add(new FlashTarget(self)); self.World.Add(new FlashTarget(self));
} }