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 actors resupplying even if too far from resupplier #16789

Merged
merged 2 commits into from Jul 21, 2019

Conversation

@reaperrr
Copy link
Contributor

commented Jul 16, 2019

Fixes #16782.

@reaperrr reaperrr added this to the Next Release milestone Jul 16, 2019

OpenRA.Game/Traits/Target.cs Outdated Show resolved Hide resolved

@reaperrr reaperrr force-pushed the reaperrr:fix-resupply-dist-check branch from 0c51f2a to ba1189a Jul 18, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jul 18, 2019

Updated.

@pchote
Copy link
Member

left a comment

Works as advertised

OpenRA.Mods.Common/Activities/Resupply.cs Outdated Show resolved Hide resolved

@pchote pchote added the PR: Needs +2 label Jul 19, 2019

@fruestueck

This comment has been minimized.

Copy link
Contributor

commented Jul 19, 2019

Tested with RA & TD.

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

Updated.

Note that the new commit might regress re-queued aircraft Resupply (on Stop orders), but only until #16695 is merged.

Change Resupply closeEnough 'infinite' to negative
...instead of 'zero'.

Returning 'true' at a distance of zero was a legacy left-over
that isn't used anymore once #16695 is merged.

@reaperrr reaperrr force-pushed the reaperrr:fix-resupply-dist-check branch from 2879d62 to 53b23b3 Jul 20, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

commented Jul 20, 2019

Updated last commits' title and message.

@abcdefg30 abcdefg30 merged commit 7f4fbfc into OpenRA:bleed Jul 21, 2019

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

commented Jul 21, 2019

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.