Allow queued structure rallypoints. #17021
Conversation
There was a problem hiding this comment.
This is a cool feature, but the implementation may need some more polishing/prereqs before we can merge.
See inline comments for some (hopefully) straightforward requests.
My bigger concern is about the near-enough handling - units will stall if a building or non-nudgeable unit blocks one of the rally point nodes!
OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
Outdated
Show resolved
Hide resolved
| @@ -48,8 +48,7 @@ public class RallyPoint : IIssueOrder, IResolveOrder, ISync, INotifyOwnerChanged | |||
| { | |||
| const string OrderID = "SetRallyPoint"; | |||
|
|
|||
| [Sync] | |||
| public CPos Location; | |||
| public List<CPos> Locations; | |||
There was a problem hiding this comment.
Can we please rename this to Path? IMO Locations is ambiguous if not misleading.
This would also be a good opportunity to fix outside methods manipulating this directly by adding a void SetPath(IEnumerable<CPos> path) method.
| @@ -58,7 +57,7 @@ public class RallyPoint : IIssueOrder, IResolveOrder, ISync, INotifyOwnerChanged | |||
|
|
|||
| public void ResetLocation(Actor self) | |||
| { | |||
| Location = self.Location + Info.Offset; | |||
| Locations = new List<CPos> { self.Location + Info.Offset }; | |||
There was a problem hiding this comment.
This could then become ResetPath and use .Clear instead of allocating a new list.
There was a problem hiding this comment.
I had this use .Clear in an earlier iteration but that breaks things because this method is also called to set the default rallypoint when the building is build. Since Locations is still null at that point, it crashes.
tovl
force-pushed
the
queue-rallypoint
branch
from
96a48e8
to
650efcb
Compare
This is now fixed as well. |
ghost
mentioned this pull request
tovl
force-pushed
the
queue-rallypoint
branch
from
650efcb
to
cf10e7d
Compare
|
Rebased. |
tovl
force-pushed
the
queue-rallypoint
branch
from
cf10e7d
to
a884671
Compare
Fixes #15371.
Fixes #15995.
This adds a way to make units exiting a structure use a specific route to the rallypoint. This can be done by holding shift when ordering the rally point in the same manner as queueing unit orders.