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

Remove some unnecessary trait/info lookups from AttackBase.

Browse Source
This commit is contained in:
Paul Chote
2014-03-08 12:38:09 +13:00
parent 113bfe5311
commit 2fd47ee743
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -29,14 +29,20 @@ namespace OpenRA.Mods.RA
[Sync] public bool IsAttacking { get; internal set; }
readonly Actor self;
readonly AttackBaseInfo info;
protected Lazy<IFacing> facing;
Lazy<IEnumerable<Armament>> armaments;
protected IEnumerable<Armament> Armaments { get { return armaments.Value; } }
List<Pair<int, Action>> delayedActions = new List<Pair<int, Action>>();
public AttackBase(Actor self, AttackBaseInfo info)
{
this.self = self;
this.info = info;
armaments = Lazy.New(() => self.TraitsImplementing<Armament>());
facing = Lazy.New(() => self.TraitOrDefault<IFacing>());
}
protected virtual bool CanAttack(Actor self, Target target)
@@ -60,8 +66,6 @@ namespace OpenRA.Mods.RA
public bool IsReloading() { return Armaments.Any(a => a.IsReloading); }
List<Pair<int, Action>> delayedActions = new List<Pair<int, Action>>();
public virtual void Tick(Actor self)
{
for (var i = 0; i < delayedActions.Count; i++)
@@ -88,9 +92,8 @@ namespace OpenRA.Mods.RA
if (!CanAttack(self, target))
return;
var facing = self.TraitOrDefault<IFacing>();
foreach (var a in Armaments)
a.CheckFire(self, this, facing, target);
a.CheckFire(self, this, facing.Value, target);
}
public IEnumerable<IOrderTargeter> Orders
@@ -101,7 +104,7 @@ namespace OpenRA.Mods.RA
yield break;
var negativeDamage = Armaments.First().Weapon.Warheads[0].Damage < 0;
yield return new AttackOrderTargeter("Attack", 6, negativeDamage);
yield return new AttackOrderTargeter(this, "Attack", 6, negativeDamage);
}
}
@@ -168,9 +171,11 @@ namespace OpenRA.Mods.RA
class AttackOrderTargeter : IOrderTargeter
{
readonly bool negativeDamage;
readonly AttackBase ab;
public AttackOrderTargeter(string order, int priority, bool negativeDamage)
public AttackOrderTargeter(AttackBase ab, string order, int priority, bool negativeDamage)
{
this.ab = ab;
this.OrderID = order;
this.OrderPriority = priority;
this.negativeDamage = negativeDamage;
@@ -183,12 +188,12 @@ namespace OpenRA.Mods.RA
{
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
cursor = self.Info.Traits.Get<AttackBaseInfo>().Cursor;
cursor = ab.info.Cursor;
if (target.Type == TargetType.Actor && target.Actor == self)
return false;
if (!self.Trait<AttackBase>().HasAnyValidWeapons(target))
if (!ab.HasAnyValidWeapons(target))
return false;
if (modifiers.HasModifier(TargetModifiers.ForceAttack))
@@ -210,7 +215,7 @@ namespace OpenRA.Mods.RA
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
cursor = self.Info.Traits.Get<AttackBaseInfo>().Cursor;
cursor = ab.info.Cursor;
if (negativeDamage)
return false;

8
OpenRA.Mods.RA/Attack/AttackFrontal.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
[Desc("Unit got to face the target")]
public class AttackFrontalInfo : AttackBaseInfo
public class AttackFrontalInfo : AttackBaseInfo, Requires<IFacingInfo>
{
public readonly int FacingTolerance = 1;
@@ -37,10 +37,10 @@ namespace OpenRA.Mods.RA
if (!base.CanAttack(self, target))
return false;
var facing = self.Trait<IFacing>().Facing;
var facingToTarget = Util.GetFacing(target.CenterPosition - self.CenterPosition, facing);
var f = facing.Value.Facing;
var facingToTarget = Util.GetFacing(target.CenterPosition - self.CenterPosition, f);
if (Math.Abs(facingToTarget - facing) % 256 > info.FacingTolerance)
if (Math.Abs(facingToTarget - f) % 256 > info.FacingTolerance)
return false;
return true;