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

Allow mods to implement new building placement conditions and cursors.

Browse Source
This commit is contained in:
IceReaper
2022-02-20 10:46:25 +01:00
committed by Pavel Penev
parent 0f1ff3f2fc
commit fa8bfc6ca0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Orders
} }
readonly World world; readonly World world;
readonly ProductionQueue queue; protected readonly ProductionQueue Queue;
readonly PlaceBuildingInfo placeBuildingInfo; readonly PlaceBuildingInfo placeBuildingInfo;
readonly IResourceLayer resourceLayer; readonly IResourceLayer resourceLayer;
readonly Viewport viewport; readonly Viewport viewport;
@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Orders
public PlaceBuildingOrderGenerator(ProductionQueue queue, string name, WorldRenderer worldRenderer) public PlaceBuildingOrderGenerator(ProductionQueue queue, string name, WorldRenderer worldRenderer)
{ {
this.queue = queue; Queue = queue;
world = queue.Actor.World; world = queue.Actor.World;
placeBuildingInfo = queue.Actor.Owner.PlayerActor.Info.TraitInfo<PlaceBuildingInfo>(); placeBuildingInfo = queue.Actor.Owner.PlayerActor.Info.TraitInfo<PlaceBuildingInfo>();
resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>(); resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>();
@@ -158,12 +158,12 @@ namespace OpenRA.Mods.Common.Orders
} }
} }
IEnumerable<Order> InnerOrder(World world, CPos cell, MouseInput mi) protected virtual IEnumerable<Order> InnerOrder(World world, CPos cell, MouseInput mi)
{ {
if (world.Paused) if (world.Paused)
yield break; yield break;
var owner = queue.Actor.Owner; var owner = Queue.Actor.Owner;
var ai = variants[variant].ActorInfo; var ai = variants[variant].ActorInfo;
var bi = variants[variant].BuildingInfo; var bi = variants[variant].BuildingInfo;
@@ -204,7 +204,7 @@ namespace OpenRA.Mods.Common.Orders
TargetString = variants[0].ActorInfo.Name, TargetString = variants[0].ActorInfo.Name,
// Actor ID to associate with placement may be quite large, so it gets its own uint // Actor ID to associate with placement may be quite large, so it gets its own uint
ExtraData = queue.Actor.ActorID, ExtraData = Queue.Actor.ActorID,
// Actor variant will always be small enough to safely pack in a CPos // Actor variant will always be small enough to safely pack in a CPos
ExtraLocation = new CPos(variant, 0), ExtraLocation = new CPos(variant, 0),
@@ -216,7 +216,7 @@ namespace OpenRA.Mods.Common.Orders
void IOrderGenerator.Tick(World world) void IOrderGenerator.Tick(World world)
{ {
if (queue.AllQueued().All(i => !i.Done || i.Item != variants[0].ActorInfo.Name)) if (Queue.AllQueued().All(i => !i.Done || i.Item != variants[0].ActorInfo.Name))
world.CancelInputMode(); world.CancelInputMode();
foreach (var v in variants) foreach (var v in variants)
@@ -246,7 +246,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; var owner = Queue.Actor.Owner;
if (plugInfo != null) if (plugInfo != null)
{ {
@@ -291,7 +291,7 @@ namespace OpenRA.Mods.Common.Orders
return preview?.RenderAnnotations(wr, TopLeft) ?? Enumerable.Empty<IRenderable>(); return preview?.RenderAnnotations(wr, TopLeft) ?? Enumerable.Empty<IRenderable>();
} }
string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) public virtual string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{ {
return worldDefaultCursor; return worldDefaultCursor;
} }
@@ -318,7 +318,7 @@ namespace OpenRA.Mods.Common.Orders
.Where(world.Map.Contains).ToList(); .Where(world.Map.Contains).ToList();
var blockers = allTiles.SelectMany(world.ActorMap.GetActorsAt) var blockers = allTiles.SelectMany(world.ActorMap.GetActorsAt)
.Where(a => a.Owner == queue.Actor.Owner && a.IsIdle) .Where(a => a.Owner == Queue.Actor.Owner && a.IsIdle)
.Select(a => new TraitPair<IMove>(a, a.TraitOrDefault<IMove>())) .Select(a => new TraitPair<IMove>(a, a.TraitOrDefault<IMove>()))
.Where(x => x.Trait != null); .Where(x => x.Trait != null);