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

added list of valid target categories to WeaponInfo

Browse Source
This commit is contained in:
Chris Forbes
2010-04-01 22:04:22 +13:00
parent e3ec2f2925
commit 9fa9ec6b5a
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Combat.cs
View File

@@ -109,25 +109,19 @@ namespace OpenRA
public static bool WeaponValidForTarget(WeaponInfo weapon, Actor target) public static bool WeaponValidForTarget(WeaponInfo weapon, Actor target)
{ {
return true; // massive hack, and very wrong.
/*var projectile = Rules.ProjectileInfo[weapon.Projectile];
var warhead = Rules.WarheadInfo[weapon.Warhead];
var unit = target.traits.GetOrDefault<Unit>(); var unit = target.traits.GetOrDefault<Unit>();
if (warhead.EffectivenessAgainst(target.Info.Traits.Get<OwnedActorInfo>().Armor) <= 0) if (!weapon.ValidTargets.Contains(target.Info.Category))
return false; return false;
if (target.traits.Contains<Submarine>()) if (weapon.Warheads.All( w => w.EffectivenessAgainst(target.Info.Traits.Get<OwnedActorInfo>().Armor) <= 0))
return projectile.ASW;
if (unit != null && unit.Altitude > 0)
return projectile.AA;
if (projectile.UnderWater && !target.Info.Traits.Get<OwnedActorInfo>().WaterBound)
return false; return false;
return projectile.AG;*/ /* todo: access to UnderWater is interesting */
// if (projectile.UnderWater && !target.Info.Traits.Get<OwnedActorInfo>().WaterBound)
// return false;
return true;
} }
public static bool HasAnyValidWeapons(Actor self, Actor target) public static bool HasAnyValidWeapons(Actor self, Actor target)

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

@@ -81,6 +81,7 @@ namespace OpenRA.GameRules
public readonly int ROF = 1; public readonly int ROF = 1;
public readonly int Burst = 1; public readonly int Burst = 1;
public readonly bool Charges = false; public readonly bool Charges = false;
public readonly string[] ValidTargets = { "Vehicle", "Infantry" };
public IProjectileInfo Projectile; public IProjectileInfo Projectile;
public List<WarheadInfo> Warheads = new List<WarheadInfo>(); public List<WarheadInfo> Warheads = new List<WarheadInfo>();