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

Merge some Armament CanFire checks

Browse Source
This commit is contained in:
reaperrr
2017-07-05 23:50:07 +02:00
parent bdfa8a361b
commit 514bd12885
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,19 +206,14 @@ namespace OpenRA.Mods.Common.Traits
protected virtual bool CanFire(Actor self, Target target) protected virtual bool CanFire(Actor self, Target target)
{ {
if (IsReloading) if (IsReloading || (ammoPool != null && !ammoPool.HasAmmo()))
return false;
if (ammoPool != null && !ammoPool.HasAmmo())
return false; return false;
if (turret != null && !turret.HasAchievedDesiredFacing) if (turret != null && !turret.HasAchievedDesiredFacing)
return false; return false;
if (!target.IsInRange(self.CenterPosition, MaxRange())) if ((!target.IsInRange(self.CenterPosition, MaxRange()))
return false; || (Weapon.MinRange != WDist.Zero && target.IsInRange(self.CenterPosition, Weapon.MinRange)))
if (Weapon.MinRange != WDist.Zero && target.IsInRange(self.CenterPosition, Weapon.MinRange))
return false; return false;
if (!Weapon.IsValidAgainst(target, self.World, self)) if (!Weapon.IsValidAgainst(target, self.World, self))