08ad7d7f4e
penev discovered that the RulesetLoaded functions of projectiles were never being called, meaning that their blocking calculations were not properly accounting for actors with large hitboxes. The best fix for this is to change FindActorsOnLine to always account for the largest actor's hit radius, rather than forcing callers to pass the largest radius. Per the comment in Util.cs, as a result, move this computation to ActorMap. I decided to simplify by not making a separate calculation for actors that block projectiles only; this may cause a small performance degradation as the search space is a bit larger. Similarly to this, I've removed the ability to specify a search radius manually. Because this is only a search radius, setting a value smaller than the largest eligible actor makes no sense; that would lead to completely inconsistent blocking. Setting a larger value, on the other hand, would make no difference. CreateEffectWarhead was the only place in core code any of these search radii were set, and that's because 0 was a mysterious magic value that made the warhead incapable of hitting actors. I replaced it with a boolean flag that more clearly indicates the actual behaviour. Fixes #14151.
69 lines
2.1 KiB
C#
69 lines
2.1 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, either version 3 of
|
|
* the License, or (at your option) any later version. For more
|
|
* information, see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using System.Linq;
|
|
using OpenRA.Traits;
|
|
|
|
namespace OpenRA.Mods.Common.Traits
|
|
{
|
|
[Desc("This actor blocks bullets and missiles with 'Blockable' property.")]
|
|
public class BlocksProjectilesInfo : ConditionalTraitInfo, IBlocksProjectilesInfo
|
|
{
|
|
public readonly WDist Height = WDist.FromCells(1);
|
|
|
|
public override object Create(ActorInitializer init) { return new BlocksProjectiles(init.Self, this); }
|
|
}
|
|
|
|
public class BlocksProjectiles : ConditionalTrait<BlocksProjectilesInfo>, IBlocksProjectiles
|
|
{
|
|
public BlocksProjectiles(Actor self, BlocksProjectilesInfo info)
|
|
: base(info) { }
|
|
|
|
WDist IBlocksProjectiles.BlockingHeight { get { return Info.Height; } }
|
|
|
|
public static bool AnyBlockingActorAt(World world, WPos pos)
|
|
{
|
|
var dat = world.Map.DistanceAboveTerrain(pos);
|
|
|
|
return world.ActorMap.GetActorsAt(world.Map.CellContaining(pos))
|
|
.Any(a => a.TraitsImplementing<IBlocksProjectiles>()
|
|
.Where(t => t.BlockingHeight > dat)
|
|
.Any(Exts.IsTraitEnabled));
|
|
}
|
|
|
|
public static bool AnyBlockingActorsBetween(World world, WPos start, WPos end, WDist width, out WPos hit)
|
|
{
|
|
var actors = world.FindActorsOnLine(start, end, width);
|
|
var length = (end - start).Length;
|
|
|
|
foreach (var a in actors)
|
|
{
|
|
var blockers = a.TraitsImplementing<IBlocksProjectiles>()
|
|
.Where(Exts.IsTraitEnabled).ToList();
|
|
|
|
if (!blockers.Any())
|
|
continue;
|
|
|
|
var hitPos = WorldExtensions.MinimumPointLineProjection(start, end, a.CenterPosition);
|
|
var dat = world.Map.DistanceAboveTerrain(hitPos);
|
|
if ((hitPos - start).Length < length && blockers.Any(t => t.BlockingHeight > dat))
|
|
{
|
|
hit = hitPos;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
hit = WPos.Zero;
|
|
return false;
|
|
}
|
|
}
|
|
}
|