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

Ditto for GpsDot.

Browse Source
This commit is contained in:
Paul Chote
2013-02-24 14:48:16 +13:00
parent 5a4bd14835
commit e33c783fc1
1 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -15,65 +15,76 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects namespace OpenRA.Mods.RA.Effects
{ {
class GpsDotInfo : ITraitInfo, Requires<RenderSimpleInfo> class GpsDotInfo : ITraitInfo
{ {
public readonly string String = "Infantry"; public readonly string String = "Infantry";
public readonly string IndicatorPalettePrefix = "player";
public object Create(ActorInitializer init) public object Create(ActorInitializer init)
{ {
return new GpsDot(init, String); return new GpsDot(init.self, this);
} }
} }
class GpsDot : IEffect class GpsDot : IEffect
{ {
Actor self; Actor self;
GpsWatcher watcher; GpsDotInfo info;
RenderSimple rs;
bool show = false;
Animation anim; Animation anim;
public GpsDot(ActorInitializer init, string s) GpsWatcher watcher;
{ HiddenUnderFog huf;
anim = new Animation("gpsdot"); Spy spy;
anim.PlayRepeating(s); bool show = false;
public GpsDot(Actor self, GpsDotInfo info)
{
this.self = self;
this.info = info;
anim = new Animation("gpsdot");
anim.PlayRepeating(info.String);
self = init.self;
rs = self.Trait<RenderSimple>();
self.World.AddFrameEndTask(w => w.Add(this)); self.World.AddFrameEndTask(w => w.Add(this));
if(self.World.LocalPlayer != null) if (self.World.LocalPlayer != null)
watcher = self.World.LocalPlayer.PlayerActor.Trait<GpsWatcher>(); watcher = self.World.LocalPlayer.PlayerActor.Trait<GpsWatcher>();
} }
bool firstTick = true;
public void Tick(World world) public void Tick(World world)
{ {
show = false;
if (self.Destroyed) if (self.Destroyed)
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
if (world.LocalPlayer == null) if (world.LocalPlayer == null || !self.IsInWorld || self.Destroyed)
return; return;
if ( // Can be granted at runtime via a crate, so can't cache
self.IsInWorld var cloak = self.TraitOrDefault<Cloak>();
&& (watcher.Granted || watcher.GrantedAllies)
&& !self.Trait<HiddenUnderFog>().IsVisible(self.World.RenderedShroud, self) // WRONG if (firstTick)
&& (!self.HasTrait<Cloak>() || !self.Trait<Cloak>().Cloaked)
&& (!self.HasTrait<Spy>() || !self.Trait<Spy>().Disguised)
)
{ {
show = true; huf = self.TraitOrDefault<HiddenUnderFog>();
spy = self.TraitOrDefault<Spy>();
firstTick = false;
} }
var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies));
var hasDot = (huf != null && !huf.IsVisible(self.World.RenderedShroud, self)); // WRONG (why?)
var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised);
show = hasGps && hasDot && !dotHidden;
} }
public IEnumerable<Renderable> Render(WorldRenderer wr) public IEnumerable<Renderable> Render(WorldRenderer wr)
{ {
if (show && !self.Destroyed) if (!show || self.Destroyed)
{ yield break;
var p = self.CenterLocation;
yield return new Renderable(anim.Image, p.ToFloat2() - 0.5f * anim.Image.size, rs.Palette(self.Owner, wr), p.Y) var p = self.CenterLocation;
.WithScale(1.5f); var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName);
} yield return new Renderable(anim.Image, p.ToFloat2() - 0.5f * anim.Image.size, palette, p.Y)
.WithScale(1.5f);
} }
} }
} }