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 player to add a "priority unit" to production queue #15764

Merged
merged 1 commit into from Nov 3, 2018

Conversation

Projects
None yet
6 participants
@dragunoff
Copy link
Contributor

dragunoff commented Oct 31, 2018

  • If production is ordered by Ctrl + Left Click the item is added to the top of the stack after the currently produced item
  • Also works with Shift for priority queueing of 5 items
  • This modifier is not taken into account for ParallelProductionQueue as it doesn't make sense in that context

Closes #11726

I'm not versed in C# and I'm not familiar with the engine so any remarks on the code are welcome.

Show resolved Hide resolved OpenRA.Game/Network/Order.cs Outdated
@dragunoff

This comment has been minimized.

Copy link
Contributor

dragunoff commented Nov 2, 2018

Re-implemented as suggested by @pchote - using the Queued field of Order. I tested that with ParallelProductionQueue and it behaved weirdly, so I made it effectively ignore the modifier by always passing true for Queued. And actually this functionality as-is doesn't make much sense in a parallel production context.

@dragunoff dragunoff force-pushed the dragunoff:feature/start-priority-production branch from 512d041 to ac31922 Nov 3, 2018

@dragunoff

This comment has been minimized.

Copy link
Contributor

dragunoff commented Nov 3, 2018

Rebased and squashed commits.

@dragunoff dragunoff force-pushed the dragunoff:feature/start-priority-production branch from ac31922 to 7e518a6 Nov 3, 2018

@pchote
Copy link
Member

pchote left a comment

One minor request, otherwise LGTM.

I'd like to get @IceReaper's review here before merging.

Show resolved Hide resolved OpenRA.Game/Network/Order.cs Outdated
Allow player to add a "priority unit" to production queue
* If production is ordered by `Ctrl + Left Click` the item is added to the top of the stack after the currently produced item
* Works with `Shift` for priority queueing of 5 items
* This modifier is not taken into account for `ParallelProductionQueue` as it doesn't make sense in that context

@dragunoff dragunoff force-pushed the dragunoff:feature/start-priority-production branch from 7e518a6 to c9c50ad Nov 3, 2018

@pchote

pchote approved these changes Nov 3, 2018

@abcdefg30 abcdefg30 merged commit a727941 into OpenRA:bleed Nov 3, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Nov 3, 2018

Changelog

@dragunoff dragunoff deleted the dragunoff:feature/start-priority-production branch Nov 3, 2018

@dragunoff dragunoff restored the dragunoff:feature/start-priority-production branch Nov 3, 2018

@dragunoff dragunoff deleted the dragunoff:feature/start-priority-production branch Nov 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment