Restart the loop when catching pokemon and there are more to catch

pokemongo_bot/cell_workers/catch_visible_pokemon.py

@@ -3,13 +3,24 @@
 from pokemongo_bot.base_task import BaseTask
 from pokemongo_bot.cell_workers.pokemon_catch_worker import PokemonCatchWorker
 from utils import distance
+from pokemongo_bot.worker_result import WorkerResult
 
 
 class CatchVisiblePokemon(BaseTask):
     SUPPORTED_TASK_API_VERSION = 1
 
     def work(self):
-        if 'catchable_pokemons' in self.bot.cell and len(self.bot.cell['catchable_pokemons']) > 0:
+        num_catchable_pokemon = 0
+        if 'catchable_pokemons' in self.bot.cell:
+            num_catchable_pokemon = len(self.bot.cell['catchable_pokemons'])
+
+        num_wild_pokemon = 0
+        if 'wild_pokemons' in self.bot.cell:
+            num_wild_pokemon = len(self.bot.cell['wild_pokemons'])
+
+        num_available_pokemon = num_catchable_pokemon + num_wild_pokemon
+
+        if num_catchable_pokemon > 0:
             # Sort all by distance from current pos- eventually this should
             # build graph & A* it
             self.bot.cell['catchable_pokemons'].sort(
@@ -33,15 +44,24 @@ def work(self):
                     }
                 )
 
-            return self.catch_pokemon(self.bot.cell['catchable_pokemons'].pop(0))
+            self.catch_pokemon(self.bot.cell['catchable_pokemons'].pop(0))
+            if num_catchable_pokemon > 1:
+                return WorkerResult.RUNNING
+            else:
+                return WorkerResult.SUCCESS
 
-        if 'wild_pokemons' in self.bot.cell and len(self.bot.cell['wild_pokemons']) > 0:
+        if num_available_pokemon > 0:
             # Sort all by distance from current pos- eventually this should
             # build graph & A* it
             self.bot.cell['wild_pokemons'].sort(
                 key=
                 lambda x: distance(self.bot.position[0], self.bot.position[1], x['latitude'], x['longitude']))
-            return self.catch_pokemon(self.bot.cell['wild_pokemons'].pop(0))
+            self.catch_pokemon(self.bot.cell['wild_pokemons'].pop(0))
+
+            if num_catchable_pokemon > 1:
+                return WorkerResult.RUNNING
+            else:
+                return WorkerResult.SUCCESS
 
     def catch_pokemon(self, pokemon):
         worker = PokemonCatchWorker(pokemon, self.bot)

pokemongo_bot/cell_workers/pokemon_catch_worker.py

@@ -4,7 +4,7 @@
 from pokemongo_bot import inventory
 from pokemongo_bot.base_task import BaseTask
 from pokemongo_bot.human_behaviour import normalized_reticle_size, sleep, spin_modifier
-
+from pokemongo_bot.worker_result import WorkerResult
 
 CATCH_STATUS_SUCCESS = 1
 CATCH_STATUS_FAILED = 2
@@ -68,7 +68,7 @@ def work(self, response_dict=None):
 
         # validate response
         if not response_dict:
-            return False
+            return WorkerResult.ERROR
         try:
             responses = response_dict['responses']
             response = responses[self.response_key]
@@ -77,17 +77,17 @@ def work(self, response_dict=None):
                     self.emit_event('pokemon_not_in_range', formatted='Pokemon went out of range!')
                 elif response[self.response_status_key] == ENCOUNTER_STATUS_POKEMON_INVENTORY_FULL:
                     self.emit_event('pokemon_inventory_full', formatted='Your Pokemon inventory is full! Could not catch!')
-                return False
+                return WorkerResult.ERROR
         except KeyError:
-            return False
+            return WorkerResult.ERROR
 
         # get pokemon data
         pokemon_data = response['wild_pokemon']['pokemon_data'] if 'wild_pokemon' in response else response['pokemon_data']
         pokemon = Pokemon(self.pokemon_list, pokemon_data)
 
         # skip ignored pokemon
         if not self._should_catch_pokemon(pokemon):
-            return False
+            return WorkerResult.SUCCESS
 
         # log encounter
         self.emit_event(

pokemongo_bot/worker_result.py

@@ -1,3 +1,4 @@
 class WorkerResult(object):
     RUNNING = 'RUNNING'
     SUCCESS = 'SUCCESS'
+    ERROR = 'ERROR'