Skip to content

Commit

Permalink
Merge pull request #5055 from DeXtroTip/fix_evolve_pokemon
Browse files Browse the repository at this point in the history
Fix #5051
  • Loading branch information
solderzzc authored Sep 1, 2016
2 parents e30b359 + 6202733 commit 79469dc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pokemongo_bot/cell_workers/evolve_pokemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ def initialize(self):

def _validate_config(self):
if isinstance(self.evolve_list, basestring):
self.evolve_list = [str(pokemon_name).strip() for pokemon_name in self.evolve_list.split(',')]
self.evolve_list = [str(pokemon_name).strip().lower() for pokemon_name in self.evolve_list.split(',')]

if isinstance(self.donot_evolve_list, basestring):
self.donot_evolve_list = [str(pokemon_name).strip() for pokemon_name in self.donot_evolve_list.split(',')]
self.donot_evolve_list = [str(pokemon_name).strip().lower() for pokemon_name in self.donot_evolve_list.split(',')]

if 'evolve_speed' in self.config:
self.logger.warning("evolve_speed is deprecated, instead please use 'min_evolve_speed' and 'max_evolved_speed'.")
Expand All @@ -46,10 +46,10 @@ def work(self):
filtered_list = self._sort_and_filter()

if (len(self.evolve_list) > 0) and self.evolve_list[0] != 'all':
filtered_list = filter(lambda x: x.name in self.evolve_list, filtered_list)
filtered_list = filter(lambda x: x.name.lower() in self.evolve_list, filtered_list)

if (len(self.donot_evolve_list) > 0) and self.donot_evolve_list[0] != 'none':
filtered_list = filter(lambda pokemon: pokemon.name not in self.donot_evolve_list, filtered_list)
filtered_list = filter(lambda pokemon: pokemon.name.lower() not in self.donot_evolve_list, filtered_list)

cache = {}
for pokemon in filtered_list:
Expand Down

0 comments on commit 79469dc

Please sign in to comment.