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

move Selectable.Radius into Health

Browse Source
This commit is contained in:
Bob
2010-11-06 14:35:26 +13:00
parent 155e7320cb
commit 9a2cdcde11
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ namespace OpenRA.Traits
public class HealthInfo : ITraitInfo public class HealthInfo : ITraitInfo
{ {
public readonly int HP = 0; public readonly int HP = 0;
public readonly float Radius = 10;
public virtual object Create(ActorInitializer init) { return new Health(init, this); } public virtual object Create(ActorInitializer init) { return new Health(init, this); }
} }

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

@@ -19,7 +19,6 @@ namespace OpenRA.Traits
public readonly int[] Bounds = null; public readonly int[] Bounds = null;
[VoiceReference] [VoiceReference]
public readonly string Voice = null; public readonly string Voice = null;
public readonly float Radius = 10;
} }
public class Selectable : IPostRenderSelection public class Selectable : IPostRenderSelection

7
OpenRA.Mods.RA/Combat.cs
View File

@@ -151,9 +151,10 @@ namespace OpenRA.Mods.RA
// don't hit air units with splash from ground explosions, etc // don't hit air units with splash from ground explosions, etc
if (!WeaponValidForTarget(args.weapon, target)) return 0f; if (!WeaponValidForTarget(args.weapon, target)) return 0f;
var selectable = target.Info.Traits.GetOrDefault<SelectableInfo>(); var health = target.Info.Traits.GetOrDefault<HealthInfo>();
var radius = selectable != null ? selectable.Radius : 0; if( health == null ) return 0f;
var distance = (int)Math.Max(0, (target.CenterLocation - args.dest).Length - radius);
var distance = (int)Math.Max(0, (target.CenterLocation - args.dest).Length - health.Radius);
var falloff = (float)GetDamageFalloff(distance / warhead.Spread); var falloff = (float)GetDamageFalloff(distance / warhead.Spread);
var rawDamage = (float)(warhead.Damage * modifier * falloff); var rawDamage = (float)(warhead.Damage * modifier * falloff);
var multiplier = (float)warhead.EffectivenessAgainst(target); var multiplier = (float)warhead.EffectivenessAgainst(target);