Skip to content

Commit

Permalink
Added nickname worker (#1850)
Browse files Browse the repository at this point in the history
  • Loading branch information
reddivision authored and TheSavior committed Aug 1, 2016
1 parent 89b112c commit b35260d
Show file tree
Hide file tree
Showing 8 changed files with 120 additions and 11 deletions.
6 changes: 6 additions & 0 deletions configs/config.json.cluster.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
{
"type": "CollectLevelUpReward"
},
{
"type": "NicknamePokemon",
"config": {
"nickname_template": "{iv_pct}_{iv_ads}"
}
},
{
"type": "IncubateEggs",
"config": {
Expand Down
6 changes: 6 additions & 0 deletions configs/config.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
{
"type": "CollectLevelUpReward"
},
{
"type": "NicknamePokemon",
"config": {
"nickname_template": "{iv_pct}_{iv_ads}"
}
},
{
"type": "IncubateEggs",
"config": {
Expand Down
6 changes: 6 additions & 0 deletions configs/config.json.path.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
{
"type": "CollectLevelUpReward"
},
{
"type": "NicknamePokemon",
"config": {
"nickname_template": "{iv_pct}_{iv_ads}"
}
},
{
"type": "IncubateEggs",
"config": {
Expand Down
6 changes: 6 additions & 0 deletions configs/config.json.pokemon.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
{
"type": "CollectLevelUpReward"
},
{
"type": "NicknamePokemon",
"config": {
"nickname_template": "{iv_pct}_{iv_ads}"
}
},
{
"type": "IncubateEggs",
"config": {
Expand Down
1 change: 1 addition & 0 deletions pokemongo_bot/cell_workers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from evolve_all import EvolveAll
from incubate_eggs import IncubateEggs
from move_to_fort import MoveToFort
from nickname_pokemon import NicknamePokemon
from pokemon_catch_worker import PokemonCatchWorker
from transfer_pokemon import TransferPokemon
from recycle_items import RecycleItems
Expand Down
10 changes: 4 additions & 6 deletions pokemongo_bot/cell_workers/incubate_eggs.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,13 @@ def _check_inventory(self, lookup_ids=[]):
"used": False
})
elif 'is_egg' not in pokemon and pokemon['id'] in lookup_ids:
matched_pokemon.append({
"pokemon_id": pokemon.get('pokemon_id', -1),
"cp": pokemon.get('cp', 0),
matched_pokemon.append(pokemon.update({
"iv": [
pokemon.get('individual_attack', 0),
pokemon.get('individual_defense', 0),
pokemon.get('individual_stamina', 0)
]
})
}))
continue
if "player_stats" in inv_data:
self.km_walked = inv_data.get("player_stats", {}).get("km_walked", 0)
Expand Down Expand Up @@ -147,7 +145,7 @@ def _hatch_eggs(self):
for pokemon in pokemon_data:
# pokemon ids seem to be offset by one
if pokemon['pokemon_id']!=-1:
pokemon['name'] = self.bot.pokemon_list[(pokemon['pokemon_id']-1)]['Name']
pokemon['name'] = self.bot.pokemon_list[(pokemon.get('pokemon_id')-1)]['Name']
else:
pokemon['name'] = "error"
except:
Expand All @@ -160,7 +158,7 @@ def _hatch_eggs(self):
for i in range(len(pokemon_data)):
logger.log("-"*30,log_color)
logger.log("[!] Pokemon: {}".format(pokemon_data[i]['name']), log_color)
logger.log("[!] CP: {}".format(pokemon_data[i]['cp']), log_color)
logger.log("[!] CP: {}".format(pokemon_data[i].get('cp',0)), log_color)
logger.log("[!] IV: {} ({:.2f})".format("/".join(map(str, pokemon_data[i]['iv'])),(sum(pokemon_data[i]['iv'])/self.max_iv)), log_color)
logger.log("[!] XP: {}".format(xp[i]), log_color)
logger.log("[!] Stardust: {}".format(stardust[i]), log_color)
Expand Down
88 changes: 88 additions & 0 deletions pokemongo_bot/cell_workers/nickname_pokemon.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
from pokemongo_bot import logger
from pokemongo_bot.human_behaviour import sleep
from pokemongo_bot.cell_workers.base_task import BaseTask

class NicknamePokemon(BaseTask):
def initialize(self):
self.template = self.config.get('nickname_template','').lower().strip()
if self.template == "{name}":
self.template = ""

def work(self):
try:
inventory = reduce(dict.__getitem__, ["responses", "GET_INVENTORY", "inventory_delta", "inventory_items"], self.bot.get_inventory())
except KeyError:
pass
else:
pokemon_data = self._get_inventory_pokemon(inventory)
for pokemon in pokemon_data:
self._nickname_pokemon(pokemon)

def _get_inventory_pokemon(self,inventory_dict):
pokemon_data = []
for inv_data in inventory_dict:
try:
pokemon = reduce(dict.__getitem__,['inventory_item_data','pokemon_data'],inv_data)
except KeyError:
pass
else:
if not pokemon.get('is_egg',False):
pokemon_data.append(pokemon)
return pokemon_data

def _nickname_pokemon(self,pokemon):
"""This requies a pokemon object containing all the standard fields: id, ivs, cp, etc"""
new_name = ""
instance_id = pokemon.get('id',0)
if not instance_id:
logger.log("Pokemon instance id returned 0. Can't rename.",'red')
return
id = pokemon.get('pokemon_id',0)-1
name = self.bot.pokemon_list[id]['Name']
cp = pokemon.get('cp',0)
iv_attack = pokemon.get('individual_attack',0)
iv_defense = pokemon.get('individual_defense',0)
iv_stamina = pokemon.get('individual_stamina',0)
iv_list = [iv_attack,iv_defense,iv_stamina]
iv_ads = "/".join(map(str,iv_list))
iv_sum = sum(iv_list)
iv_pct = "{:0.0f}".format(100*iv_sum/45.0)
log_color = 'red'
try:
new_name = self.template.format(name=name,
id=id,
cp=cp,
iv_attack=iv_attack,
iv_defense=iv_defense,
iv_stamina=iv_stamina,
iv_ads=iv_ads,
iv_sum=iv_sum,
iv_pct=iv_pct)[:12]
except KeyError as bad_key:
logger.log("Unable to nickname {} due to bad template ({})".format(name,bad_key),log_color)
if pokemon.get('nickname', "") == new_name:
return
self.bot.api.nickname_pokemon(pokemon_id=instance_id,nickname=new_name)
response = self.bot.api.call()
sleep(1.2)
try:
result = reduce(dict.__getitem__, ["responses", "NICKNAME_POKEMON"], response)
except KeyError:
logger.log("Attempt to nickname received bad response from server.",log_color)
if self.bot.config.debug:
logger.log(response,log_color)
return
result = result['result']
if new_name == "":
new_name = name
output = {
0: 'Nickname unset',
1: 'Nickname set successfully! {} is now {}'.format(name,new_name),
2: 'Invalid nickname! ({})'.format(new_name),
3: 'Pokemon not found.',
4: 'Pokemon is egg'
}[result]
if result==1:
log_color='green'
pokemon['nickname'] = new_name
logger.log(output,log_color)
8 changes: 3 additions & 5 deletions pokemongo_bot/cell_workers/pokemon_catch_worker.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# -*- coding: utf-8 -*-

import time

from pokemongo_bot import logger
from pokemongo_bot.human_behaviour import (normalized_reticle_size, sleep,
spin_modifier)


class PokemonCatchWorker(object):
BAG_FULL = 'bag_full'
NO_POKEBALLS = 'no_pokeballs'
Expand Down Expand Up @@ -52,9 +50,9 @@ def work(self):
individual_defense = pokemon_data.get("individual_defense", 0)

iv_display = '{}/{}/{}'.format(
individual_stamina,
individual_attack,
individual_defense
individual_defense,
individual_stamina
)

pokemon_potential = self.pokemon_potential(pokemon_data)
Expand All @@ -63,7 +61,7 @@ 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 [Attack/Defense/Stamina] = [{}]'.format(iv_display))
pokemon_data['name'] = pokemon_name
# Simulate app
sleep(3)
Expand Down

6 comments on commit b35260d

@g2384
Copy link

@g2384 g2384 commented on b35260d Aug 1, 2016

Choose a reason for hiding this comment

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

This is a good feature. Why the nickname example is removed from config example later :(

@ChrisHaPunkt
Copy link

Choose a reason for hiding this comment

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

So we cannot use this feature now?

@g2384
Copy link

@g2384 g2384 commented on b35260d Aug 1, 2016

Choose a reason for hiding this comment

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

@ChrisHaPunkt I think the code is not removed from python files. You can use it, but newcomers won't find it from the examples.

@TheSavior
Copy link
Contributor

Choose a reason for hiding this comment

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

We removed it from the examples because a non trivial amount of people copy and paste the example config and were upset when all of their pokemon were renamed (for good reason).

@k4n30
Copy link
Contributor

@k4n30 k4n30 commented on b35260d Aug 1, 2016

Choose a reason for hiding this comment

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

I think a config's consolidation is required eg. Only 1 example config with all the options with comments about the functionality of each section, and where there are multiple options but the bot can only use 1 of them, explain that 1 of them needs to be chosen and the other 3 deleted.

Either that or somehow have those who aren't newcomers but don't check every commit, aware of the "new" options

@Philipp59
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.