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 AbortOnResupply not working as intended #16660

Merged
merged 1 commit into from Jun 20, 2019

Conversation

@reaperrr
Copy link
Contributor

commented Jun 9, 2019

ReturnToBase never properly canceled the activity queue after resupply, resulting in aircraft continuing their previous task (usually attacking) despite the yaml rules/default value claiming otherwise.

Set the flag to false in RA to maintain bleed behavior as people certainly are too used to it by now, but intentionally did not do so for TS, as in my opinion we should stick closer to the original game in this regard.

Fixes #10452 (technically bleed already does, but with this PR the behavior can now be controlled via AbortOnResupply).
Fixes #13474.

Fix AbortOnResupply not working
Going by yaml rules, all(!) aircraft in the shipping
mods should be aborting any previous activities
on resupply. None actually did, due to this bug.

@reaperrr reaperrr added this to the Next Release milestone Jun 9, 2019

@matjaeck

This comment has been minimized.

Copy link
Contributor

commented Jun 9, 2019

I noticed that when you force fire somewhere near the helipad, that helicopter will continue firing while taking off and stop when cruising altitude is reached. Not a big deal though.

Set the flag to false in RA to maintain bleed behavior as people certainly are too used to it by now

IMO it should be set to true for RA, see #14805 (comment) and #13474 (comment).

@pchote

This comment has been minimized.

Copy link
Member

commented Jun 9, 2019

IMO it should be set to true for RA, see #14805 (comment) and #13474 (comment).

My initial reaction is to agree. Player opinion has been mixed on this, so I think it makes sense to ship the fix in RA for the first playtest too. We can then take feedback on all the aircraft changes together, and consider changing the flag to false as an option for the second playtest.

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jun 9, 2019

I noticed that when you force fire somewhere near the helipad, that helicopter will continue firing while taking off and stop when cruising altitude is reached. Not a big deal though.

I think we'd have to cancel the current activity queue before we queue the RTB (to cancel the target early, otherwise the opportunity fire will trigger until RTB and its childs finish), but for that to work as intended we probably first need to fix that activity cancel state bug @pchote.

IMO it should be set to true for RA, see #14805 (comment) and #13474 (comment).

My initial reaction is to agree

Personally I agree too, fwiw. Will change it.

@reaperrr reaperrr force-pushed the reaperrr:fix-AbortOnResupply branch from 456dfbd to 3240bc7 Jun 9, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jun 9, 2019

Updated.

@matjaeck

This comment has been minimized.

Copy link
Contributor

commented Jun 9, 2019

#10452 requests the opposite, so might close that too if we go with this setting (and it is not reverted in the playtests). Closes IMO also #13474 as this is the expected behavior then (planes stay landed, helicopters take off to waypoint) due to the different setting for TakeOffOnResupply.

@matjaeck
Copy link
Contributor

left a comment

@matjaeck

This comment has been minimized.

Copy link
Contributor

commented Jun 16, 2019

Closes #14805, unless we want to make queued orders a special case and allow continuing those.

@pchote
pchote approved these changes Jun 20, 2019

@pchote pchote merged commit db0c6d8 into OpenRA:bleed Jun 20, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.