Skip to content

Commit

Permalink
Upgrade the capture logic for VIP pokemons! (#1807)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xc-mezcal @solderzzc
xc-mezcal authored and solderzzc committed Jul 30, 2016
1 parent 190640f commit 673849d
Show file tree
Hide file tree
Showing 4 changed files with 192 additions and 69 deletions.
25 changes: 24 additions & 1 deletion configs/config.json.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,28 @@
"// any": {"keep_best_iv": 3},
"// Example of keeping the 2 strongest (based on CP) and 3 best (based on IV) Zubat:": {},
"// Zubat": {"keep_best_cp": 2, "keep_best_iv": 3}
}
},
"vips" : {
"Any pokemon put here directly force to use Berry & Best Ball to capture, to secure the capture rate!": {},
"any": {"catch_above_cp": 1200, "catch_above_iv": 0.9, "logic": "or" },

This comment has been minimized.

Sign in to view

Copy link
@DimaVIII

DimaVIII Jul 30, 2016

Is it possible to use here keep_best? Like:
"any": {"keep_best_cp": 2, "keep_best_iv": 3},

This comment has been minimized.

Sign in to view

Copy link
@douglascamata

douglascamata Jul 30, 2016

Member

@DimaVIII these are release configurations, not catch.

This comment has been minimized.

Sign in to view

Copy link
@DimaVIII

DimaVIII Jul 30, 2016 •
edited
Loading

@xc-mezcal Just test it, the any line here makes every pokemon to VIP.
You need to remove this any from here.
[19:56:05] [-] Weedle is a VIP Pokemon! [CP 172] [Potential 0.2] Nice! Try our best to catch it!

This comment has been minimized.

Sign in to view

Copy link
@DimaVIII

DimaVIII Jul 30, 2016 •
edited
Loading

The first comment can be ignored...
@douglascamata I mean the line 63: "any": {"catch_above_cp": 1200, "catch_above_iv": 0.9, "logic": "or" },
It's wrong here it makes all pokemons to VIP.

This comment has been minimized.

Sign in to view

Copy link
@xc-mezcal

xc-mezcal via email Jul 31, 2016

Author Contributor

This comment has been minimized.

Sign in to view

Copy link
@DimaVIII

DimaVIII Jul 31, 2016

Ahh OK got it, sorry.
"Lapras": {},
"Moltres": {},
"Zapdos": {},
"Articuno": {},

"// S-Tier pokemons (if pokemon can be evolved into tier, list the representative)": {},
"Mewtwo": {},
"Dragonite": {},
"Snorlax": {},
"// Mew evolves to Mewtwo": {},
"Mew": {},
"Arcanine": {},
"Vaporeon": {},
"Gyarados": {},
"Exeggutor": {},
"Muk": {},
"Weezing": {},
"Flareon": {}

}
}
25 changes: 24 additions & 1 deletion configs/config.json.pokemon.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,5 +285,28 @@
"Raichu": { "release_below_cp": 708, "release_below_iv": 0.8, "logic": "and" },
"Cloyster": { "release_below_cp": 717, "release_below_iv": 0.8, "logic": "and"},
"Mr. Mime": { "release_below_cp": 650, "release_below_iv": 0.8, "logic": "and" }
}
},
"vips" : {
"Any pokemon put here directly force to use Berry & Best Ball to capture, to secure the capture rate!": {},
"any": {"catch_above_cp": 1200, "catch_above_iv": 0.9, "logic": "or" },
"Lapras": {},
"Moltres": {},
"Zapdos": {},
"Articuno": {},

"// S-Tier pokemons (if pokemon can be evolved into tier, list the representative)": {},
"Mewtwo": {},
"Dragonite": {},
"Snorlax": {},
"// Mew evolves to Mewtwo": {},
"Mew": {},
"Arcanine": {},
"Vaporeon": {},
"Gyarados": {},
"Exeggutor": {},
"Muk": {},
"Weezing": {},
"Flareon": {}

}
}
2 changes: 2 additions & 0 deletions pokecli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,8 @@ def init_config():

config.hatch_eggs = load.get("hatch_eggs", True)
config.longer_eggs_first = load.get("longer_eggs_first", True)

config.vips = load.get('vips',{})

if config.auth_service not in ['ptc', 'google']:
logging.error("Invalid Auth service specified! ('ptc' or 'google')")
Expand Down
209 changes: 142 additions & 67 deletions pokemongo_bot/cell_workers/pokemon_catch_worker.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,79 +76,128 @@ def work(self):
# logger.log('[x] Rule prevents capture.')
return False

flag_VIP = False
# @TODO, use the best ball in stock to catch VIP (Very Important Pokemon: Configurable)
if self.check_vip_pokemon(pokemon_name, cp, pokemon_potential):
logger.log('[-] {} is a VIP Pokemon! [CP {}] [Potential {}] Nice! Try our best to catch it!'.format(pokemon_name, cp, pokemon_potential),'red')
flag_VIP=True

items_stock = self.bot.current_inventory()
berry_id = 701 # @ TODO: use better berries if possible
berries_count = self.bot.item_inventory_count(berry_id)
while True:
# pick the most simple ball from stock
pokeball = 1 # start from 1 - PokeBalls

current_type = pokeball
# if this type's stock = 0 and not top tier yet
while items_stock[current_type] is 0 and current_type < 3:
# progress to next tier
current_type += 1
# next tier's stock > 0
if items_stock[current_type] > 0:
pokeball = current_type

# re-check stock again
if items_stock[pokeball] is 0:
logger.log('Out of pokeballs', 'red')
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 items_stock[pokeball] is 0:
break

self.api.use_item_capture(
item_id=berry_id,
encounter_id=encounter_id,
spawn_point_id=self.spawn_point_guid
)
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)):
if 'item_capture_mult' in response_dict['responses']['USE_ITEM_CAPTURE']:
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))
berry_used = False

if flag_VIP:
if(berries_count>0):
success_percentage = '{0:.2f}'.format(catch_rate[pokeball-1]*100)
logger.log('Catch Rate with normal Pokeball is low ({}%). Thinking to throw a {}... ({} left!)'.format(success_percentage,self.item_list[str(berry_id)],berries_count-1))
# Out of all pokeballs! Let's don't waste berry.
if items_stock[1] == 0 and items_stock[2] == 0 and items_stock[3] == 0:
break

# Use the berry to catch
self.api.use_item_capture(item_id = berry_id,encounter_id = encounter_id,spawn_point_id = self.spawn_point_guid)
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)):
if 'item_capture_mult' in response_dict['responses']['USE_ITEM_CAPTURE']:
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)
berries_count = berries_count -1
berry_used = True
logger.log('Threw a berry! 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')

#use the best ball to catch
current_type = pokeball
#debug use normal ball
while current_type < 3:
current_type += 1
if catch_rate[pokeball-1] < 0.9 and items_stock[current_type] > 0:
# if current ball chance to catch is under 90%, and player has better ball - then use it
pokeball = current_type # use better ball
else:
# If we have a lot of berries (than the great ball), we prefer use a berry first!
if catch_rate[pokeball-1] < 0.42 and items_stock[pokeball+1]+30 < berries_count:
# If it's not the VIP type, we don't want to waste our ultra ball if no balls left.
if items_stock[1] == 0 and items_stock[2] == 0:
break

success_percentage = '{0:.2f}'.format(catch_rate[pokeball-1]*100)
logger.log('Catch Rate with normal Pokeball is low ({}%). Thinking to throw a {}... ({} left!)'.format(success_percentage,self.item_list[str(berry_id)],berries_count-1))
self.api.use_item_capture(item_id = berry_id,encounter_id = encounter_id,spawn_point_id = self.spawn_point_guid)
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)):
if 'item_capture_mult' in response_dict['responses']['USE_ITEM_CAPTURE']:
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)
berries_count = berries_count -1
berry_used = True
logger.log('Threw a berry! 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')

else:
if response_dict['status_code'] is 1:
logger.log('Fail to use berry. Seem like you are softbanned.', 'red')
self.bot.softban = True
#We don't have many berry to waste, pick a good ball first. Save some berry for future VIP pokemon
current_type = pokeball
while current_type < 2:
current_type += 1
if catch_rate[pokeball-1] < 0.35 and items_stock[current_type] > 0:
# if current ball chance to catch is under 35%, and player has better ball - then use it
pokeball = current_type # use better ball

#if the rate is still low and we didn't throw a berry before use berry
if catch_rate[pokeball-1] < 0.35 and berries_count > 0 and berry_used == False:
# If it's not the VIP type, we don't want to waste our ultra ball if no balls left.
if items_stock[1] == 0 and items_stock[2] == 0:
break

success_percentage = '{0:.2f}'.format(catch_rate[pokeball-1]*100)
logger.log('Catch Rate with normal Pokeball is low ({}%). Thinking to throw a {}... ({} left!)'.format(success_percentage,self.item_list[str(berry_id)],berries_count-1))
self.api.use_item_capture(item_id = berry_id,encounter_id = encounter_id,spawn_point_id = self.spawn_point_guid)
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)):
if 'item_capture_mult' in response_dict['responses']['USE_ITEM_CAPTURE']:
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)
berries_count = berries_count -1
berry_used = True
logger.log('Threw a berry! Catch Rate with normal Pokeball has increased to {}%'.format(success_percentage))
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:
current_type += 1
if catch_rate[pokeball - 1] < 0.35 and items_stock[current_type] > 0:
# if current ball chance to catch is under 35%,
# and player has better ball - then use it
pokeball = current_type # use better ball

# @TODO, use the best ball in stock to catch VIP (Very Important Pokemon: Configurable)

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')

# Re-check if berry is used, find a ball for a good capture rate
current_type=pokeball
while current_type < 2:
current_type += 1
if catch_rate[pokeball-1] < 0.35 and items_stock[current_type] > 0:
pokeball = current_type # use better ball

# This is to avoid rare case that a berry has ben throwed <0.42
# and still picking normal pokeball (out of stock) -> error
if items_stock[1] == 0 and items_stock[2] > 0:
pokeball = 2

# Add this logic to avoid Pokeball = 0, Great Ball = 0, Ultra Ball = X
# And this logic saves Ultra Balls if it's a weak trash pokemon
if catch_rate[pokeball-1]<0.30 and item_stock[3]>0:

This comment has been minimized.

Sign in to view

Copy link
@josegrobles

josegrobles Jul 30, 2016

if catch_rate[pokeball-1]<0.30 and items_stock[3]>0:
pokeball = 3

items_stock[pokeball] -= 1
success_percentage = '{0:.2f}'.format(catch_rate[pokeball - 1] * 100)
logger.log('Using {} (chance: {}%)... ({} left!)'.format(
Expand Down Expand Up @@ -333,3 +382,29 @@ def create_encounter_api_call(self):
player_latitude=player_latitude, player_longitude=player_longitude)

return self.api.call()

def check_vip_pokemon(self,pokemon, cp, iv):

vip_name = self.config.vips.get(pokemon)
if vip_name == {}:
return True
else:
catch_config = self.config.vips.get("any")
cp_iv_logic = catch_config.get('logic', 'or')
catch_results = {
'cp': False,
'iv': False,
}

catch_cp = catch_config.get('catch_above_cp', 0)
if cp > catch_cp:
catch_results['cp'] = True
catch_iv = catch_config.get('catch_above_iv', 0)
if iv > catch_iv:
catch_results['iv'] = True
logic_to_function = {
'or': lambda x, y: x or y,
'and': lambda x, y: x and y
}
return logic_to_function[cp_iv_logic](*catch_results.values())

2 comments on commit 673849d

@z1lver
Copy link

@z1lver z1lver commented on 673849d Jul 30, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line 198: item_stock should be items_stock I think (pokemon_catch_worker.py)

@xc-mezcal
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@z1lver Yes, Thanks for fixing it

Please sign in to comment.