Merge pull request #6080 from MerlionRock/dev

Updated Character Information
PokemonGoF · Jul 12, 2017 · dca389b · dca389b
2 parents 61825dc + 0d90963
commit dca389b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py
@@ -1248,41 +1248,50 @@ def _print_character_info(self):
         # Items Output
         self.logger.info(
             'PokeBalls: ' + str(items_inventory.get(1).count) +
-            ' | GreatBalls: ' + str(items_inventory.get(2).count) +
-            ' | UltraBalls: ' + str(items_inventory.get(3).count) +
-            ' | MasterBalls: ' + str(items_inventory.get(4).count))
+            ' | Great Balls: ' + str(items_inventory.get(2).count) +
+            ' | Ultra Balls: ' + str(items_inventory.get(3).count) +
+            ' | Master Balls: ' + str(items_inventory.get(4).count))
 
         self.logger.info(
             'RazzBerries: ' + str(items_inventory.get(701).count) +
             ' | Nanab Berries: ' + str(items_inventory.get(703).count) +
-            ' | Pinap Berries: ' + str(items_inventory.get(705).count))
+            ' | Pinap Berries: ' + str(items_inventory.get(705).count) +
+            ' | Golden RazzBerries: ' + str(items_inventory.get(706).count) +
+            ' | Golden Nanab Berries: ' + str(items_inventory.get(707).count) +
+            ' | Golden Pinap Berries: ' + str(items_inventory.get(708).count))
 
         self.logger.info(
             'LuckyEgg: ' + str(items_inventory.get(301).count) +
-            ' | Incubator: ' + str(items_inventory.get(902).count) +
-            ' | TroyDisk: ' + str(items_inventory.get(501).count))
+            ' | Incubator: ' + str(items_inventory.get(902).count))
 
         self.logger.info(
             'Potion: ' + str(items_inventory.get(101).count) +
-            ' | SuperPotion: ' + str(items_inventory.get(102).count) +
-            ' | HyperPotion: ' + str(items_inventory.get(103).count) +
-            ' | MaxPotion: ' + str(items_inventory.get(104).count))
+            ' | Super Potion: ' + str(items_inventory.get(102).count) +
+            ' | Hyper Potion: ' + str(items_inventory.get(103).count) +
+            ' | Max Potion: ' + str(items_inventory.get(104).count))
 
         self.logger.info(
             'Incense: ' + str(items_inventory.get(401).count) +
-            ' | IncenseSpicy: ' + str(items_inventory.get(402).count) +
-            ' | IncenseCool: ' + str(items_inventory.get(403).count))
+            ' | Lure Module: ' + str(items_inventory.get(501).count))
 
         self.logger.info(
             'Revive: ' + str(items_inventory.get(201).count) +
-            ' | MaxRevive: ' + str(items_inventory.get(202).count))
+            ' | Max Revive: ' + str(items_inventory.get(202).count))
 
         self.logger.info(
             'Sun Stone: ' + str(items_inventory.get(1101).count) +
             ' | Kings Rock: ' + str(items_inventory.get(1102).count) +
             ' | Metal Coat: ' + str(items_inventory.get(1103).count) +
             ' | Dragon Scale: ' + str(items_inventory.get(1104).count) +
             ' | Upgrade: ' + str(items_inventory.get(1105).count))
+
+        self.logger.info(
+            'Fast TM: ' + str(items_inventory.get(1201).count) +
+            ' | Charge TM: ' + str(items_inventory.get(1202).count) +
+            ' | Rare Candy: ' + str(items_inventory.get(1301).count) +
+            ' | Free Raid Pass: ' + str(items_inventory.get(1401).count) +
+            ' | Premium Raid Pass: ' + str(items_inventory.get(1402).count) +
+            ' | Legendary Raid Pass: ' + str(items_inventory.get(1403).count))
 
         if warn:
             self.logger.info('')

diff --git a/pokemongo_bot/item_list.py b/pokemongo_bot/item_list.py
@@ -7,6 +7,7 @@ class Item(Enum):
     ITEM_GREAT_BALL = 2
     ITEM_ULTRA_BALL = 3
     ITEM_MASTER_BALL = 4
+    ITEM_PREMIER_BALL = 5
     ITEM_POTION = 101
     ITEM_SUPER_POTION = 102
     ITEM_HYPER_POTION = 103
@@ -27,8 +28,22 @@ class Item(Enum):
     ITEM_NANAB_BERRY = 703
     ITEM_WEPAR_BERRY = 704
     ITEM_PINAP_BERRY = 705
+    ITEM_GOLDEN_RAZZ_BERRY = 706
+    ITEM_GOLDEN_NANAB_BERRY = 707
+    ITEM_GOLDEN_PINAP_BERRY = 708
     ITEM_SPECIAL_CAMERA = 801
     ITEM_INCUBATOR_BASIC_UNLIMITED = 901
     ITEM_INCUBATOR_BASIC = 902
     ITEM_POKEMON_STORAGE_UPGRADE = 1001
     ITEM_ITEM_STORAGE_UPGRADE = 1002
+    ITEM_SUN_STONE = 1101
+    ITEM_KINGS_ROCK = 1102
+    ITEM_METAL_COAT = 1103
+    ITEM_DRAGON_SCALE = 1104
+    ITEM_UP_GRADE = 1105
+    ITEM_MOVE_REROLL_FAST_ATTACK = 1201
+    ITEM_MOVE_REROLL_SPECIAL_ATTACK = 1202
+    ITEM_RARE_CANDY = 1301
+    ITEM_FREE_RAID_TICKET = 1401
+    ITEM_PAID_RAID_TICKET = 1402
+    ITEM_LEGENDARY_RAID_TICKET = 1403