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

SpiralNavigator rewrite, mode switch #939

Merged
merged 6 commits into from
Jul 26, 2016
Merged

SpiralNavigator rewrite, mode switch #939

merged 6 commits into from
Jul 26, 2016

Conversation

tstumm
Copy link
Contributor

@tstumm tstumm commented Jul 26, 2016

Short Description:
SpiralNavigator had code issues so I replaced it with some example code from pgoapi until we find a better solution.
Also I fixed fort-searching even if inventory is full

@@ -62,7 +62,7 @@ def update_web_location(self, cells=[], lat=None, lng=None, alt=None):
status = map_objects.get('status', None)
cells = map_objects['map_cells']

#insert detail info about gym to fort
# insert detail info about gym to fort
Copy link
Contributor

Choose a reason for hiding this comment

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

It's unfortunate that you have so many changes in this file. It makes it very difficult to read the diff here and likely that it will cause someone else merge conflicts.

Copy link
Contributor

@elicwhite elicwhite Jul 26, 2016

Choose a reason for hiding this comment

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

In fact, this is probably why you now have merge conflicts. :-/

@elicwhite
Copy link
Contributor

The changes to the SpiralWalker in this PR look good to me.

This reverts commit a710a6e.
@@ -212,6 +212,8 @@ def work_on_cell(self, cell, position):
if hack_chain > 10:
#print('need a rest')
break
if self.config.mode == "poke":
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a reasonable fix for now, but probably not the right long term fix. We should be removing this loop entirely so it instead only acts on one fort per event loop.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The problem is that both workers are not giving any informations back to the bot so they need to be refactored. This quickfix should work until that is being done.

@elicwhite
Copy link
Contributor

👍

@tstumm tstumm merged commit b19028d into PokemonGoF:dev Jul 26, 2016
MFizz pushed a commit to MFizz/PokemonGo-Bot that referenced this pull request Jul 29, 2016
* Stop farming if inventory is full

* Changed spiral navigator to use pgoagpi example code until we find a better solution

* pep8 reformat

* Revert "pep8 reformat"

This reverts commit a710a6e.

* Removed debug lines

* Reducing log spam
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.

2 participants