Merge pull request #6146 from MerlionRock/dev

Catch Limiter Bug Fix
PokemonGoF · Jul 26, 2017 · 1152de5 · 1152de5
2 parents f436635 + fd6ee67
commit 1152de5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/configs/config.json.example b/configs/config.json.example
@@ -418,12 +418,13 @@
 		"pinap_on_level_below": 0,
 		"pinap_operator": "or",
 		"pinap_ignore_threshold": false,
-				"smart_pinap_enabled": true,
-				"smart_pinap_threshold": 0.85,
-				"smart_pinap_to_keep": 3,
+		"smart_pinap_enabled": true,
+		"smart_pinap_threshold": 0.85,
+		"smart_pinap_to_keep": 3,
                 "vip_berry_threshold": 0.9,
                 "treat_unseen_as_vip": true,
-                "daily_catch_limit": 800,
+                "daily_catch_limit": 500,
+		"exit_on_limit_reached": false,
                 "vanish_settings": {
                     "consecutive_vanish_limit": 10,
                     "rest_duration_min": "02:00:00",

diff --git a/pokemongo_bot/cell_workers/catch_limiter.py b/pokemongo_bot/cell_workers/catch_limiter.py
@@ -24,6 +24,9 @@ def __init__(self, bot, config):
         self.duration = self.config.get("duration", 15)
         self.no_log_until = datetime.now()
         self.min_ultraball_to_keep = 0
+        self.daily_catch_limit = 500 # default it to 500 if not found in CatchPokemon
+        self.exit_on_limit_reached = False # default it to false if not found in CatchPokemon
+
         for catch_cfg in self.bot.config.raw_tasks:
             if "type" in catch_cfg:
                 if catch_cfg["type"] == "CatchPokemon":