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

Get rid of the evolved pokemons after XP evolve #5876

Merged
merged 2 commits into from
Jan 16, 2017
Merged

Get rid of the evolved pokemons after XP evolve #5876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fb6113
Get rid of the evolved pokemons after XP evolve
davidakachaos Jan 15, 2017
f0974bd
Merge branch 'master' into transfer_after_xp_evolve
Jcolomar Jan 15, 2017
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
37 changes: 19 additions & 18 deletions pokemongo_bot/cell_workers/pokemon_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,24 +219,25 @@ def work(self):
if self.get_pokemon_slot_left() > self.config_min_slots_left:
return WorkerResult.SUCCESS

transfer_all = []
evolve_all = []
upgrade_all = []
xp_all = []

for family_id, pokemon_list in self.group_by_family_id(inventory.pokemons().all()):
keep = [p for p in keep_all if self.get_family_id(p) == family_id]
try_evolve = [p for p in try_evolve_all if self.get_family_id(p) == family_id]
try_upgrade = [p for p in try_upgrade_all if self.get_family_id(p) == family_id]

transfer, evolve, upgrade, xp = self.get_evolution_plan(family_id, pokemon_list, keep, try_evolve, try_upgrade)

transfer_all += transfer
evolve_all += evolve
upgrade_all += upgrade
xp_all += xp

self.apply_optimization(transfer_all, evolve_all, upgrade_all, xp_all)
# Repeat the optimizer 2 times, to get rid of the trash evolved.
for _ in itertools.repeat(None, 2):
transfer_all = []
evolve_all = []
upgrade_all = []
xp_all = []
for family_id, pokemon_list in self.group_by_family_id(inventory.pokemons().all()):
keep = [p for p in keep_all if self.get_family_id(p) == family_id]
try_evolve = [p for p in try_evolve_all if self.get_family_id(p) == family_id]
try_upgrade = [p for p in try_upgrade_all if self.get_family_id(p) == family_id]

transfer, evolve, upgrade, xp = self.get_evolution_plan(family_id, pokemon_list, keep, try_evolve, try_upgrade)

transfer_all += transfer
evolve_all += evolve
upgrade_all += upgrade
xp_all += xp

self.apply_optimization(transfer_all, evolve_all, upgrade_all, xp_all)

return WorkerResult.SUCCESS

Expand Down