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

Prepare ally build adjacency code for trait-defined lobby options.

Browse Source
This commit is contained in:
Paul Chote
2016-04-24 15:35:28 +01:00
parent c412e4e86c
commit e3bc73a168
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs
View File

@@ -30,10 +30,12 @@ namespace OpenRA.Mods.Common.Traits
public class BaseProvider : ITick, IPostRenderSelection, ISelectionBar public class BaseProvider : ITick, IPostRenderSelection, ISelectionBar
{ {
public readonly BaseProviderInfo Info; public readonly BaseProviderInfo Info;
DeveloperMode devMode; readonly DeveloperMode devMode;
Actor self; readonly Actor self;
int total; int total;
int progress; int progress;
bool allyBuildEnabled;
public BaseProvider(Actor self, BaseProviderInfo info) public BaseProvider(Actor self, BaseProviderInfo info)
{ {
@@ -41,6 +43,7 @@ namespace OpenRA.Mods.Common.Traits
this.self = self; this.self = self;
devMode = self.Owner.PlayerActor.Trait<DeveloperMode>(); devMode = self.Owner.PlayerActor.Trait<DeveloperMode>();
progress = total = info.InitialDelay; progress = total = info.InitialDelay;
allyBuildEnabled = self.World.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
} }
public void Tick(Actor self) public void Tick(Actor self)
@@ -61,8 +64,7 @@ namespace OpenRA.Mods.Common.Traits
bool ValidRenderPlayer() bool ValidRenderPlayer()
{ {
var allyBuildRadius = self.World.LobbyInfo.GlobalSettings.AllyBuildRadius; return self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer));
return self.Owner == self.World.RenderPlayer || (allyBuildRadius && self.Owner.IsAlliedWith(self.World.RenderPlayer));
} }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)

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

@@ -43,9 +43,11 @@ namespace OpenRA.Mods.Common.Traits
public Actor FindBaseProvider(World world, Player p, CPos topLeft) public Actor FindBaseProvider(World world, Player p, CPos topLeft)
{ {
var center = world.Map.CenterOfCell(topLeft) + FootprintUtils.CenterOffset(world, this); var center = world.Map.CenterOfCell(topLeft) + FootprintUtils.CenterOffset(world, this);
var allyBuildEnabled = world.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
foreach (var bp in world.ActorsWithTrait<BaseProvider>()) foreach (var bp in world.ActorsWithTrait<BaseProvider>())
{ {
var validOwner = bp.Actor.Owner == p || (world.LobbyInfo.GlobalSettings.AllyBuildRadius && bp.Actor.Owner.Stances[p] == Stance.Ally); var validOwner = bp.Actor.Owner == p || (allyBuildEnabled && bp.Actor.Owner.Stances[p] == Stance.Ally);
if (!validOwner || !bp.Trait.Ready()) if (!validOwner || !bp.Trait.Ready())
continue; continue;
@@ -76,7 +78,7 @@ namespace OpenRA.Mods.Common.Traits
var nearnessCandidates = new List<CPos>(); var nearnessCandidates = new List<CPos>();
var bi = world.WorldActor.Trait<BuildingInfluence>(); var bi = world.WorldActor.Trait<BuildingInfluence>();
var allyBuildRadius = world.LobbyInfo.GlobalSettings.AllyBuildRadius; var allyBuildEnabled = world.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
for (var y = scanStart.Y; y < scanEnd.Y; y++) for (var y = scanStart.Y; y < scanEnd.Y; y++)
{ {
@@ -89,14 +91,14 @@ namespace OpenRA.Mods.Common.Traits
if (buildingAtPos == null) if (buildingAtPos == null)
{ {
var unitsAtPos = world.ActorMap.GetActorsAt(pos).Where(a => a.IsInWorld var unitsAtPos = world.ActorMap.GetActorsAt(pos).Where(a => a.IsInWorld
&& (a.Owner == p || (allyBuildRadius && a.Owner.Stances[p] == Stance.Ally)) && (a.Owner == p || (allyBuildEnabled && a.Owner.Stances[p] == Stance.Ally))
&& a.Info.HasTraitInfo<GivesBuildableAreaInfo>()); && a.Info.HasTraitInfo<GivesBuildableAreaInfo>());
if (unitsAtPos.Any()) if (unitsAtPos.Any())
nearnessCandidates.Add(pos); nearnessCandidates.Add(pos);
} }
else if (buildingAtPos.IsInWorld && buildingAtPos.Info.HasTraitInfo<GivesBuildableAreaInfo>() else if (buildingAtPos.IsInWorld && buildingAtPos.Info.HasTraitInfo<GivesBuildableAreaInfo>()
&& (buildingAtPos.Owner == p || (allyBuildRadius && buildingAtPos.Owner.Stances[p] == Stance.Ally))) && (buildingAtPos.Owner == p || (allyBuildEnabled && buildingAtPos.Owner.Stances[p] == Stance.Ally)))
nearnessCandidates.Add(pos); nearnessCandidates.Add(pos);
} }
} }

10
OpenRA.Mods.Common/Traits/World/MapBuildRadius.cs
View File

@@ -24,5 +24,13 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool AllyBuildRadiusLocked = false; public readonly bool AllyBuildRadiusLocked = false;
} }
public class MapBuildRadius { } public class MapBuildRadius : INotifyCreated
{
public bool AllyBuildRadiusEnabled { get; private set; }
void INotifyCreated.Created(Actor self)
{
AllyBuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings.AllyBuildRadius;
}
}
} }