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

Revert "moving_to_fort and moving_to_lured_fort now also emit current_position" #3640

Merged
merged 1 commit into from
Aug 11, 2016
Merged

Revert "moving_to_fort and moving_to_lured_fort now also emit current_position" #3640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions pokemongo_bot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,15 @@ def _register_events(self):
'moving_to_fort',
parameters=(
'fort_name',
'distance',
'current_position'
'distance'
)
)
self.event_manager.register_event(
'moving_to_lured_fort',
parameters=(
'fort_name',
'distance',
'lure_distance',
'current_position'
'lure_distance'
)
)
self.event_manager.register_event(
Expand All @@ -219,12 +217,7 @@ def _register_events(self):
parameters=('status_code',)
)
self.event_manager.register_event('pokestop_searching_too_often')
self.event_manager.register_event(
'arrived_at_fort',
parameters=(
'current_position'
)
)
self.event_manager.register_event('arrived_at_fort')

# pokemon stuff
self.event_manager.register_event(
Expand Down
7 changes: 1 addition & 6 deletions pokemongo_bot/cell_workers/move_to_fort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ def work(self):
fort_event_data = {
'fort_name': u"{}".format(fort_name),
'distance': format_dist(dist, unit),
'current_position': self.bot.position
}

if self.is_attracted() > 0:
Expand All @@ -88,13 +87,9 @@ def work(self):
if not step_walker.step():
return WorkerResult.RUNNING

arrived_at_fort_data = {
'current_position': self.bot.position
}
self.emit_event(
'arrived_at_fort',
formatted='Arrived at fort.',
data=arrived_at_fort_data
formatted='Arrived at fort.'
)
return WorkerResult.SUCCESS

Expand Down