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

Integrated HitShapes

Browse Source 
Integrated hit shapes with field loader and warhead calculations.
This commit is contained in:
Huw Pascoe
2015-10-29 16:58:07 +00:00
parent 5ef6d86f66
commit a8299221db
6 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Warheads
continue;
// If the impact position is within any actor's health radius, we have a direct hit
if ((unit.CenterPosition - pos).LengthSquared <= healthInfo.Radius.LengthSquared)
if ((unit.CenterPosition - pos).LengthSquared <= healthInfo.Shape.OuterRadius.LengthSquared)
return true;
}

5
OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
View File

@@ -66,9 +66,8 @@ namespace OpenRA.Mods.Common.Warheads
if (healthInfo == null)
continue;
var localModifiers = damageModifiers;
var distance = Math.Max(0, (victim.CenterPosition - pos).Length - healthInfo.Radius.Length);
localModifiers = localModifiers.Append(GetDamageFalloff(distance));
var distance = healthInfo.Shape.DistanceFromEdge(pos, victim);
var localModifiers = damageModifiers.Append(GetDamageFalloff(distance.Length));
DoImpact(victim, firedBy, localModifiers);
}