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

Prevent showing wall connections in unexplored terrain

Browse Source
This commit is contained in:
Abdurrahmaan Iqbal
2019-10-14 18:50:48 +01:00
committed by teinarss
parent c94cf61069
commit 023750db06
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -244,6 +244,7 @@ namespace OpenRA.Mods.Common.Orders
var plugInfo = activeVariant.PlugInfo; var plugInfo = activeVariant.PlugInfo;
var lineBuildInfo = activeVariant.LineBuildInfo; var lineBuildInfo = activeVariant.LineBuildInfo;
var preview = activeVariant.Preview; var preview = activeVariant.Preview;
var owner = queue.Actor.Owner;
if (plugInfo != null) if (plugInfo != null)
{ {
@@ -252,7 +253,7 @@ namespace OpenRA.Mods.Common.Orders
footprint.Add(topLeft, MakeCellType(AcceptsPlug(topLeft, plugInfo))); footprint.Add(topLeft, MakeCellType(AcceptsPlug(topLeft, plugInfo)));
} }
else if (lineBuildInfo != null) else if (lineBuildInfo != null && owner.Shroud.IsExplored(topLeft))
{ {
// Linebuild for walls. // Linebuild for walls.
if (buildingInfo.Dimensions.X != 1 || buildingInfo.Dimensions.Y != 1) if (buildingInfo.Dimensions.X != 1 || buildingInfo.Dimensions.Y != 1)
@@ -260,7 +261,7 @@ namespace OpenRA.Mods.Common.Orders
if (!Game.GetModifierKeys().HasModifier(Modifiers.Shift)) if (!Game.GetModifierKeys().HasModifier(Modifiers.Shift))
{ {
foreach (var t in BuildingUtils.GetLineBuildCells(world, topLeft, actorInfo, buildingInfo)) foreach (var t in BuildingUtils.GetLineBuildCells(world, topLeft, actorInfo, buildingInfo, owner))
{ {
var lineBuildable = world.IsCellBuildable(t.First, actorInfo, buildingInfo); var lineBuildable = world.IsCellBuildable(t.First, actorInfo, buildingInfo);
var lineCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, t.First); var lineCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, t.First);

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

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits
world.IsCellBuildable(t, ai, bi, toIgnore)); world.IsCellBuildable(t, ai, bi, toIgnore));
} }
public static IEnumerable<Pair<CPos, Actor>> GetLineBuildCells(World world, CPos cell, ActorInfo ai, BuildingInfo bi) public static IEnumerable<Pair<CPos, Actor>> GetLineBuildCells(World world, CPos cell, ActorInfo ai, BuildingInfo bi, Player owner)
{ {
var lbi = ai.TraitInfo<LineBuildInfo>(); var lbi = ai.TraitInfo<LineBuildInfo>();
var topLeft = cell; // 1x1 assumption! var topLeft = cell; // 1x1 assumption!
@@ -81,9 +81,10 @@ namespace OpenRA.Mods.Common.Traits
if (dirs[d] != 0) if (dirs[d] != 0)
continue; continue;
// Continue the search if the cell is empty or not visible
var c = topLeft + i * vecs[d]; var c = topLeft + i * vecs[d];
if (world.IsCellBuildable(c, ai, bi)) if (world.IsCellBuildable(c, ai, bi) || !owner.Shroud.IsExplored(c))
continue; // Cell is empty; continue search continue;
// Cell contains an actor. Is it the type we want? // Cell contains an actor. Is it the type we want?
connectors[d] = world.ActorMap.GetActorsAt(c) connectors[d] = world.ActorMap.GetActorsAt(c)

2
OpenRA.Mods.Common/Traits/Player/PlaceBuilding.cs
View File

@@ -117,7 +117,7 @@ namespace OpenRA.Mods.Common.Traits
if (string.IsNullOrEmpty(segmentType)) if (string.IsNullOrEmpty(segmentType))
segmentType = actorInfo.Name; segmentType = actorInfo.Name;
foreach (var t in BuildingUtils.GetLineBuildCells(w, targetLocation, actorInfo, buildingInfo)) foreach (var t in BuildingUtils.GetLineBuildCells(w, targetLocation, actorInfo, buildingInfo, order.Player))
{ {
if (t.First == targetLocation) if (t.First == targetLocation)
continue; continue;