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

Aircraft pause rearming when given a stop order #15363

Merged
merged 1 commit into from Aug 12, 2018

Conversation

Projects
None yet
4 participants
@BGluth
Copy link
Contributor

BGluth commented Jul 21, 2018

Fixed being able to stop aircraft rearming by issuing a stop order and occupying landing area (#15055). This fixes the blockages created at landing areas from aircraft sitting indefinitely until ordered off.

Implemented by making the ResupplyAircraft activity check whether or not it has any other queued activities when canceled and if it does not, then re-queues the ResupplyAircraft activity. Let me know if there is a nicer way to do this.

Note that as a side effect this also causes aircraft to start repairing again if they are on a service depo while given a stop order.

Tested in TD, RA and TS (although rearming at helipads isn't a thing in TD but repairing is).

@BGluth BGluth changed the title Rearming aircraft now reapplies ResupplyAircraft activity if canceled when landed Aircraft pause rearming when given a stop order Jul 21, 2018

Rearming aircraft now reapplies rearming order if canceled on landing…
… structure

- Implemented by making the ResupplyAircraft activity recreate a new resupply activity if cancelled and also having no other queued activities.
- Tested in TD, RA, TS.

@BGluth BGluth force-pushed the BGluth:12487 branch from 48ba2dd to 976b330 Jul 21, 2018

@chrisforbes
Copy link
Member

chrisforbes left a comment

Tentative +1.

@Smittytron
Copy link
Contributor

Smittytron left a comment

Looks good in game.

@reaperrr reaperrr merged commit 09b9ed3 into OpenRA:bleed Aug 12, 2018

2 checks passed

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

This comment has been minimized.

Copy link
Contributor

reaperrr commented Aug 12, 2018

@BGluth BGluth deleted the BGluth:12487 branch Aug 12, 2018

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