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

Fixed 'pokemon_caught' event #5539

Merged
merged 5 commits into from
Sep 19, 2016
Merged

Fixed 'pokemon_caught' event #5539

merged 5 commits into from
Sep 19, 2016

Conversation

Gobberwart
Copy link
Contributor

Short Description:

Fixes "catch error 2" appearing in telegram instead of correct catch message.

Fix removes a lot of redundant code. Tested with no errors.

Fixes/Resolves/Closes (please use correct syntax):

Removes "catch error 1" and removed redundant if/else logic
@mention-bot
Copy link

@Gobberwart, thanks for your PR! By analyzing the annotation information on this pull request, we identified @javajohnHub, @solderzzc and @nivong to be potential reviewers

@Gobberwart
Copy link
Contributor Author

DO NOT MERGE... minor bug-fix to come.

Copy link
Contributor

@javajohnHub javajohnHub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I'm curious as to why these events are special from other events. Why not declare them in the same way as other events?

@Gobberwart
Copy link
Contributor Author

pokemon_caught needs additional logic so it can be limited to only specific conditions (iv>x, cp>y etc.)

as for the other ones... shrug. Someone's personal formatting preference?

@Gobberwart
Copy link
Contributor Author

Should be OK to merge now

@solderzzc
Copy link
Contributor

solderzzc commented Sep 19, 2016

👍

Approved with PullApprove

@Gobberwart Gobberwart merged commit 86d9bf7 into PokemonGoF:dev Sep 19, 2016
@Gobberwart Gobberwart deleted the gobb_dev_catcherror branch September 21, 2016 02:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants