Hotfix for inventory and pokemon optimizer (#4258)

* Hotfix for inventory and pokemon optimizer

* Better code

pokemongo_bot/cell_workers/pokemon_optimizer.py

@@ -290,10 +290,7 @@ def transfer_pokemon(self, pokemon):
         return True
 
     def get_candy_gained_count(self, response_dict):
-        total_candy_gained = 0
-        for candy_gained in response_dict['responses']['CATCH_POKEMON']['capture_award']['candy']:
-            total_candy_gained += candy_gained
-        return total_candy_gained
+        return response_dict['responses']['RELEASE_POKEMON']['candy_awarded']
 
     def use_lucky_egg(self):
         lucky_egg = inventory.items().get(Item.ITEM_LUCKY_EGG.value)  # @UndefinedVariable

pokemongo_bot/inventory.py

@@ -266,7 +266,7 @@ def get_space_used(cls):
         :return: The space used in pokemon inventory.
         :rtype: int
         """
-        return len(_inventory.pokemons.all())
+        return len(_inventory.pokemons.all_with_eggs())
 
     @classmethod
     def get_space_left(cls):
@@ -322,6 +322,10 @@ def all(self):
         # makes caller's lives more difficult)
         return [p for p in super(Pokemons, self).all() if not isinstance(p, Egg)]
 
+    def all_with_eggs(self):
+        # count pokemon AND eggs, since eggs are counted as bag space
+        return super(Pokemons, self).all()
+
     def add(self, pokemon):
         if pokemon.unique_id <= 0:
             raise ValueError("Can't add a pokemon without id")