Added PokemonBag to UpdateLiveInventory (#4360)

* Added PokemonBag to UpdateLiveInventory * Added documentation
PokemonGoF · Aug 20, 2016 · 48cb861 · 48cb861
1 parent 0f0c87e
commit 48cb861
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
@@ -54,7 +54,7 @@
           "enabled": false,
           "min_interval": 120,
           "show_all_multiple_lines": false,
-          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
         }
       },
       {

diff --git a/configs/config.json.example b/configs/config.json.example
@@ -64,7 +64,7 @@
           "enabled": false,
           "min_interval": 120,
           "show_all_multiple_lines": false,
-          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
         }
       },
       {

diff --git a/configs/config.json.map.example b/configs/config.json.map.example
@@ -54,7 +54,7 @@
           "enabled": false,
           "min_interval": 120,
           "show_all_multiple_lines": false,
-          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
         }
       },
       {

diff --git a/configs/config.json.optimizer.example b/configs/config.json.optimizer.example
@@ -54,7 +54,7 @@
                 "enabled": false,
                 "min_interval": 120,
                 "show_all_multiple_lines": false,
-                "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+                "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
             }
         },
         {

diff --git a/configs/config.json.path.example b/configs/config.json.path.example
@@ -54,7 +54,7 @@
           "enabled": false,
           "min_interval": 120,
           "show_all_multiple_lines": false,
-          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
         }
       },
       {

diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
@@ -54,7 +54,7 @@
           "enabled": false,
           "min_interval": 120,
           "show_all_multiple_lines": false,
-          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+          "items": ["pokemon_bag", "space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
         }
       },
       {

diff --git a/pokemongo_bot/cell_workers/update_live_inventory.py b/pokemongo_bot/cell_workers/update_live_inventory.py
@@ -32,6 +32,7 @@ class UpdateLiveInventory(BaseTask):
             see available items below (defaults to []).
 
     Available items :
+		'pokemon_bag' : pokemon in inventory (i.e. 'Pokemon Bag: 100/250')
         'space_info': not an item but shows inventory bag space (i.e. 'Items: 140/350')
         'pokeballs'
         'greatballs'
@@ -148,6 +149,7 @@ def get_inventory_line(self, is_debug=False):
         :rtype: string
         """
         available_items = {
+			'pokemon_bag': 'Pokemon: {:,}/{:,}'.format(inventory.Pokemons.get_space_used(), inventory.get_pokemon_inventory_size()),
             'space_info': 'Items: {:,}/{:,}'.format(self.inventory.get_space_used(),
                                                     self.inventory.get_space_used() + self.inventory.get_space_left()),
             'pokeballs': 'Pokeballs: {:,}'.format(self.inventory.get(1).count),
@@ -201,6 +203,13 @@ def print_all(self):
         :return: Nothing.
         :rtype: None
         """
+        self.logger.info(
+            'Pokemon Bag: {}/{}'.format(
+                inventory.Pokemons.get_space_used(),
+                inventory.get_pokemon_inventory_size()
+            )
+        )
+
         self.logger.info(
             'Items: {}/{}'.format(
                 self.inventory.get_space_used(),