Added circle avoidance (#1515)

* Added circle avoidance

* Changed to add_config

* Changed path to recent_forts.
Put config keys into spin_forts key

configs/config.json.example

@@ -32,6 +32,10 @@
     "longer_eggs_first": true,
     "evolve_captured": false,
     "release_pokemon": true,
+    "spin_forts": {
+      "avoid_circles": false,
+      "max_circle_size": 10
+    },
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or"},
       "// Example of always catching Rattata:": {},

configs/config.json.pokemon.example

@@ -32,6 +32,10 @@
     "longer_eggs_first": true,
     "evolve_captured": false,
     "release_pokemon": true,
+    "spin_forts": {
+      "avoid_circles": false,
+      "max_circle_size": 10
+    },
     "catch": {
       "any": {"catch_above_cp": 0, "catch_above_iv": 0, "logic": "or" },
 

pokecli.py

@@ -298,6 +298,24 @@ def init_config():
         type=bool,
         default=True
     )
+    add_config(
+        parser,
+        load,
+        short_flag="-ac",
+        long_flag="--avoid_circles",
+        help="Avoids circles (pokestops) of the max size set in max_circle_size flag",
+        type=bool,
+        default=False
+    )
+    add_config(
+        parser,
+        load,
+        short_flag="-mcs",
+        long_flag="--max_circle_size",
+        help="If avoid_circles flag is set, this flag specifies the maximum size of circles (pokestops) avoided",
+        type=int,
+        default=10
+    )
 
     # Start to parse other attrs
     config = parser.parse_args()

pokemongo_bot/__init__.py

@@ -38,6 +38,7 @@ def __init__(self, config):
         self.metrics = Metrics(self)
         self.latest_inventory = None
         self.cell = None
+        self.recent_forts = [None] * config.max_circle_size
 
     def start(self):
         self._setup_logging()

pokemongo_bot/cell_workers/seen_fort_worker.py

@@ -116,6 +116,8 @@ def work(self):
                         'PokeStops you are indeed softbanned. Please try again '
                         'in a few hours.')
                     raise RuntimeError(message)
+
+                self.bot.recent_forts = self.bot.recent_forts[1:] + [self.fort['id']]
             elif spin_result == 2:
                 logger.log("[#] Pokestop out of range")
             elif spin_result == 3:

pokemongo_bot/cell_workers/spin_nearest_fort_worker.py

@@ -12,6 +12,7 @@ def __init__(self, bot):
         self.cell = bot.cell
         self.fort_timeouts = bot.fort_timeouts
         self.position = bot.position
+        self.recent_forts = bot.recent_forts
 
     def work(self):
         if not self.should_run():
@@ -46,6 +47,10 @@ def get_nearest_fort(self):
             # Remove stops that are still on timeout
             forts = filter(lambda x: x["id"] not in self.fort_timeouts, forts)
 
+            # Remove all forts which were spun in the last ticks to avoid circles if set
+            if self.config.avoid_circles:
+                forts = filter(lambda x: x["id"] not in self.recent_forts, forts)
+
             # Sort all by distance from current pos- eventually this should
             # build graph & A* it
             forts.sort(key=lambda x: distance(self.position[