To fix the exception.

MFizz · Jul 29, 2016 · e8c3a22 · e8c3a22
1 parent 3201820
commit e8c3a22
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/pokemongo_bot/cell_workers/pokemon_catch_worker.py b/pokemongo_bot/cell_workers/pokemon_catch_worker.py
@@ -50,11 +50,11 @@ def work(self):
                             if 'pokemon_data' in pokemon and 'cp' in pokemon['pokemon_data']:
                                 cp = pokemon['pokemon_data']['cp']
                                 iv_stats = ['individual_attack', 'individual_defense', 'individual_stamina']
-                                iv_display = '{}/{}/{}'.format(
-                                    pokemon['pokemon_data']['individual_stamina'],
-                                    pokemon['pokemon_data']['individual_attack'],
-                                    pokemon['pokemon_data']['individual_defense']
-                                )
+                                #iv_display = '{}/{}/{}'.format(
+                                #    pokemon['pokemon_data']['individual_stamina'],
+                                #    pokemon['pokemon_data']['individual_attack'],
+                                #    pokemon['pokemon_data']['individual_defense']
+                                #)
 
                                 for individual_stat in iv_stats:
                                     try:
@@ -71,63 +71,63 @@ def work(self):
                                 logger.log('A Wild {} appeared! [CP {}] [Potential {}]'.format(
                                     pokemon_name, cp, pokemon_potential), 'yellow')
 
-                                logger.log('IV [Stamina/Attack/Defense] = [{}]'.format(iv_display))
+                                #logger.log('IV [Stamina/Attack/Defense] = [{}]'.format(iv_display))
                                 pokemon['pokemon_data']['name'] = pokemon_name
                                 # Simulate app
                                 sleep(3)
 
                         if not self.should_capture_pokemon(pokemon_name, cp, pokemon_potential, response_dict):
                             #logger.log('[x] Rule prevents capture.')
                             return False
-                        
+
                         balls_stock = self.bot.pokeball_inventory()
                         while(True):
-                            
+
                             ## pick the most simple ball from stock
                             pokeball = 1 # start from 1 - PokeBalls
-                            
+
                             current_type = pokeball
                             while(balls_stock[current_type] is 0 and current_type < 3): # if this type's stock = 0 and not top tier yet
                                 current_type = current_type + 1 # progress to next tier
                                 if balls_stock[current_type] > 0: # next tier's stock > 0
                                     pokeball = current_type
-                            
+
                             ## re-check stock again
                             if balls_stock[pokeball] is 0:
                                 logger.log('Out of pokeballs, switching to farming mode...', 'red')
                                 # Begin searching for pokestops.
                                 self.config.mode = 'farm'
                                 return PokemonCatchWorker.NO_POKEBALLS
-                                
+
                             ## Use berry to increase success chance.
                             berry_id = 701 # @ TODO: use better berries if possible
                             berries_count = self.bot.item_inventory_count(berry_id)
                             if(catch_rate[pokeball-1] < 0.5 and berries_count > 0): # and berry is in stock
                                 success_percentage = '{0:.2f}'.format(catch_rate[pokeball-1]*100)
                                 logger.log('Catch Rate with normal Pokeball is low ({}%). Throwing {}... ({} left!)'.format(success_percentage,self.item_list[str(berry_id)],berries_count-1))
-                                
+
                                 if balls_stock[pokeball] is 0:
                                     break
-                                
+
                                 self.api.use_item_capture(
-                                    item_id=berry_id, 
-                                    encounter_id = encounter_id, 
+                                    item_id=berry_id,
+                                    encounter_id = encounter_id,
                                     spawn_point_guid = spawnpoint_id
                                 )
                                 response_dict = self.api.call()
                                 if response_dict and response_dict['status_code'] is 1 and 'item_capture_mult' in response_dict['responses']['USE_ITEM_CAPTURE']:
-                                
+
                                     for i in range(len(catch_rate)):
                                         catch_rate[i] = catch_rate[i] * response_dict['responses']['USE_ITEM_CAPTURE']['item_capture_mult']
-                                        
+
                                     success_percentage = '{0:.2f}'.format(catch_rate[pokeball-1]*100)
                                     logger.log('Catch Rate with normal Pokeball has increased to {}%'.format(success_percentage))
                                 else:
                                     if response_dict['status_code'] is 1:
                                         logger.log('Fail to use berry. Seem like you are softbanned.','red')
                                     else:
                                         logger.log('Fail to use berry. Status Code: {}'.format(response_dict['status_code']),'red')
-                            
+
                             ## change ball to next tier if catch rate is too low
                             current_type = pokeball
                             while(current_type < 3):
@@ -137,12 +137,12 @@ def work(self):
                                     pokeball = current_type # use better ball
 
                             # @TODO, use the best ball in stock to catch VIP (Very Important Pokemon: Configurable)
-                            
+
                             balls_stock[pokeball] = balls_stock[pokeball] - 1
                             success_percentage = '{0:.2f}'.format(catch_rate[pokeball-1]*100)
                             logger.log('Using {} (chance: {}%)... ({} left!)'.format(
-                                self.item_list[str(pokeball)], 
-                                success_percentage, 
+                                self.item_list[str(pokeball)],
+                                success_percentage,
                                 balls_stock[pokeball]
                             ))
 
@@ -171,15 +171,15 @@ def work(self):
                                     logger.log(
                                         'Oh no! {} vanished! :('.format(pokemon_name), 'red')
                                 if status is 1:
-                                    
+
                                     id_list2 = self.count_pokemon_inventory()
-                                    
+
                                     logger.log('Captured {}! [CP {}] [{}]'.format(
-                                        pokemon_name, 
+                                        pokemon_name,
                                         cp,
                                         iv_display
                                     ), 'blue')
-                                        
+
                                     if self.config.evolve_captured:
                                         pokemon_to_transfer = list(Set(id_list2) - Set(id_list1))
                                         self.api.evolve_pokemon(pokemon_id=pokemon_to_transfer[0])
@@ -276,7 +276,7 @@ def should_capture_pokemon(self, pokemon_name, cp, iv, response_dict):
             'cp': False,
             'iv': False,
         }
-        
+
         if catch_config.get('never_catch', False):
             return False
 
@@ -323,7 +323,7 @@ def should_release_pokemon(self, pokemon_name, cp, iv, response_dict):
             'cp': False,
             'iv': False,
         }
-        
+
         if release_config.get('never_release', False):
             return False