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

7
OpenRA.Game/Combat.cs
View File

@@ -82,11 +82,6 @@ namespace OpenRA
}
}
static float GetMaximumSpread(WeaponInfo weapon, WarheadInfo warhead, float modifier)
{
return (int)(warhead.Spread * Math.Log(Math.Abs(weapon.Damage * modifier), 2));
}
static float GetDamageToInflict(Actor target, ProjectileArgs args, WarheadInfo warhead, float modifier)
{
var distance = (target.CenterLocation - args.dest).Length;
@@ -95,7 +90,7 @@ namespace OpenRA
return rawDamage * multiplier;
}
public static bool WeaponValidForTarget(WeaponInfo weapon, Actor target)
public static bool WeaponValidForTarget(NewWeaponInfo weapon, Actor target)
{
return true; // massive hack, and very wrong.

2
OpenRA.Game/Effects/NukeLaunch.cs
View File

@@ -40,13 +40,11 @@ namespace OpenRA.Effects
readonly int targetAltitude = 400;
int altitude;
bool goingUp = true;
WeaponInfo weapon;
public NukeLaunch(Actor silo, string weapon, int2 targetLocation)
{
this.silo = silo;
this.targetLocation = targetLocation;
this.weapon = Rules.WeaponInfo[weapon];
anim = new Animation("nuke");
anim.PlayRepeating("up");
pos = silo.CenterLocation;

8
OpenRA.Game/Exts.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA
return xs.Aggregate(1f, (a, x) => a * x);
}
public static WeaponInfo GetPrimaryWeapon(this Actor self)
public static NewWeaponInfo GetPrimaryWeapon(this Actor self)
{
var info = self.Info.Traits.GetOrDefault<AttackBaseInfo>();
if (info == null) return null;
@@ -52,10 +52,10 @@ namespace OpenRA
var weapon = info.PrimaryWeapon;
if (weapon == null) return null;
return Rules.WeaponInfo[weapon];
return Rules.Weapons[weapon.ToLowerInvariant()];
}
public static WeaponInfo GetSecondaryWeapon(this Actor self)
public static NewWeaponInfo GetSecondaryWeapon(this Actor self)
{
var info = self.Info.Traits.GetOrDefault<AttackBaseInfo>();
if (info == null) return null;
@@ -63,7 +63,7 @@ namespace OpenRA
var weapon = info.SecondaryWeapon;
if (weapon == null) return null;
return Rules.WeaponInfo[weapon];
return Rules.Weapons[weapon.ToLowerInvariant()];
}
public static int GetMaxHP(this Actor self)

3
OpenRA.Game/GameRules/Rules.cs
View File

@@ -30,7 +30,6 @@ namespace OpenRA
{
public static IniFile AllRules;
public static Dictionary<string, List<string>> Categories = new Dictionary<string, List<string>>();
public static InfoLoader<WeaponInfo> WeaponInfo;
public static InfoLoader<WarheadInfo> WarheadInfo;
public static InfoLoader<VoiceInfo> VoiceInfo;
public static TechTree TechTree;
@@ -50,8 +49,6 @@ namespace OpenRA
"Projectile",
"Voice");
WeaponInfo = new InfoLoader<WeaponInfo>(
Pair.New<string, Func<string, WeaponInfo>>("Weapon", _ => new WeaponInfo()));
WarheadInfo = new InfoLoader<WarheadInfo>(
Pair.New<string, Func<string, WarheadInfo>>("Warhead", _ => new WarheadInfo()));
VoiceInfo = new InfoLoader<VoiceInfo>(

41
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -1,41 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
*
* OpenRA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenRA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
namespace OpenRA.GameRules
{
public class WeaponInfo
{
public readonly int Burst = 1;
public readonly bool Charges = false;
public readonly int Damage = 0;
public readonly string Projectile = "Invisible";
public readonly int ROF = 1; // in 1/15 second units.
public readonly float Range = 0;
public readonly string Report = null;
public readonly int Speed = -1;
public readonly bool TurboBoost = false;
public readonly string Warhead = null;
public readonly bool RenderAsTesla = false;
public readonly bool RenderAsLaser = false;
public readonly bool UsePlayerColor = true;
public readonly int BeamRadius = 1;
}
}

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -156,7 +156,6 @@
<Compile Include="GameRules\InfoLoader.cs" />
<Compile Include="GameRules\Rules.cs" />
<Compile Include="GameRules\WarheadInfo.cs" />
<Compile Include="GameRules\WeaponInfo.cs" />
<Compile Include="Graphics\Animation.cs" />
<Compile Include="Game.cs" />
<Compile Include="Graphics\CursorSequence.cs" />

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 )

6
OpenRA.Mods.Aftermath/DemoTruck.cs
View File

@@ -59,9 +59,9 @@ namespace OpenRA.Mods.Aftermath
//w.Add(new Bullet(info.PrimaryWeapon, detonatedBy.Owner, detonatedBy,
// detonateLocation, detonateLocation, altitude, altitude));
var weapon = Rules.WeaponInfo[info.PrimaryWeapon];
if (!string.IsNullOrEmpty(weapon.Report))
Sound.Play(weapon.Report + ".aud");
//var weapon = Rules.WeaponInfo[info.PrimaryWeapon];
//if (!string.IsNullOrEmpty(weapon.Report))
// Sound.Play(weapon.Report + ".aud");
// Remove from world
self.Health = 0;