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

Convert weapons to world coords.

Browse Source
This commit is contained in:
Paul Chote
2013-12-24 23:10:05 +13:00
parent aca897fa76
commit ecdae4cbbe
13 changed files with 44 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ namespace OpenRA.Mods.RA
public abstract Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove);
public bool HasAnyValidWeapons(Target t) { return Armaments.Any(a => a.Weapon.IsValidAgainst(t, self.World)); }
public WRange GetMaximumRange() { return new WRange((int)(1024 * Armaments.Max(a => a.Weapon.Range))); }
public WRange GetMaximumRange() { return Armaments.Max(a => a.Weapon.Range); }
public Armament ChooseArmamentForTarget(Target t) { return Armaments.FirstOrDefault(a => a.Weapon.IsValidAgainst(t, self.World)); }

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

@@ -52,9 +52,7 @@ namespace OpenRA.Mods.RA
if (a == null)
return null;
// TODO: Define weapon ranges as WRange
var range = new WRange(Math.Max(0,(int)(1024*a.Weapon.Range)));
return new Activities.Attack(newTarget, range, allowMove);
return new Activities.Attack(newTarget, a.Weapon.Range, allowMove);
}
}
}

4
OpenRA.Mods.RA/Attack/AttackLeap.cs
View File

@@ -42,9 +42,7 @@ namespace OpenRA.Mods.RA
if (a == null)
return;
// TODO: Define weapon ranges as WRange
var range = new WRange((int)(1024*a.Weapon.Range));
if (!target.IsInRange(self.CenterPosition, range))
if (!target.IsInRange(self.CenterPosition, a.Weapon.Range))
return;
self.CancelActivity();

4
OpenRA.Mods.RA/Attack/AttackLoyalty.cs
View File

@@ -31,9 +31,7 @@ namespace OpenRA.Mods.RA
if (arm == null)
return;
// TODO: Define weapon ranges as WRange
var range = new WRange((int)(1024*arm.Weapon.Range));
if (!target.IsInRange(self.CenterPosition, range))
if (!target.IsInRange(self.CenterPosition, arm.Weapon.Range))
return;
var facing = self.TraitOrDefault<IFacing>();

4
OpenRA.Mods.RA/Attack/AttackMedic.cs
View File

@@ -33,9 +33,7 @@ namespace OpenRA.Mods.RA
if (a == null)
return null;
// TODO: Define weapon ranges as WRange
var range = new WRange(Math.Max(0, (int)(1024 * a.Weapon.Range)));
return new Activities.Heal(newTarget, range, allowMove);
return new Activities.Heal(newTarget, a.Weapon.Range, allowMove);
}
}
}

2
OpenRA.Mods.RA/Attack/AttackTurreted.cs
View File

@@ -96,7 +96,7 @@ namespace OpenRA.Mods.RA
if (weapon != null)
{
var range = WRange.FromCells(Math.Max(0, (int)weapon.Weapon.Range - RangeTolerance));
var range = WRange.FromCells(Math.Max(0, weapon.Weapon.Range.Range / 1024 - RangeTolerance));
attack.Target = target;
if (allowMove && self.HasTrait<Mobile>() && !self.Info.Traits.Get<MobileInfo>().OnRails)