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

Fix idling aircraft on map Intervention #17030

Merged
merged 1 commit into from Sep 15, 2019

Conversation

@obrakmann
Copy link
Contributor

commented Sep 1, 2019

No description provided.

@pchote

This comment has been minimized.

Copy link
Member

commented Sep 1, 2019

Do we want this for the prep branch?

Copy link
Member

left a comment

Odd, this must have regressed again. Imho yes, on the milestone.

mods/ra/maps/intervention/rules.yaml Outdated Show resolved Hide resolved
Copy link
Member

left a comment

Confirmed that the migs leave the map again. 👍 with the comment addressed.

@tovl

This comment has been minimized.

Copy link
Contributor

commented Sep 4, 2019

IMO this is getting pretty hacky. The real issue is that ReturnToBase cancels the whole queue, which is against our own guidelines for how activities should behave.

The proper solution is to remove the activity cancelling from ReturnToBase entirely and let FlyAttack be solely responsible for breaking out of a potential infinite loop. This can be done by checking whether the branch of FlyAttack.Tick that calls ReturnToBase is entered two ticks in a row and going to NextActivity if that is the case.

@pchote

This comment has been minimized.

Copy link
Member

commented Sep 7, 2019

That sounds like a reasonable approach, but we will need to be careful that it doesn't introduce behaviour changes for other uses (like the Lua API).

@obrakmann obrakmann force-pushed the obrakmann:fix-intervention-aircraft branch from a232bb6 to 79a7ad6 Sep 9, 2019
Copy link
Member

left a comment

Fixes the issue without the controversial code changes.

@reaperrr reaperrr merged commit 6e18de4 into OpenRA:bleed Sep 15, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@obrakmann obrakmann deleted the obrakmann:fix-intervention-aircraft branch Sep 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.