diff --git a/pokemongo_bot/cell_workers/pokemon_catch_worker.py b/pokemongo_bot/cell_workers/pokemon_catch_worker.py index ef6e649b7d..e64abbfd0e 100644 --- a/pokemongo_bot/cell_workers/pokemon_catch_worker.py +++ b/pokemongo_bot/cell_workers/pokemon_catch_worker.py @@ -211,15 +211,15 @@ def _pokemon_matches_config(self, config, pokemon, default_logic='and'): if pokemon_config.get('always_catch', False): return True - catch_ncp = pokemon_config.get('catch_above_ncp', 0) + catch_ncp = pokemon_config.get('catch_above_ncp', 0.8) if pokemon.cp_percent > catch_ncp: catch_results['ncp'] = True - catch_cp = pokemon_config.get('catch_above_cp', 0) + catch_cp = pokemon_config.get('catch_above_cp', 1200) if pokemon.cp > catch_cp: catch_results['cp'] = True - catch_iv = pokemon_config.get('catch_above_iv', 0) + catch_iv = pokemon_config.get('catch_above_iv', 0.8) if pokemon.iv > catch_iv: catch_results['iv'] = True @@ -288,7 +288,7 @@ def _use_berry(self, berry_id, berry_count, encounter_id, catch_rate_by_ball, cu with self.bot.database as conn: c = conn.cursor() c.execute("SELECT COUNT(name) FROM sqlite_master WHERE type='table' AND name='softban_log'") - result = c.fetchone() + result = c.fetchone() while True: if result[0] == 1: @@ -501,7 +501,7 @@ def _do_catch(self, pokemon, encounter_id, catch_rate_by_ball, is_vip=False): with self.bot.database as conn: c = conn.cursor() c.execute("SELECT COUNT(name) FROM sqlite_master WHERE type='table' AND name='catch_log'") - result = c.fetchone() + result = c.fetchone() while True: if result[0] == 1: