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

Convert weapon plumbing to use integer damage modifiers.

Browse Source
This commit is contained in:
Paul Chote
2014-08-17 17:33:50 +12:00
parent 8e8e02dae8
commit 57ba1b54b4
27 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,9 +27,9 @@ namespace OpenRA.GameRules
[Desc("Delay in ticks before applying the warhead effect.","0 = instant (old model).")]
public readonly int Delay = 0;
public abstract void DoImpact(Target target, Actor firedBy, float firepowerModifier);
public abstract void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers);
public virtual float EffectivenessAgainst(ActorInfo ai) { return 0f; }
public virtual int EffectivenessAgainst(ActorInfo ai) { return 0; }
public bool IsValidAgainst(Target target, World world, Actor firedBy)
{
@@ -59,7 +59,7 @@ namespace OpenRA.GameRules
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) <= 0f)
if (EffectivenessAgainst(victim.Info) <= 0)
return false;
// A target type is valid if it is in the valid targets list, and not in the invalid targets list.
@@ -84,7 +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) <= 0f)
if (EffectivenessAgainst(victim.Info) <= 0)
return false;
// A target type is valid if it is in the valid targets list, and not in the invalid targets list.