Updated Catch Limiter

configs/config.json.example

@@ -477,7 +477,8 @@
                 "never_place": ["Machamp"],
                 "leave_at_least_spots": 1,
                 "take_at_most": 10,
-                "pick_random_pokemon": true
+                "pick_random_pokemon": true,
+                "can_be_disabled_by_catch_limter": false
             }
         },
         {

pokemongo_bot/cell_workers/catch_limiter.py

@@ -19,15 +19,21 @@ def __init__(self, bot, config):
         self.min_balls = self.config.get("min_balls", 20)
         self.resume_at_balls = self.config.get("resume_at_balls", 100)
         self.duration = self.config.get("duration",15)
+        self.min_ultraball_to_keep = 0
+        for subVal in self.bot.config.raw_tasks:
+            if "type" in subVal:
+                if subVal["type"] == "CatchPokemon":
+                    self.min_ultraball_to_keep = subVal["config"]["min_ultraball_to_keep"]
+
         if not hasattr(self.bot, "catch_resume_at"): self.bot.catch_resume_at = None
 
     def work(self):
         if not self.enabled:
             return WorkerResult.SUCCESS
 
         now = datetime.now()
-        balls_on_hand = self.get_pokeball_count()
-
+        balls_on_hand = self.get_pokeball_count() - self.min_ultraball_to_keep
+        
         # If resume time has passed, resume catching tasks
         if self.bot.catch_disabled and now >= self.bot.catch_resume_at:
             if balls_on_hand > self.min_balls:
@@ -42,7 +48,7 @@ def work(self):
         if self.bot.catch_disabled and balls_on_hand >= self.resume_at_balls:
             self.emit_event(
                 'catch_limit_off',
-                formatted="Resume time hasn't passed yet, bu balls on hand ({}) exceeds threshold {}. Re-enabling catch tasks.".
+                formatted="Resume time hasn't passed yet, but balls on hand ({}) exceeds threshold {}. Re-enabling catch tasks.".
                     format(balls_on_hand, self.resume_at_balls)
             )
             self.bot.catch_disabled = False

pokemongo_bot/cell_workers/gym_pokemon.py

@@ -75,6 +75,8 @@ def initialize(self):
         self.never_place = self.config.get('never_place', [])
 
         self.pick_random_pokemon = self.config.get('pick_random_pokemon', True)
+
+        self.can_be_disabled_by_catch_limter = self.config.get("can_be_disabled_by_catch_limter", False)
 
         self.recheck = datetime.now()
         self.walker = self.config.get('walker', 'StepWalker')
@@ -121,6 +123,22 @@ def display_fort_pokemon(self):
             self.logger.info("%s (%s CP)" % (pokemon.name, pokemon.cp))
 
     def work(self):
+        if not self.enabled:
+            return WorkerResult.SUCCESS
+
+        if self.bot.catch_disabled and self.can_be_disabled_by_catch_limter:
+            # When catching is disabled, drop the target.
+            if self.destination is not None:
+                self.destination = None
+
+            if not hasattr(self.bot, "gym_pokemon_disabled_global_warning") or \
+                        (hasattr(self.bot, "gym_pokemon_disabled_global_warning") and not self.bot.gym_pokemon_disabled_global_warning):
+                self.logger.info("All gym tasks are currently disabled until {}. Gym function will resume when catching tasks are re-enabled".format(self.bot.catch_resume_at.strftime("%H:%M:%S")))
+            self.bot.gym_pokemon_disabled_global_warning = True
+            return WorkerResult.SUCCESS
+        else:
+            self.bot.gym_pokemon_disabled_global_warning = False
+
         self.pokemons = inventory.pokemons().all()
         self.fort_pokemons = [p for p in self.pokemons if p.in_fort]
         self.pokemons = [p for p in self.pokemons if not p.in_fort]