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

Buddy Pokemon task #5530

Merged
merged 38 commits into from
Sep 20, 2016
Merged

Buddy Pokemon task #5530

merged 38 commits into from
Sep 20, 2016

Conversation

DeXtroTip
Copy link
Contributor

@DeXtroTip DeXtroTip commented Sep 18, 2016

EDIT: Updated requirements.txt with updated api (same repo, new commit). Ready to merge

Short Description:

Adds the new buddy system feature to the bot.
Able to select by family and automatically switch buddy at candy limit using a list of pokemon to use.

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

Added way to search pokemon from unique_id
Little changes on how task works
Some little code fixes
 * Added config to force buddy change at start
 * Added checks to see if pokemon can be set as buddy
 * Added and updated some events
 * Added colored events
 * Added periodically display of buddy km track
 * Now prints total candy after reward
Update config example files
Started updateing docs/configuration_files.md
@solderzzc
Copy link
Contributor

@DeXtroTip I don't see any 0.37.0 related code on the pgodevapi. how do you think about?
https://github.com/pogodevorg/pgoapi/commits/master

@DeXtroTip
Copy link
Contributor Author

@solderzzc I think the api hasn't really changed with the 0.37.0 update and the calls for the buddy system were introduced before. So, it works, I just don't really know if it's safe or not.

@solderzzc
Copy link
Contributor

@DeXtroTip sure, let's have a test after merge.

@solderzzc
Copy link
Contributor

solderzzc commented Sep 20, 2016

👍

Approved with PullApprove

1 similar comment
@alexyaoyang
Copy link
Contributor

alexyaoyang commented Sep 20, 2016

👍

Approved with PullApprove

@Gobberwart
Copy link
Contributor

Looks good. Go ahead and merge.

@davidakachaos
Copy link
Contributor

@DeXtroTip could you solve the conflicts perhaps?

@DeXtroTip
Copy link
Contributor Author

I'm not home right now, I'll do it later today, as soon as I can.

@davidakachaos
Copy link
Contributor

That's great! Thanks!

Op 20 sep. 2016 13:28 schreef "DeXtroTip" notifications@github.com:

I'm not home right now, I'll do it later today, as soon as I can.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#5530 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAD5YwuM7McgL7B1QT_6pTIhEAdm5Ja2ks5qr8N2gaJpZM4J_-Tx
.

"// force_first_change = true will always change buddy at start removing current one": {},
"force_first_change": false,
"buddy_change_wait_min": 3,
"buddy_change_wait_min": 5,
Copy link
Contributor

@davidakachaos davidakachaos Sep 20, 2016

Choose a reason for hiding this comment

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

This should be buddy_change_wait_max

@DeXtroTip
Copy link
Contributor Author

Fixed all conflicts. Need new approve before merge.

@alexyaoyang
Copy link
Contributor

alexyaoyang commented Sep 20, 2016

👍 Looks good!

Approved with PullApprove

@DeXtroTip DeXtroTip merged commit f4c4b4f into PokemonGoF:dev Sep 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants