First basic features of the pokemon optimizer

.gitignore

@@ -119,6 +119,7 @@ configs/*
 !configs/config.json.map.example
 !configs/path.example.json
 !config.json.cluster.example
+!config.json.optimizer.example
 
 # Virtualenv folders
 bin/

configs/config.json.optimizer.example

@@ -0,0 +1,105 @@
+{
+    "auth_service": "google",
+    "username": "YOUR_USERNAME",
+    "password": "YOUR_PASSWORD",
+    "location": "SOME_LOCATION",
+    "gmapkey": "GOOGLE_MAPS_API_KEY",
+    "tasks": [
+        {
+            "type": "HandleSoftBan"
+        },
+        {
+            "type": "CollectLevelUpReward"
+        },
+        {
+            "type": "IncubateEggs",
+            "config": {
+                "longer_eggs_first": true
+            }
+        },
+        {
+            "type": "PokemonOptimizer",
+            "config": {
+                "transfer": true,
+                "evolve": true,
+                "use_lucky_egg": true,
+                "evolve_only_with_lucky_egg": true,
+                "minimum_evolve_for_lucky_egg": 90,
+                "keep": [
+                    {
+                        "top": 1,
+                        "evolve": true,
+                        "// Available sorting keys are:": true,
+                        "// iv, cp, ncp, ivcp, max_cp, iv_attack, iv_defense, iv_stamina, hp_max, level": true,
+                        "sort": ["iv"]
+                    },
+                    {
+                        "top": 1,
+                        "evolve": true,
+                        "sort": ["ncp"]
+                    },
+                    {
+                        "top": 1,
+                        "evolve": false,
+                        "sort": ["cp"]
+                    }
+                ]
+            }
+        },
+        {
+            "type": "RecycleItems",
+            "config": {
+                "min_empty_space": 15,
+                "item_filter": {
+                    "Pokeball": { "keep": 100 },
+                    "Potion": { "keep": 10 },
+                    "Super Potion": { "keep": 20 },
+                    "Hyper Potion": { "keep": 30 },
+                    "Revive": { "keep": 30 },
+                    "Razz Berry": { "keep": 100 }
+                }
+            }
+        },
+        {
+            "type": "CatchVisiblePokemon"
+        },
+        {
+            "type": "CatchLuredPokemon"
+        },
+        {
+            "type": "SpinFort",
+            "config": {
+                "ignore_item_count": true
+            }
+        },
+        {
+            "type": "MoveToFort",
+            "config": {
+                "lure_attraction": false,
+                "lure_max_distance": 2000,
+                "ignore_item_count": true
+            }
+        }
+    ],
+    "map_object_cache_time": 5,
+    "forts": {
+        "avoid_circles": true,
+        "max_circle_size": 50
+    },
+    "websocket_server": true,
+    "walk": 4.16,
+    "action_wait_min": 1,
+    "action_wait_max": 4,
+    "debug": false,
+    "test": false,
+    "health_record": false,
+    "location_cache": true,
+    "distance_unit": "km",
+    "reconnecting_timeout": 15,
+    "logging_color": true,
+    "catch": {
+        "any": {
+            "always_catch": true
+        }
+    }
+}

pokemongo_bot/__init__.py

@@ -299,7 +299,7 @@ def _register_events(self):
         )
         self.event_manager.register_event(
             'pokemon_evolved',
-            parameters=('pokemon', 'iv', 'cp')
+            parameters=('pokemon', 'iv', 'cp', 'xp')
         )
         self.event_manager.register_event('skip_evolve')
         self.event_manager.register_event('threw_berry_failed', parameters=('status_code',))

pokemongo_bot/cell_workers/__init__.py

@@ -8,6 +8,7 @@
 from move_to_map_pokemon import MoveToMapPokemon
 from nickname_pokemon import NicknamePokemon
 from pokemon_catch_worker import PokemonCatchWorker
+from pokemon_optimizer import PokemonOptimizer
 from transfer_pokemon import TransferPokemon
 from recycle_items import RecycleItems
 from spin_fort import SpinFort

pokemongo_bot/cell_workers/evolve_pokemon.py

@@ -106,7 +106,8 @@ def _execute_pokemon_evolve(self, pokemon, cache):
                 data={
                     'pokemon': pokemon.name,
                     'iv': pokemon.iv,
-                    'cp': pokemon.cp
+                    'cp': pokemon.cp,
+                    'xp': 0
                 }
             )
             inventory.candies().get(pokemon.pokemon_id).consume(pokemon.evolution_cost)

pokemongo_bot/cell_workers/pokemon_catch_worker.py

@@ -387,8 +387,7 @@ def _do_catch(self, pokemon, encounter_id, catch_rate_by_ball, is_vip=False):
                 )
 
                 # We could refresh here too, but adding 3 saves a inventory request
-                candy = inventory.candies().get(pokemon.num)
-                candy.add(3)
+                candy = inventory.candies(True).get(pokemon.num)
                 self.emit_event(
                     'gained_candy',
                     formatted='You now have {quantity} {type} candy!',