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

Remove BuildingInfluence from building adjacency check.

Browse Source
This commit is contained in:
Paul Chote
2020-10-07 20:53:41 +01:00
committed by Matthias Mailänder
parent 79019b06ca
commit b9dd59cd63
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,7 +204,6 @@ 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++)
@@ -213,20 +212,20 @@ namespace OpenRA.Mods.Common.Traits
{ {
var pos = new CPos(x, y); var pos = new CPos(x, y);
var buildingAtPos = bi.GetBuildingAt(pos); foreach (var a in world.ActorMap.GetActorsAt(pos))
if (buildingAtPos == null)
{ {
var unitsAtPos = world.ActorMap.GetActorsAt(pos).Where(a => a.IsInWorld if (!a.IsInWorld)
&& (a.Owner == p || (allyBuildEnabled && a.Owner.Stances[p] == Stance.Ally)) continue;
&& ActorGrantsValidArea(a, requiresBuildableArea));
if (unitsAtPos.Any()) if (a.Owner != p && (!allyBuildEnabled || a.Owner.Stances[p] != Stance.Ally))
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.Stances[p] == Stance.Ally)))
nearnessCandidates.Add(pos);
} }
} }