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

Add FrozenActor target type.

Browse Source
This commit is contained in:
Paul Chote
2013-08-08 14:34:49 +12:00
parent c0cb52a5ca
commit 40a9caddc7
5 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -53,10 +53,11 @@ namespace OpenRA.Mods.RA.Activities
if (IsCanceled)
return NextActivity;
if (!Target.IsValid)
var type = Target.Type;
if (type != TargetType.Actor && type != TargetType.Terrain)
return NextActivity;
if (!self.Owner.HasFogVisibility() && Target.Actor != null && Target.Actor.HasTrait<Mobile>() && !self.Owner.Shroud.IsTargetable(Target.Actor))
if (type == TargetType.Actor && !self.Owner.HasFogVisibility() && Target.Actor.HasTrait<Mobile>() && !self.Owner.Shroud.IsTargetable(Target.Actor))
return NextActivity;
if (targetable != null && !targetable.TargetableBy(Target.Actor, self))

12
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -216,13 +216,15 @@ namespace OpenRA.Mods.RA
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
{
if (target.Type == TargetType.Actor)
switch (target.Type)
{
case TargetType.Actor:
return CanTargetActor(self, target.Actor, modifiers, ref cursor);
if (target.Type == TargetType.Terrain)
case TargetType.Terrain:
return CanTargetLocation(self, target.CenterPosition.ToCPos(), othersAtTarget, modifiers, ref cursor);
return false;
default:
return false;
}
}
public bool IsQueued { get; protected set; }