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

Fix line build for multi-cell neighbours.

Browse Source
This commit is contained in:
Paul Chote
2015-11-20 22:46:21 +00:00
committed by teees
parent 085367ced6
commit 963a92214d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Traits/Buildings/BuildingUtils.cs
View File

@@ -71,12 +71,11 @@ namespace OpenRA.Mods.Common.Traits
continue; // Cell is empty; continue search continue; // Cell is empty; continue search
// Cell contains an actor. Is it the type we want? // Cell contains an actor. Is it the type we want?
if (world.ActorsHavingTrait<LineBuildNode>() var hasConnector = world.ActorMap.GetActorsAt(cell)
.Any(a => a.Location == cell .Any(a => a.Info.TraitInfos<LineBuildNodeInfo>()
&& a.Info.TraitInfo<LineBuildNodeInfo>().Types.Overlaps(lbi.NodeTypes))) .Any(info => info.Types.Overlaps(lbi.NodeTypes) && info.Connections.Contains(vecs[d])));
dirs[d] = i; // Cell contains actor of correct type
else dirs[d] = hasConnector ? i : -1;
dirs[d] = -1; // Cell is blocked by another actor type
} }
// Place intermediate-line sections // Place intermediate-line sections

3
OpenRA.Mods.Common/Traits/Buildings/LineBuildNode.cs
View File

@@ -18,6 +18,9 @@ namespace OpenRA.Mods.Common.Traits
{ {
[Desc("This actor is of LineBuild 'NodeType'...")] [Desc("This actor is of LineBuild 'NodeType'...")]
public readonly HashSet<string> Types = new HashSet<string> { "wall" }; public readonly HashSet<string> Types = new HashSet<string> { "wall" };
[Desc("Cells (outside the footprint) that contain cells that can connect to this actor.")]
public readonly CVec[] Connections = new[] { new CVec(1, 0), new CVec(0, 1), new CVec(-1, 0), new CVec(0, -1) };
} }
public class LineBuildNode { } public class LineBuildNode { }