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 CaptureManagerBotModule #16125

Merged
merged 2 commits into from Feb 3, 2019

Conversation

Projects
None yet
3 participants
@reaperrr
Copy link
Contributor

reaperrr commented Jan 27, 2019

Fixes #16102.
Also fixes that capturers who got ordered once would never be re-used again.

Testcase makes RA Rush AI use engineers to capture oil derricks, recommended test map is Tournament Island.

@reaperrr reaperrr added this to the Next Release milestone Jan 27, 2019

@reaperrr reaperrr force-pushed the reaperrr:fix-capture-module branch from 4ec56fd to 93716b4 Jan 27, 2019

@reaperrr

This comment has been minimized.

Copy link
Contributor Author

reaperrr commented Jan 27, 2019

Updated.

  • moved both order queueing and distance check inline
  • moved 'has CapturesInfo' check up to capturers and ditched capturesCapturers

@pchote pchote requested a review from MustaphaTR Feb 3, 2019

@pchote
Copy link
Member

pchote left a comment

Fixes the issue at hand, but the testcase reveals some of the other failings of the capture logic - like taking forever for its dice roll to land on "neutral structures" and try to capture the derricks. Fixing that is not the job of this PR, though.

@pchote pchote added the PR: Needs +2 label Feb 3, 2019

@MustaphaTR
Copy link
Member

MustaphaTR left a comment

Works fine with no crash.

reaperrr added some commits Jan 27, 2019

Fix CaptureManagerBotModule crashing on multiple Capturable
By removing the now-redundant CaptureTarget class.
Fix that bots don't re-use capturers
They were never removed from activeCapturers when their target becomes invalid,
preventing the bot from reusing them.

@pchote pchote dismissed stale reviews from MustaphaTR and themself via d687c48 Feb 3, 2019

@pchote pchote force-pushed the reaperrr:fix-capture-module branch from 93716b4 to d687c48 Feb 3, 2019

@pchote

pchote approved these changes Feb 3, 2019

Copy link
Member

pchote left a comment

Force pushed to remove testcase.

@pchote pchote merged commit 4da2d32 into OpenRA:bleed Feb 3, 2019

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@pchote

This comment has been minimized.

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