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

make AttackMove use an activity

Browse Source
This commit is contained in:
Bob
2010-10-24 02:06:07 +13:00
committed by Chris Forbes
parent aa0b7bedf0
commit 5d408fe3c7
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Activities/FlyAttack.cs
View File

@@ -29,10 +29,10 @@ namespace OpenRA.Mods.RA.Activities
self.Trait<AttackPlane>().DoAttack( self, Target ); self.Trait<AttackPlane>().DoAttack( self, Target );
if( IsCanceled && inner == null ) return NextActivity;
if( inner == null ) if( inner == null )
{ {
if( IsCanceled )
return NextActivity;
inner = Util.SequenceActivities( inner = Util.SequenceActivities(
Fly.ToPx(Target.CenterLocation), Fly.ToPx(Target.CenterLocation),
new FlyTimed(50)); new FlyTimed(50));

52
OpenRA.Mods.RA/AttackMove.cs
View File

@@ -20,10 +20,8 @@ namespace OpenRA.Mods.RA
public readonly bool JustMove = false; public readonly bool JustMove = false;
} }
class AttackMove : ITick, IResolveOrder, IOrderVoice class AttackMove : IResolveOrder, IOrderVoice
{ {
public bool AttackMoving { get; set; }
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
if (order.OrderString == "AttackMove") if (order.OrderString == "AttackMove")
@@ -38,12 +36,10 @@ namespace OpenRA.Mods.RA
{ {
self.CancelActivity(); self.CancelActivity();
//if we are just moving, we don't turn on attackmove and this becomes a regular move order //if we are just moving, we don't turn on attackmove and this becomes a regular move order
if (!self.Info.Traits.Get<AttackMoveInfo>().JustMove) if (self.Info.Traits.Get<AttackMoveInfo>().JustMove)
{ self.QueueActivity( self.Trait<Mobile>().MoveTo( order.TargetLocation, 1 ));
AttackMoving = true; else
} self.QueueActivity( new AttackMoveActivity(order.TargetLocation));
Order newOrder = new Order("Move", order.Subject, order.TargetLocation);
self.Trait<Mobile>().ResolveOrder(self, newOrder);
if (self.Owner == self.World.LocalPlayer) if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
@@ -58,23 +54,35 @@ namespace OpenRA.Mods.RA
else line.SetTarget(self, Target.FromOrder(order), Color.Red); else line.SetTarget(self, Target.FromOrder(order), Color.Red);
}); });
} }
else
{
AttackMoving = false; //cancel attack move state for other orders
}
} }
public void Tick(Actor self) class AttackMoveActivity : CancelableActivity
{ {
if (self.Info.Traits.Get<AttackMoveInfo>().JustMove) return; readonly int2 target;
if (!self.HasTrait<AttackBase>()) IActivity inner;
{ public AttackMoveActivity( int2 target ) { this.target = target; }
Game.Debug("AttackMove: {0} has no AttackBase trait".F(self.ToString()));
return;
}
if (!self.IsIdle && (self.HasTrait<AttackMove>() && !(self.Trait<AttackMove>().AttackMoving))) return;
self.Trait<AttackBase>().ScanAndAttack(self, true); public override IActivity Tick( Actor self )
{
self.Trait<AttackBase>().ScanAndAttack(self, true);
if( inner == null )
{
if( IsCanceled )
return NextActivity;
inner = self.Trait<Mobile>().MoveTo( target, 1 );
}
inner = inner.Tick( self );
return this;
}
protected override bool OnCancel( Actor self )
{
if( inner != null )
inner.Cancel( self );
return base.OnCancel( self );
}
} }
} }
} }