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

Split Barrel can-fire checks to separate CanFire method

Browse Source
This commit is contained in:
reaperrr
2017-07-05 23:46:39 +02:00
parent dc61c98098
commit bdfa8a361b
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -204,26 +204,34 @@ namespace OpenRA.Mods.Common.Traits
a(); a();
} }
protected virtual bool CanFire(Actor self, Target target)
{
if (IsReloading)
return false;
if (ammoPool != null && !ammoPool.HasAmmo())
return false;
if (turret != null && !turret.HasAchievedDesiredFacing)
return false;
if (!target.IsInRange(self.CenterPosition, MaxRange()))
return false;
if (Weapon.MinRange != WDist.Zero && target.IsInRange(self.CenterPosition, Weapon.MinRange))
return false;
if (!Weapon.IsValidAgainst(target, self.World, self))
return false;
return true;
}
// Note: facing is only used by the legacy positioning code // Note: facing is only used by the legacy positioning code
// The world coordinate model uses Actor.Orientation // The world coordinate model uses Actor.Orientation
public virtual Barrel CheckFire(Actor self, IFacing facing, Target target) public virtual Barrel CheckFire(Actor self, IFacing facing, Target target)
{ {
if (IsReloading) if (!CanFire(self, target))
return null;
if (ammoPool != null && !ammoPool.HasAmmo())
return null;
if (turret != null && !turret.HasAchievedDesiredFacing)
return null;
if (!target.IsInRange(self.CenterPosition, MaxRange()))
return null;
if (Weapon.MinRange != WDist.Zero && target.IsInRange(self.CenterPosition, Weapon.MinRange))
return null;
if (!Weapon.IsValidAgainst(target, self.World, self))
return null; return null;
if (ticksSinceLastShot >= Weapon.ReloadDelay) if (ticksSinceLastShot >= Weapon.ReloadDelay)