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

Fix cloak detectors revealing for everyone.

Browse Source 
They now only reveal for their owner and their allies.
This commit is contained in:
Paul Chote
2013-08-18 15:01:13 +12:00
parent 1e53434e45
commit 9bbeb63989
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Cloak.cs
View File

@@ -108,10 +108,9 @@ namespace OpenRA.Mods.RA
if (!Cloaked || self.Owner.IsAlliedWith(viewer)) if (!Cloaked || self.Owner.IsAlliedWith(viewer))
return true; return true;
// TODO: Change this to be per-player? A cloak detector revealing to everyone is dumb var centerPosition = self.CenterPosition;
return self.World.ActorsWithTrait<DetectCloaked>().Any(a => return self.World.ActorsWithTrait<DetectCloaked>().Any(a => a.Actor.Owner.IsAlliedWith(viewer) &&
a.Actor.Owner.Stances[self.Owner] != Stance.Ally && (centerPosition - a.Actor.CenterPosition).Length < WRange.FromCells(a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range).Range);
(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);
} }
public Color RadarColorOverride(Actor self) public Color RadarColorOverride(Actor self)

7
OpenRA.Mods.RA/TargetableUnit.cs
View File

@@ -33,15 +33,12 @@ namespace OpenRA.Mods.RA
cloak = self.TraitOrDefault<Cloak>(); cloak = self.TraitOrDefault<Cloak>();
} }
public virtual bool TargetableBy(Actor self, Actor byActor) public virtual bool TargetableBy(Actor self, Actor viewer)
{ {
if (cloak == null || !cloak.Cloaked) if (cloak == null || !cloak.Cloaked)
return true; return true;
if (self.Owner.IsAlliedWith(byActor.Owner)) return cloak.IsVisible(self, viewer.Owner);
return true;
return self.World.ActorsWithTrait<DetectCloaked>().Any(a => (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);
} }
public virtual string[] TargetTypes { get { return info.TargetTypes; } } public virtual string[] TargetTypes { get { return info.TargetTypes; } }