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

Use Target range checks in Armament.

Browse Source
This commit is contained in:
Paul Chote
2013-07-06 15:28:19 +12:00
parent 6f67602d57
commit 3a0f6dda08
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Armament.cs
View File

@@ -107,9 +107,17 @@ namespace OpenRA.Mods.RA
if (limitedAmmo != null && !limitedAmmo.HasAmmo()) if (limitedAmmo != null && !limitedAmmo.HasAmmo())
return; return;
if (!Combat.IsInRange(self.CenterLocation, Weapon.Range, target)) return; // TODO: Define weapon ranges as WRange
if (Combat.IsInRange(self.CenterLocation, Weapon.MinRange, target)) return; var range = new WRange((int)(1024*Weapon.Range));
if (!IsValidAgainst(self.World, target)) return; var minRange = new WRange((int)(1024*Weapon.MinRange));
if (!target.IsInRange(self.CenterPosition, range))
return;
if (target.IsInRange(self.CenterPosition, minRange))
return;
if (!IsValidAgainst(self.World, target))
return;
var barrel = Barrels[Burst % Barrels.Length]; var barrel = Barrels[Burst % Barrels.Length];
var destMove = target.IsActor ? target.Actor.TraitOrDefault<IMove>() : null; var destMove = target.IsActor ? target.Actor.TraitOrDefault<IMove>() : null;