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

Change EffectivenessAgainst to CanTargetActor.

Browse Source
This commit is contained in:
Paul Chote
2014-08-17 19:41:22 +12:00
parent 227a523878
commit d002a23d67
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/GameRules/DamageWarhead.cs
View File

@@ -56,13 +56,15 @@ namespace OpenRA.GameRules
return 100;
}
public override int EffectivenessAgainst(ActorInfo ai)
// TODO: This can be removed after the legacy and redundant 0% = not targetable
// assumption has been removed from the yaml definitions
public override bool CanTargetActor(ActorInfo victim, Actor firedBy)
{
var health = ai.Traits.GetOrDefault<HealthInfo>();
var health = victim.Traits.GetOrDefault<HealthInfo>();
if (health == null)
return 0;
return false;
return DamageVersus(ai);
return DamageVersus(victim) > 0;
}
public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)

12
OpenRA.Game/GameRules/Warhead.cs
View File

@@ -29,8 +29,6 @@ namespace OpenRA.GameRules
public abstract void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers);
public virtual int EffectivenessAgainst(ActorInfo ai) { return 0; }
public bool IsValidAgainst(Target target, World world, Actor firedBy)
{
if (target.Type == TargetType.Actor)
@@ -56,10 +54,13 @@ namespace OpenRA.GameRules
return false;
}
// TODO: This can be removed after the legacy and redundant 0% = not targetable
// assumption has been removed from the yaml definitions
public virtual bool CanTargetActor(ActorInfo victim, Actor firedBy) { return false; }
public bool IsValidAgainst(Actor victim, Actor firedBy)
{
// If this warhead is ineffective against the target, then it is not a valid target
if (EffectivenessAgainst(victim.Info) <= 0)
if (!CanTargetActor(victim.Info, firedBy))
return false;
// A target type is valid if it is in the valid targets list, and not in the invalid targets list.
@@ -83,8 +84,7 @@ namespace OpenRA.GameRules
public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
{
// If this warhead is ineffective against the target, then it is not a valid target
if (EffectivenessAgainst(victim.Info) <= 0)
if (!CanTargetActor(victim.Info, firedBy))
return false;
// A target type is valid if it is in the valid targets list, and not in the invalid targets list.