Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow queueing of BridgeRepair #13508

Merged
merged 2 commits into from Jun 18, 2017
Merged

Conversation

forcecore
Copy link
Contributor

@forcecore forcecore commented Jun 14, 2017

This PR removes CancelActivity() in RepairsBridge trait so that engineers can be queued to take a safer detour path if necessary.

There's a catch though. The last move order just before RepairBridge seems to be ignored for some reason. You have to queue many move orders to see this patch in effect. I think it is a bug coming from Enter.cs + Move.cs which I think is beyond the scope. Hopefully, after activities are refactored, the problem will be gone.

Fixes #13471

@forcecore forcecore changed the title Engineer repair activity can be queued Allow queueing of BridgeRepair Jun 14, 2017
@@ -97,7 +97,6 @@ public void ResolveOrder(Actor self, Order order)

self.SetTargetLine(Target.FromOrder(self.World, order), Color.Yellow);

self.CancelActivity();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break non-queued repair orders!

Put this behind a !queued check instead of removing it - look at how Infiltrates etc do it.

@pchote
Copy link
Member

pchote commented Jun 17, 2017

We now expose order queuing in the primary UI, so these queued activity bugs are high priority. Adding to milestone.

@pchote pchote added this to the Playtest featuring updated HitShapes milestone Jun 17, 2017
@forcecore
Copy link
Contributor Author

Unqueueing fixed like Infiltrates.cs

Copy link
Contributor

@obrakmann obrakmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Member

@pchote pchote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as advertised 👍

This gave me a good testcase to diagnose the problem with queued moves, which indeed has nothing to do with this PR.

@pchote pchote merged commit a3c9d72 into OpenRA:bleed Jun 18, 2017
@forcecore forcecore deleted the QueueEngiRepairBridge branch June 21, 2017 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants