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

#5099 #5102

Merged
merged 2 commits into from
Sep 2, 2016
Merged

#5099 #5102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b733250
#5099
rawgni Sep 2, 2016
7b718f0
Merge branch 'dev' into incubate1
rawgni Sep 2, 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
12 changes: 4 additions & 8 deletions pokemongo_bot/cell_workers/incubate_eggs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,10 @@ def _check_inventory(self, lookup_ids=[]):
continue
if "player_stats" in inv_data:
self.km_walked = inv_data.get("player_stats", {}).get("km_walked", 0)
if temp_used_incubators:
self.used_incubators = temp_used_incubators
if temp_ready_breakable_incubators:
self.ready_breakable_incubators = temp_ready_breakable_incubators
if temp_ready_infinite_incubators:
self.ready_infinite_incubators = temp_ready_infinite_incubators
if temp_eggs:
self.eggs = temp_eggs
self.used_incubators = temp_used_incubators
self.ready_breakable_incubators = temp_ready_breakable_incubators
self.ready_infinite_incubators = temp_ready_infinite_incubators
self.eggs = temp_eggs
return matched_pokemon

def _hatch_eggs(self):
Expand Down