From 315dcb6dfeb943426ca3e311a6e4f197b4815872 Mon Sep 17 00:00:00 2001 From: Valerian Gaudeau Date: Mon, 1 Aug 2016 13:45:55 +0200 Subject: [PATCH] fixed pokemon transfer so that "keep_best_*" filters can work again without requiring to be combined with "release_below_*" rules --- pokemongo_bot/cell_workers/transfer_pokemon.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pokemongo_bot/cell_workers/transfer_pokemon.py b/pokemongo_bot/cell_workers/transfer_pokemon.py index 101e0b92f4..3cf40413f5 100644 --- a/pokemongo_bot/cell_workers/transfer_pokemon.py +++ b/pokemongo_bot/cell_workers/transfer_pokemon.py @@ -44,7 +44,8 @@ def work(self): transfer_pokemons = [pokemon for pokemon in all_pokemons if self.should_release_pokemon(pokemon_name, pokemon['cp'], - pokemon['iv'])] + pokemon['iv'], + True)] if transfer_pokemons: logger.log("Keep {} best {}, based on {}".format(len(best_pokemons), @@ -125,8 +126,16 @@ def get_pokemon_potential(self, pokemon_data): continue return round((total_iv / 45.0), 2) - def should_release_pokemon(self, pokemon_name, cp, iv): + def should_release_pokemon(self, pokemon_name, cp, iv, keep_best_mode = False): release_config = self._get_release_config_for(pokemon_name) + + if (keep_best_mode + and not release_config.has_key('never_release') + and not release_config.has_key('always_release') + and not release_config.has_key('release_below_cp') + and not release_config.has_key('release_below_iv')): + return True + cp_iv_logic = release_config.get('logic') if not cp_iv_logic: cp_iv_logic = self._get_release_config_for('any').get('logic', 'and')