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

Set the closest production to Primary when force-targeting rallypoints.

Browse Source
This commit is contained in:
Paul Chote
2021-07-07 23:36:51 +01:00
committed by abcdefg30
parent e201e410f4
commit 99322cee8f
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -48,6 +48,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("The speech notification to play when setting a new rallypoint.")]
public readonly string Notification = null;
[Desc("Used to group equivalent actors to allow force-setting a rallypoint (e.g. for Primary production).")]
public readonly string ForceSetType = null;
public override object Create(ActorInitializer init) { return new RallyPoint(init.Self, this); }
}
@@ -89,7 +92,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IOrderTargeter> Orders
{
get { yield return new RallyPointOrderTargeter(Info.Cursor); }
get { yield return new RallyPointOrderTargeter(Info); }
}
public Order IssueOrder(Actor self, IOrderTargeter order, in Target target, bool queued)
@@ -126,11 +129,11 @@ namespace OpenRA.Mods.Common.Traits
class RallyPointOrderTargeter : IOrderTargeter
{
readonly string cursor;
readonly RallyPointInfo info;
public RallyPointOrderTargeter(string cursor)
public RallyPointOrderTargeter(RallyPointInfo info)
{
this.cursor = cursor;
this.info = info;
}
public string OrderID => "SetRallyPoint";
@@ -149,14 +152,18 @@ namespace OpenRA.Mods.Common.Traits
var location = self.World.Map.CellContaining(target.CenterPosition);
if (self.World.Map.Contains(location))
{
cursor = this.cursor;
cursor = info.Cursor;
// Notify force-set 'RallyPoint' order watchers with Ctrl and only if this is the only building of its type selected
if (modifiers.HasModifier(TargetModifiers.ForceAttack))
// Notify force-set 'RallyPoint' order watchers with Ctrl
if (modifiers.HasModifier(TargetModifiers.ForceAttack) && !string.IsNullOrEmpty(info.ForceSetType))
{
var selfName = self.Info.Name;
if (!self.World.Selection.Actors.Any(a => a.Info.Name == selfName && a.ActorID != self.ActorID))
ForceSet = true;
var closest = self.World.Selection.Actors
.Select<Actor, (Actor Actor, RallyPoint RallyPoint)>(a => (a, a.TraitOrDefault<RallyPoint>()))
.Where(x => x.RallyPoint != null && x.RallyPoint.Info.ForceSetType == info.ForceSetType)
.OrderBy(x => (location - x.Actor.Location).LengthSquared)
.FirstOrDefault().Actor;
ForceSet = closest == self;
}
return true;