Move Workers

pokemongo_bot/__init__.py

@@ -14,7 +14,7 @@
 from pgoapi.utilities import f2i
 
 import logger
-from cell_workers import SpinNearestFortWorker, CatchVisiblePokemonWorker, PokemonCatchWorker, SeenFortWorker, MoveToFortWorker, PokemonTransferWorker, EvolveAllWorker, RecycleItemsWorker, IncubateEggsWorker
+import cell_workers
 from cell_workers.utils import distance, get_cellid, encode, i2f
 from human_behaviour import sleep
 from item_list import Item
@@ -30,6 +30,15 @@
 
 class PokemonGoBot(object):
 
+    WORKERS = [
+        cell_workers.IncubateEggsWorker,
+        cell_workers.PokemonTransferWorker,
+        cell_workers.EvolveAllWorker,
+        cell_workers.RecycleItemsWorker,
+        cell_workers.CatchVisiblePokemonWorker,
+        cell_workers.SpinNearestFortWorker
+    ]
+
     @property
     def position(self):
         return self.api._position_lat, self.api._position_lng, 0
@@ -45,6 +54,8 @@ def __init__(self, config):
         self.recent_forts = [None] * config.max_circle_size
         self.tick_count = 0
 
+        # Make our own copy of the workers for this instance
+        self.workers = list(self.WORKERS)
 
     def start(self):
         self._setup_logging()
@@ -76,16 +87,7 @@ def tick(self):
         # Check if session token has expired
         self.check_session(self.position[0:2])
 
-        workers = [
-            IncubateEggsWorker,
-            PokemonTransferWorker,
-            EvolveAllWorker,
-            RecycleItemsWorker,
-            CatchVisiblePokemonWorker,
-            SpinNearestFortWorker
-        ]
-
-        for worker in workers:
+        for worker in self.workers:
             if worker(self).work() == WorkerResult.RUNNING:
                 return