Keep by best hp max (#4144)

* Updated wiki, explain how to use Docker under Windows * Add keep_best_hp_max to keep pokemon with the best potential hp * Add example of keep_best_hp_max in config * Keep best pokemon by custom criteria order * Correct list of criteria. Add example in config. * Update documentations for keep custom pokemons * Replace the important | for the set * Clean the charmander comment
PokemonGoF · Aug 18, 2016 · de0d43f · de0d43f · Foulwerp · Aug 18, 2016
1 parent b060c02
commit de0d43f
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 12 deletions.
diff --git a/configs/config.json.example b/configs/config.json.example
@@ -168,12 +168,14 @@
       "// Rattata": {"always_release": true},
       "// Example of keeping 3 stronger (based on CP) Pidgey:": {},
       "// Pidgey": {"keep_best_cp": 3},
-      "// Example of keeping 2 stronger (based on IV) Zubat:": {},
+      "// Example of keeping 2 best (based on IV) Zubat:": {},
       "// Zubat": {"keep_best_iv": 2},
       "// Also, it is working with any": {},
       "// any": {"keep_best_iv": 3},
       "// Example of keeping the 2 strongest (based on CP) and 3 best (based on IV) Zubat:": {},
-      "// Zubat": {"keep_best_cp": 2, "keep_best_iv": 3}
+      "// Zubat": {"keep_best_cp": 2, "keep_best_iv": 3},
+	  "// Example of custom order of static criterion": {},
+	  "// Zubat": {"keep_best_custom": "moveset.defense_perfection, hp_max", "amount":2}
     },
     "vips" : {
         "Any pokemon put here directly force to use Berry & Best Ball to capture, to secure the capture rate!": {},

diff --git a/docs/configuration_files.md b/docs/configuration_files.md
@@ -163,6 +163,21 @@ If you already have it, it will keep a stronger version and will transfer the a
 
 ```"release": {"any": {"keep_best_cp": 2}}```, ```"release": {"any": {"keep_best_cp": 10}}``` - can be any number.
 
+### Keep the best custom pokemon configuration (dev branch)
+
+Define a list of criteria to keep the best Pokemons according to those criteria. 
+
+The list of criteria is the following:```'cp','iv', 'iv_attack', 'iv_defense', 'iv_stamina', 'moveset.attack_perfection', 'moveset.defense_perfection', 'hp', 'hp_max'```
+
+####Examples:
+
+- Keep the top 25 Zubat with the best hp_max:
+
+```"release": {"Zubat": {"keep_best_custom": "hp_max", "amount":25}}```
+- Keep the top 10 Zubat with the best hp_max and, if there are Zubat with the same hp_max, to keep the one with the highest hp:
+
+```"release": {"Zubat": {"keep_best_custom": "hp_max,hp", "amount":10}}````
+
 ## Evolve All Configuration
 
 By setting the `evolve_all` attribute in config.json, you can instruct the bot to automatically

diff --git a/pokemongo_bot/cell_workers/transfer_pokemon.py b/pokemongo_bot/cell_workers/transfer_pokemon.py
@@ -4,8 +4,7 @@
 from pokemongo_bot import inventory
 from pokemongo_bot.human_behaviour import action_delay
 from pokemongo_bot.base_task import BaseTask
-from pokemongo_bot.inventory import Pokemons, Pokemon
-
+from pokemongo_bot.inventory import Pokemons, Pokemon, Attack
 
 class TransferPokemon(BaseTask):
     SUPPORTED_TASK_API_VERSION = 1
@@ -19,10 +18,13 @@ def work(self):
         for pokemon_id, group in pokemon_groups.iteritems():
             pokemon_name = Pokemons.name_for(pokemon_id)
             keep_best, keep_best_cp, keep_best_iv = self._validate_keep_best_config(pokemon_name)
-
+            #TODO continue list possible criteria
+            keep_best_possible_criteria = ['cp','iv', 'iv_attack', 'iv_defense', 'iv_stamina', 'moveset.attack_perfection','moveset.defense_perfection','hp','hp_max']
+            keep_best_custom, keep_best_criteria, keep_amount = self._validate_keep_best_config_custom(pokemon_name, keep_best_possible_criteria)
+
+            best_pokemon_ids = set()
+            order_criteria = 'none'
             if keep_best:
-                best_pokemon_ids = set()
-                order_criteria = 'none'
                 if keep_best_cp >= 1:
                     cp_limit = keep_best_cp
                     best_cp_pokemons = sorted(group, key=lambda x: (x.cp, x.iv), reverse=True)[:cp_limit]
@@ -36,8 +38,14 @@ def work(self):
                     if order_criteria == 'cp':
                         order_criteria = 'cp and iv'
                     else:
-                        order_criteria = 'iv'
-
+                        order_criteria = 'iv'      
+            elif keep_best_custom:
+                limit = keep_amount
+                best_pokemons = sorted(group, key=lambda x: keep_best_criteria, reverse=True)[:limit]
+                best_pokemon_ids = set(pokemon.id for pokemon in best_pokemons)
+                order_criteria = ' and '.join(keep_best_criteria)
+
+            if keep_best or keep_best_custom:
                 # remove best pokemons from all pokemons array
                 all_pokemons = group
                 best_pokemons = []
@@ -76,7 +84,7 @@ def _release_pokemon_get_groups(self):
                 continue
 
             group_id = pokemon.pokemon_id
-
+            
             if group_id not in pokemon_groups:
                 pokemon_groups[group_id] = []
 
@@ -178,14 +186,40 @@ def _get_release_config_for(self, pokemon):
             release_config = {}
         return release_config
 
+    def _validate_keep_best_config_custom(self, pokemon_name, keep_best_possible_custom):
+        keep_best = False
+
+        release_config = self._get_release_config_for(pokemon_name)    
+        keep_best_custom = release_config.get('keep_best_custom', '')
+        keep_amount = release_config.get('amount', 0)
+
+        if keep_best_custom and keep_amount:
+            keep_best = True
+
+            keep_best_custom = keep_best_custom.split(',')
+            for _str in keep_best_custom:
+                if _str not in keep_best_possible_custom:
+                    keep_best = False
+                    break
+
+            try:
+                keep_amount = int(keep_amount)
+            except ValueError:
+                keep_best = False
+
+            if keep_amount < 0:
+                keep_best = False
+
+        return keep_best, keep_best_custom, keep_amount
+
     def _validate_keep_best_config(self, pokemon_name):
         keep_best = False
 
         release_config = self._get_release_config_for(pokemon_name)
 
         keep_best_cp = release_config.get('keep_best_cp', 0)
         keep_best_iv = release_config.get('keep_best_iv', 0)
-
+        
         if keep_best_cp or keep_best_iv:
             keep_best = True
             try:
@@ -197,7 +231,7 @@ def _validate_keep_best_config(self, pokemon_name):
                 keep_best_iv = int(keep_best_iv)
             except ValueError:
                 keep_best_iv = 0
-
+                
             if keep_best_cp < 0 or keep_best_iv < 0:
                 keep_best = False