Skip to content

Fixes stationary walks in SpiralNavigation #813

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

Merged
fredrik-hellmangroup merged 13 commits into from
Jul 25, 2016
Merged

Fixes stationary walks in SpiralNavigation #813

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a08dfaa
Fixed sleep to use floats again
Jul 25, 2016
96fc444
Fixed sleep to use floats again #2
Jul 25, 2016
5226e7c
Merge remote-tracking branch 'origin/dev' into dev
Jul 25, 2016
d2d4c5f
Merge remote-tracking branch 'origin/dev' into dev
Jul 25, 2016
9f32989
Refactored jitter to have its own function to be used elsewhere
Jul 25, 2016
7fa21ce
Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int…
Jul 25, 2016
c09025d
Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int…
Jul 25, 2016
f8ba6f0
Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int…
Jul 25, 2016
f37bcce
Merge remote-tracking branch 'origin/dev' into dev
Jul 25, 2016
755bb62
Fixes SpiralNavigation skipping waypoints
Jul 25, 2016
e081a50
Fixing stationary movements
Jul 25, 2016
5425a7e
Improved StepWalker
Jul 25, 2016
022946e
Merge remote-tracking branch 'origin/dev' into dev
Jul 25, 2016
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
5 changes: 3 additions & 2 deletions pokemongo_bot/step_walker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def __init__(self, bot, speed, initLat, initLng, destLat, destLng):

self.steps = (dist + 0.0) / (speed + 0.0)

if dist < 0.01 or self.steps < 1:
if dist < speed or self.steps < 1:
self.dLat = 0
self.dLng = 0
self.magnitude = 0;
Expand All @@ -44,7 +44,8 @@ def step(self):
# print 'distance'
# print dist

if (self.dLat == 0 and self.dLng == 0) or dist < 15:
if (self.dLat == 0 and self.dLng == 0) or dist < self.speed:
Copy link
Contributor

@elicwhite elicwhite Jul 25, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

@tstumm I think dist < self.speeed isn't going to work correctly. Since random_lat_long_delta() returns something between -9.1 and 9.1, we really need something like self.speed < dist + 9.1 Otherwise we could walk past and go on for ever.

self.api.set_position(self.destLat, self.destLng, 0)
return True

totalDLat = (self.destLat - i2f(self.api._position_lat))
Expand Down