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

Merge dev to master #5945

Merged
merged 9 commits into from
Mar 4, 2017
Merged

Merge dev to master #5945

merged 9 commits into from
Mar 4, 2017

Conversation

pogarek
Copy link
Contributor

@pogarek pogarek commented Mar 4, 2017

@solderzzc If I/we shouldn't do the marge to master, let me/us know. In the meantime - trying.

davidakachaos and others added 8 commits March 3, 2017 09:58
Used to see if we ignore this Pokemon or not
- Corrected a flow bug
- Added rechecking of biggest cluster in range
- Notes other task of camping active
- Added config "lock_vip_only" to only lock VIP pokemon, not if only completing Pokedex
- Added config "disabled_while_camping" to disable hunting if the bot is camping at lured forts
- Added config "treat_unseen_as_vip" to toggle if unseen Pokemon are VIP for hunting or not

Behaviour:
- Checks if a hunted Pokemon was caught recently
- Takes a break from hunting after a hunt. More human like behaviour
- Picks a random Pokemon to hunt down. More human like behaviour
- Lists Pokemon around with number instead of repeatedly in a list
- If unable to move to a hunted Pokemon, abort the search and start a cooldown
- Needed for Pokedex will now return False if amount of candies is above 150
- Uses the database of caught Pokemon to check if our hunted Pokemon was caught.
Added docs about the PokemonHunter
Use urllib2 instead of urllib
@mention-bot
Copy link

@pogarek, thanks for your PR! By analyzing the history of the files in this pull request, we identified @mjmadsen, @douglascamata and @anakin5 to be potential reviewers.

@pogarek
Copy link
Contributor Author

pogarek commented Mar 4, 2017

👍

Approved with PullApprove

@pogarek
Copy link
Contributor Author

pogarek commented Mar 4, 2017

All clear. Test passed, approved by comment and in pullapprove, but button is disabled :-) So @solderzzc , it awaits for you :)

@solderzzc
Copy link
Contributor

solderzzc commented Mar 4, 2017

Anyone in the team comment a 👍 will green the button :) except the one submit the PR. lol @pogarek

@solderzzc
Copy link
Contributor

solderzzc commented Mar 4, 2017

👍

Approved with PullApprove

@solderzzc
Copy link
Contributor

solderzzc commented Mar 4, 2017

👍

Approved with PullApprove

@solderzzc
Copy link
Contributor

@pogarek you can 'Merge the pull request' for now :)

@pogarek
Copy link
Contributor Author

pogarek commented Mar 4, 2017

@solderzzc thanks for explanation and approval.
However the Merge button is still gray for me :-)

@solderzzc
Copy link
Contributor

。。。。

@solderzzc solderzzc merged commit 7bfdc03 into master Mar 4, 2017
@solderzzc
Copy link
Contributor

@pogarek I just checked the settings and modified, the next button will be green then...

@pogarek
Copy link
Contributor Author

pogarek commented Mar 4, 2017

thanks a lot!

@solderzzc
Copy link
Contributor

you are welcome :)

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.

5 participants