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

Merge the Valid(...)Weapons methods

Browse Source
This commit is contained in:
reaperrr
2017-06-22 23:23:50 +02:00
committed by Paul Chote
parent 33e8bf9928
commit 0a1083e554
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -198,7 +198,7 @@ namespace OpenRA.Mods.Common.Traits
public abstract Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack); public abstract Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack);
public bool HasAnyValidWeapons(Target t) public bool HasAnyValidWeapons(Target t, bool checkForCenterTargetingWeapons = false)
{ {
if (IsTraitDisabled) if (IsTraitDisabled)
return false; return false;
@@ -209,25 +209,8 @@ namespace OpenRA.Mods.Common.Traits
// PERF: Avoid LINQ. // PERF: Avoid LINQ.
foreach (var armament in Armaments) foreach (var armament in Armaments)
{ {
if (!armament.OutOfAmmo && armament.Weapon.IsValidAgainst(t, self.World, self)) var checkIsValid = checkForCenterTargetingWeapons ? armament.Weapon.TargetActorCenter : !armament.OutOfAmmo;
return true; if (checkIsValid && armament.Weapon.IsValidAgainst(t, self.World, self))
}
return false;
}
public bool HasAnyValidCenterTargetingWeapons(Target t)
{
if (IsTraitDisabled)
return false;
if (Info.AttackRequiresEnteringCell && (positionable == null || !positionable.CanEnterCell(t.Actor.Location, null, false)))
return false;
// PERF: Avoid LINQ.
foreach (var armament in Armaments)
{
if (armament.Weapon.TargetActorCenter && armament.Weapon.IsValidAgainst(t, self.World, self))
return true; return true;
} }
@@ -236,7 +219,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual WPos GetTargetPosition(WPos pos, Target target) public virtual WPos GetTargetPosition(WPos pos, Target target)
{ {
return HasAnyValidCenterTargetingWeapons(target) ? target.CenterPosition : target.Positions.PositionClosestTo(pos); return HasAnyValidWeapons(target, true) ? target.CenterPosition : target.Positions.PositionClosestTo(pos);
} }
public WDist GetMinimumRange() public WDist GetMinimumRange()