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

tesla works better now.

Browse Source
This commit is contained in:
Bob
2010-03-21 22:00:18 +12:00
parent 3a51fc0629
commit 826908d747
7 changed files with 98 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Traits/Attack/AttackBase.cs Normal file → Executable file
View File

@@ -66,9 +66,12 @@ namespace OpenRA.Traits
secondaryBurst = secondaryWeapon != null ? secondaryWeapon.Burst : 1;
}
protected bool CanAttack(Actor self)
protected virtual bool CanAttack(Actor self)
{
return target != null;
if( target == null ) return false;
if( ( primaryFireDelay > 0 ) && ( secondaryFireDelay > 0 ) ) return false;
return true;
}
public bool IsReloading()
@@ -108,6 +111,8 @@ namespace OpenRA.Traits
public void DoAttack(Actor self)
{
if( !CanAttack( self ) ) return;
var unit = self.traits.GetOrDefault<Unit>();
var info = self.Info.Traits.Get<AttackBaseInfo>();
@@ -165,7 +170,7 @@ namespace OpenRA.Traits
var destUnit = thisTarget.traits.GetOrDefault<Unit>();
var info = self.Info.Traits.Get<AttackBaseInfo>();
ScheduleDelayedAction(info.FireDelay, () =>
ScheduleDelayedAction( FireDelay( self, info ), () =>
{
var srcAltitude = unit != null ? unit.Altitude : 0;
var destAltitude = destUnit != null ? destUnit.Altitude : 0;
@@ -202,6 +207,11 @@ namespace OpenRA.Traits
return true;
}
public virtual int FireDelay( Actor self, AttackBaseInfo info )
{
return info.FireDelay;
}
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
if (mi.Button == MouseButton.Left || underCursor == null || underCursor.Owner == null) return null;