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

removed old WeaponInfo

Browse Source
This commit is contained in:
Chris Forbes
2010-04-01 19:16:46 +13:00
parent a00abdab85
commit 1f1e748f1b
9 changed files with 11 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/Attack/AttackBase.cs
View File

@@ -142,7 +142,7 @@ namespace OpenRA.Traits
if (limitedAmmo != null && !limitedAmmo.HasAmmo())
return false;
var weapon = Rules.WeaponInfo[weaponName];
var weapon = Rules.Weapons[weaponName.ToLowerInvariant()];
if (weapon.Range * weapon.Range < (target.Location - self.Location).LengthSquared) return false;
if (!Combat.WeaponValidForTarget(weapon, target)) return false;
@@ -211,7 +211,7 @@ namespace OpenRA.Traits
if (mi.Button == MouseButton.Left || underCursor == null || underCursor.Owner == null) return null;
if (self == underCursor) return null;
var isHeal = self.GetPrimaryWeapon().Damage < 0;
var isHeal = self.GetPrimaryWeapon().Warheads.First().Damage < 0;
var forceFire = mi.Modifiers.HasModifier(Modifiers.Ctrl);
if (isHeal)

2
OpenRA.Game/Traits/Attack/AttackTesla.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Traits
public override int FireDelay( Actor self, AttackBaseInfo info )
{
primaryFireDelay = 8;
timeToRecharge = Rules.WeaponInfo[ info.PrimaryWeapon ].ROF;
timeToRecharge = self.GetPrimaryWeapon().ROF;
--charges;
if( target != sameTarget )