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

Fix AttackLeap.

Browse Source
This commit is contained in:
Paul Chote
2010-11-29 11:52:27 +13:00
parent ec5b9a1150
commit 7850acc6fb
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -115,7 +115,7 @@ namespace OpenRA.Mods.RA
a(); a();
} }
public void DoAttack(Actor self, Target target) public virtual void DoAttack(Actor self, Target target)
{ {
if( !CanAttack( self, target ) ) return; if( !CanAttack( self, target ) ) return;

17
OpenRA.Mods.RA/AttackLeap.cs
View File

@@ -14,25 +14,22 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
class AttackLeapInfo : AttackBaseInfo class AttackLeapInfo : AttackFrontalInfo
{ {
public override object Create(ActorInitializer init) { return new AttackLeap(init.self); } public override object Create(ActorInitializer init) { return new AttackLeap(init.self, this); }
} }
class AttackLeap : AttackBase class AttackLeap : AttackFrontal
{ {
internal bool IsLeaping; internal bool IsLeaping;
protected Target target; protected Target target;
public AttackLeap(Actor self) public AttackLeap(Actor self, AttackLeapInfo info)
: base(self) {} : base(self, info) {}
public override void Tick(Actor self) public override void DoAttack(Actor self, Target target)
{ {
base.Tick(self); if( !CanAttack( self, target ) ) return;
if (!target.IsValid) return;
if (IsLeaping) return;
var weapon = Weapons[0].Info; var weapon = Weapons[0].Info;
if( !Combat.IsInRange( self.CenterLocation, weapon.Range, target ) ) return; if( !Combat.IsInRange( self.CenterLocation, weapon.Range, target ) ) return;