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

Revert "Remove BuildingInfluence from building adjacency check."

Browse Source 
This reverts commit 33a1ca5965d10079f89bd9aa1e33f1b07db72a48.
This commit is contained in:
Paul Chote
2020-11-26 22:50:09 +00:00
parent 5a52ce5330
commit 582e2774ac
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Traits/Buildings/Building.cs
View File

@@ -204,6 +204,7 @@ namespace OpenRA.Mods.Common.Traits
var scanEnd = world.Map.Clamp(topLeft + buildingMaxBounds + new CVec(adjacent, adjacent)); var scanEnd = world.Map.Clamp(topLeft + buildingMaxBounds + new CVec(adjacent, adjacent));
var nearnessCandidates = new List<CPos>(); var nearnessCandidates = new List<CPos>();
var bi = world.WorldActor.Trait<BuildingInfluence>();
var allyBuildEnabled = mapBuildRadius != null && mapBuildRadius.AllyBuildRadiusEnabled; var allyBuildEnabled = mapBuildRadius != null && mapBuildRadius.AllyBuildRadiusEnabled;
for (var y = scanStart.Y; y < scanEnd.Y; y++) for (var y = scanStart.Y; y < scanEnd.Y; y++)
@@ -211,20 +212,20 @@ namespace OpenRA.Mods.Common.Traits
for (var x = scanStart.X; x < scanEnd.X; x++) for (var x = scanStart.X; x < scanEnd.X; x++)
{ {
var pos = new CPos(x, y); var pos = new CPos(x, y);
foreach (var a in world.ActorMap.GetActorsAt(pos)) var buildingAtPos = bi.GetBuildingAt(pos);
if (buildingAtPos == null)
{ {
if (!a.IsInWorld) var unitsAtPos = world.ActorMap.GetActorsAt(pos).Where(a => a.IsInWorld
continue; && (a.Owner == p || (allyBuildEnabled && a.Owner.RelationshipWith(p) == PlayerRelationship.Ally))
&& ActorGrantsValidArea(a, requiresBuildableArea));
if (a.Owner != p && (!allyBuildEnabled || a.Owner.RelationshipWith(p) != PlayerRelationship.Ally)) if (unitsAtPos.Any())
continue;
if (ActorGrantsValidArea(a, requiresBuildableArea))
{
nearnessCandidates.Add(pos); nearnessCandidates.Add(pos);
break;
}
} }
else if (buildingAtPos.IsInWorld && ActorGrantsValidArea(buildingAtPos, requiresBuildableArea)
&& (buildingAtPos.Owner == p || (allyBuildEnabled && buildingAtPos.Owner.RelationshipWith(p) == PlayerRelationship.Ally)))
nearnessCandidates.Add(pos);
} }
} }