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

make AutoTarget use an activity. add AutoTarget to teslatank

Browse Source
This commit is contained in:
Bob
2010-11-14 19:44:58 +13:00
parent 80e897abfb
commit b2f3b8f2af
3 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -9,6 +9,7 @@
#endregion
using OpenRA.Traits;
using OpenRA.Traits.Activities;
namespace OpenRA.Mods.RA
{
@@ -17,15 +18,8 @@ namespace OpenRA.Mods.RA
public readonly bool AllowMovement = true;
}
class AutoTarget : ITick, INotifyDamage
class AutoTarget : INotifyIdle, INotifyDamage
{
public void Tick(Actor self)
{
if (!self.IsIdle && self.Info.Traits.Get<AutoTargetInfo>().AllowMovement) return;
self.Trait<AttackBase>().ScanAndAttack(self, self.Info.Traits.Get<AutoTargetInfo>().AllowMovement);
}
public void Damaged(Actor self, AttackInfo e)
{
if (!self.IsIdle) return;
@@ -42,5 +36,38 @@ namespace OpenRA.Mods.RA
self.Trait<AttackBase>().AttackTarget(Target.FromActor(e.Attacker), false, self.Info.Traits.Get<AutoTargetInfo>().AllowMovement);
}
public void Idle( Actor self )
{
self.QueueActivity( new IdleAttackActivity() );
}
class IdleAttackActivity : Idle
{
Actor currentTarget;
IActivity inner;
public override IActivity Tick( Actor self )
{
if( NextActivity != null && inner != null )
inner.Cancel( self );
if( inner == null )
{
if( NextActivity != null )
return NextActivity;
var attack = self.Trait<AttackBase>();
var range = attack.GetMaximumRange();
currentTarget = attack.ScanForTarget(self, null);
if( currentTarget != null )
inner = attack.GetAttackActivity( self, Target.FromActor(currentTarget), self.Info.Traits.Get<AutoTargetInfo>().AllowMovement );
}
if( inner != null )
inner = Util.RunActivity( self, inner );
return this;
}
}
}
}