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.

Sign up for GitHub

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

Jump to bottom

Update MoveToMapPokemon to use events instead of logger (similar to #2867) #2881

Closed
wants to merge 64 commits into from
Closed

Update MoveToMapPokemon to use events instead of logger (similar to #2867) #2881

wants to merge 64 commits into from

Conversation

chrisle
Copy link
Contributor

@chrisle chrisle commented Aug 7, 2016

Short Description:

Update MoveToMapPokemon to use events instead of logger. Same as PR 2867 but includes documentation and a refactor of the module.

Fixes:

  • Deprecation warnings emitted by MoveToMapPokemon.

@chrisle chrisle changed the title Dev Update MoveToMapPokemon to use events instead of logger (similar to #2867) Aug 7, 2016
@bixuanzju
Copy link
Contributor

This is better than mine 👍

@bigkraig
Copy link
Contributor

bigkraig commented Aug 7, 2016

maybe a squash and a rebase is in order, i can't apply this cleanly

@chrisle
Copy link
Contributor Author

chrisle commented Aug 7, 2016

I was just realizing that actually. Hold on.

douglascamata
douglascamata reviewed Aug 7, 2016
View reviewed changes
pokemongo_bot/__init__.py
# Move To map pokemon
self.event_manager.register_event(
'move_to_map_pokemon_fail',
parameters=('message')
Copy link
Member

Choose a reason for hiding this comment

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

this needs to be ('message',), otherwise the tuple isn't valid

@douglascamata
Copy link
Member

douglascamata commented Aug 7, 2016 •
edited
Loading

👍

@TheSavior review this when you can, please.

Approved with PullApprove

@mhdasding @chrisle
Feature: Use PokemonGo-Map sqlite db to catch pokemon near you
b062e9d
@mhdasding @chrisle
added example config for move_to_map_pokemon
07b0dcc
@mhdasding @chrisle
adapted new config format
f4ae148
@mhdasding @chrisle
Automatically update Map position
ccf7cf2
@mhdasding @chrisle
remove pokemon when encountered early
a160103
@mhdasding @chrisle
forgot to remove a log
8996fb7
@mhdasding @chrisle
minor fix
8c2d72e
@mhdasding @chrisle
updated example config and added ignore config
ce95ea0
@mhdasding @chrisle
change ignore config to a list
806f858
@mhdasding @chrisle
teleport to pokemon if walk option is 0
2c82e35
@mhdasding @chrisle
added snipe option
7270151
@mhdasding @chrisle
Teleport back after sniped pokemon was caught
6cfbcb9
@mhdasding @chrisle
proper sniping
ce9f7e5
@mhdasding @chrisle
mark sniped pokemon as caught
4ef2db7
@mhdasding @chrisle
forgot to remove print
b61fe6d
@mhdasding @chrisle
minor bug fix
b3966d1
@mhdasding @chrisle
ignore max_distance when sniping
5f58c2f
@mhdasding @chrisle
prioritize VIPs in a 10km radius
0b388fc
@mhdasding @chrisle
better prioritize vips
cc069da
@mhdasding @chrisle
syntax error fix
be83262
@mhdasding @chrisle
set base priority for vips
605826e
mhdasding and others added 21 commits August 7, 2016 18:30
@mhdasding @chrisle
log error when JSON decoding fails
1a94eac
@mhdasding @chrisle
remove print
61f89e5
@mhdasding @chrisle
handle base64 error
b4e2b56
@mhdasding @chrisle
fix item_inventory_count returnin None instead of 0
e3f3807
@chrisle
Fix extra space in logger
fd4091c
@mhdasding @chrisle
if we only have ultraballs and the target is not a vip don't snipe/walk
ef98d5c
@chrisle
cosmetic changes for logging
73f0486
@mhdasding @chrisle
remove gender symbols
41686af
@chrisle
Update gitignore to ignore user_web_catchable
c9a7972
@mhdasding @chrisle
fix Mr. Mime
efe1b77
@chrisle
Ignore Cloud9 directory
75b0497
@mhdasding @chrisle
vip wrong order fix
05939ef
@chrisle
Update MoveToMapPokemon to use events instead of logger.
84709b6
@mhdasding @chrisle
bugfix
896e1d0
@chrisle
Fix emit error. Wrong parameters
2c88215
@DayBr3ak @chrisle
delaying errors, and reducing noise
20b7215
@chrisle
Remove commented out log.
ab2bffd
@mhdasding @chrisle
log error when JSON decoding fails
e5679b2
@mhdasding @chrisle
handle base64 error
a4e705a
@chrisle
Ignore Cloud9 directory
ec18e5b
@chrisle
Update MoveToMapPokemon to use events instead of logger.
c48692c 
Fix emit error. Wrong parameters

Remove commented out log.
@brantje
Copy link
Contributor

brantje commented Aug 7, 2016

Can you resolve the conflicts?

@chrisle
Copy link
Contributor Author

chrisle commented Aug 7, 2016

grr. Some help needed: How do I squish or rebase commits that aren't mine so I'm left with just my commits?

@douglascamata
Copy link
Member

@chrisle easier to clone the project again, copy over your files and open another PR, imho.

@chrisle
Copy link
Contributor Author

chrisle commented Aug 7, 2016

Yeah.. i was starting to think that. OK.. hold on.

@chrisle
Copy link
Contributor Author

chrisle commented Aug 7, 2016

Please disregard this pull request. The merge went south. See PR 2913 instead for cleaner pull request.

@bigkraig
Copy link
Contributor

bigkraig commented Aug 7, 2016

You can rebuild your local branch and force push it to github instead of opening a new pr

Also used rebase -i to squash the commits

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Approved Second Review Required Waiting on Changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@chrisle @bixuanzju @bigkraig @douglascamata @brantje @mhdasding @DayBr3ak