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

Add Height property to BlocksProjectiles

Browse Source
This commit is contained in:
reaperrr
2015-10-06 22:21:31 +02:00
parent 1e890a921f
commit 9b2cdd4457
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/BlocksProjectiles.cs
View File

@@ -13,10 +13,11 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
// TODO: Add functionality like a customizable Height that is compared to projectile altitude
[Desc("This actor blocks bullets and missiles with 'Blockable' property.")] [Desc("This actor blocks bullets and missiles with 'Blockable' property.")]
public class BlocksProjectilesInfo : UpgradableTraitInfo public class BlocksProjectilesInfo : UpgradableTraitInfo
{ {
public readonly WDist Height = WDist.FromCells(1);
public override object Create(ActorInitializer init) { return new BlocksProjectiles(init.Self, this); } public override object Create(ActorInitializer init) { return new BlocksProjectiles(init.Self, this); }
} }
@@ -27,8 +28,11 @@ namespace OpenRA.Mods.Common.Traits
public static bool AnyBlockingActorAt(World world, WPos pos) public static bool AnyBlockingActorAt(World world, WPos pos)
{ {
var dat = world.Map.DistanceAboveTerrain(pos);
return world.ActorMap.GetActorsAt(world.Map.CellContaining(pos)) return world.ActorMap.GetActorsAt(world.Map.CellContaining(pos))
.Any(a => a.TraitsImplementing<BlocksProjectiles>().Any(Exts.IsTraitEnabled)); .Any(a => a.TraitsImplementing<BlocksProjectiles>()
.Where(t => t.Info.Height.Length >= dat.Length)
.Any(Exts.IsTraitEnabled));
} }
} }
} }