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

Tutorial updates #381

Merged
merged 4 commits into from Jun 13, 2019

Conversation

@KJeff01
Copy link
Contributor

commented Jun 12, 2019

  • Correctly checks if the player skipped helping to build the power generator with the other truck.
  • Moves a message about technology one state later.
  • Forces the player to manufacture both a truck and tank to complete the tutorial (Original).
  • Prevents players from designing a truck instead of a MG tank during the design phase.

Resolves #379.

@past-due past-due added this to the 3.3.0_beta2 milestone Jun 12, 2019

@Forgon2100

This comment has been minimized.

Copy link
Contributor

commented Jun 12, 2019

Unfortunately, this is not sufficient (I have recently looked into this myself).
E.g. to check properly whether a power generator has been built, it is required
to distinguish between a second truck being triggered by a player as opposed to
an AI, for which the truck's DACTION value must be checked.

I should send you a few test cases and patches, but can't do so today :|

Distinguish the second truck better in the tutorial.
Prevents players from selecting the truck that built the power generator, moving it,
then selecting it again to advance the tutorial state.

Accounts for if both trucks have DORDER_BUILD when checking if the second truck
was helping to build the power generator. This happens if both trucks are close enough
to the build location.
@KJeff01

This comment has been minimized.

Copy link
Contributor Author

commented Jun 12, 2019

It did to some extent (see checkForPowGen() and checkHelpBuild()) but I didn't check if they selected the other truck. My most recent commit should do this better without a reliance on checking the action.

@KJeff01 KJeff01 merged commit 518b256 into Warzone2100:master Jun 13, 2019

6 of 8 checks passed

LGTM analysis: C/C++ No code changes detected
Details
LGTM analysis: Python No code changes detected
Details
LGTM analysis: JavaScript No new or fixed alerts
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
freebsd_build FreeBSD:freebsd-11-2-release-amd64 Task Summary
Details
freebsd_build FreeBSD:freebsd-12-0-release-amd64 Task Summary
Details

@KJeff01 KJeff01 deleted the KJeff01:tutorial branch Jun 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.