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

Merge pull request #7276 from penev92/bleed_fixAttack

Browse Source 
Minor targeting cleanup
This commit is contained in:
Oliver Brakmann
2015-01-12 18:48:18 +01:00
parent 20c0063656 1c3dc388ea
commit 75a9848468
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -27,14 +27,6 @@ namespace OpenRA.Mods.Common.Traits
public AttackFollow(Actor self, AttackFollowInfo info)
: base(self, info) { }
protected override bool CanAttack(Actor self, Target target)
{
if (!target.IsValidFor(self))
return false;
return base.CanAttack(self, target);
}
public virtual void Tick(Actor self)
{
DoAttack(self, Target);

11
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -123,14 +123,9 @@ namespace OpenRA.Mods.Common.Traits
if (!Cloaked || self.Owner.IsAlliedWith(viewer))
return true;
return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
{
var dc = a.Actor.Info.Traits.Get<DetectCloakedInfo>();
return a.Actor.Owner.IsAlliedWith(viewer)
&& Info.CloakTypes.Intersect(dc.CloakTypes).Any()
&& (self.CenterPosition - a.Actor.CenterPosition).Length <= WRange.FromCells(dc.Range).Range;
});
return self.World.ActorsWithTrait<DetectCloaked>().Any(a => a.Actor.Owner.IsAlliedWith(viewer)
&& Info.CloakTypes.Intersect(a.Trait.Info.CloakTypes).Any()
&& (self.CenterPosition - a.Actor.CenterPosition).Length <= WRange.FromCells(a.Trait.Info.Range).Range);
}
public Color RadarColorOverride(Actor self)

14
OpenRA.Mods.Common/Traits/DetectCloaked.cs
View File

@@ -13,14 +13,24 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Actor can reveal Cloak actors in a specified range.")]
public class DetectCloakedInfo : TraitInfo<DetectCloaked>
public class DetectCloakedInfo : ITraitInfo
{
[Desc("Specific cloak classifications I can reveal.")]
public readonly string[] CloakTypes = { "Cloak" };
[Desc("Measured in cells.")]
public readonly int Range = 5;
public object Create(ActorInitializer init) { return new DetectCloaked(this); }
}
public class DetectCloaked { }
public class DetectCloaked
{
public readonly DetectCloakedInfo Info;
public DetectCloaked(DetectCloakedInfo info)
{
Info = info;
}
}
}

2
OpenRA.Mods.Common/Traits/TargetableUnit.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual bool TargetableBy(Actor self, Actor viewer)
{
if (cloak == null || !cloak.Cloaked)
if (cloak == null)
return true;
return cloak.IsVisible(self, viewer.Owner);