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

add radius to Selectable, used to adjust distance for damage calculation

Browse Source
This commit is contained in:
Chris Forbes
2010-04-02 16:03:24 +13:00
parent b2cb4dcc29
commit ca0d993c1a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Combat.cs
View File

@@ -116,7 +116,9 @@ namespace OpenRA
static float GetDamageToInflict(Actor target, ProjectileArgs args, WarheadInfo warhead, float modifier)
{
var distance = (target.CenterLocation - args.dest).Length;
var selectable = target.Info.Traits.GetOrDefault<SelectableInfo>();
var radius = selectable != null ? selectable.Radius : 0;
var distance = Math.Max(0, (target.CenterLocation - args.dest).Length - radius);
var rawDamage = warhead.Damage * modifier * (float)Math.Exp(-distance / warhead.Spread);
var multiplier = warhead.EffectivenessAgainst(target.Info.Traits.Get<OwnedActorInfo>().Armor);
return rawDamage * multiplier;

1
OpenRA.Game/Traits/Selectable.cs
View File

@@ -25,6 +25,7 @@ namespace OpenRA.Traits
public readonly int Priority = 10;
public readonly int[] Bounds = null;
public readonly string Voice = "GenericVoice";
public readonly float Radius = 10;
}
public class Selectable {}