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

Clean up AttackOmni.

Browse Source
This commit is contained in:
Paul Chote
2014-03-08 12:10:45 +13:00
parent 6d95c93bea
commit 93c8be4e79
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.RA/Attack/AttackOmni.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -23,30 +23,37 @@ namespace OpenRA.Mods.RA
[Sync] bool buildComplete = false; [Sync] bool buildComplete = false;
public void BuildingComplete(Actor self) { buildComplete = true; } public void BuildingComplete(Actor self) { buildComplete = true; }
public AttackOmni(Actor self) : base(self) { } public AttackOmni(Actor self)
: base(self) { }
protected override bool CanAttack( Actor self, Target target ) protected override bool CanAttack(Actor self, Target target)
{ {
var isBuilding = ( self.HasTrait<Building>() && !buildComplete ); var isBuilding = self.HasTrait<Building>() && !buildComplete;
return base.CanAttack( self, target ) && !isBuilding; return base.CanAttack(self, target) && !isBuilding;
} }
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove) public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove)
{ {
return new SetTarget( newTarget ); return new SetTarget(newTarget, this);
} }
class SetTarget : Activity class SetTarget : Activity
{ {
readonly Target target; readonly Target target;
public SetTarget( Target target ) { this.target = target; } readonly AttackOmni ao;
public override Activity Tick( Actor self ) public SetTarget(Target target, AttackOmni ao)
{
this.target = target;
this.ao = ao;
}
public override Activity Tick(Actor self)
{ {
if (IsCanceled || !target.IsValidFor(self)) if (IsCanceled || !target.IsValidFor(self))
return NextActivity; return NextActivity;
self.Trait<AttackOmni>().DoAttack(self, target); ao.DoAttack(self, target);
return this; return this;
} }
} }