Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display current candy count after evolution and transfer #4352

Merged
merged 1 commit into from
Aug 20, 2016
Merged

Display current candy count after evolution and transfer #4352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pokemongo_bot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ def _register_events(self):
)
self.event_manager.register_event(
'pokemon_evolved',
parameters=('pokemon', 'iv', 'cp', 'ncp', 'dps', 'xp')
parameters=('pokemon', 'iv', 'cp', 'xp')
Copy link
Contributor

Choose a reason for hiding this comment

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

why need remove ncp/dps display, the merge issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is just that there is so many attributes that we could display, it is hard to content everyone. Also moves and DPs are changing at evolve so it's kind of wrong info.
So I take another approach, which is sticking with the classical iv/cp and add the rewards XP,candies.

)
self.event_manager.register_event('skip_evolve')
self.event_manager.register_event('threw_berry_failed', parameters=('status_code',))
Expand Down Expand Up @@ -435,7 +435,7 @@ def _register_events(self):
)
self.event_manager.register_event(
'pokemon_release',
parameters=('pokemon', 'iv', 'cp', 'ncp', 'dps')
parameters=('pokemon', 'iv', 'cp', 'candy')
)

# polyline walker
Expand Down
2 changes: 0 additions & 2 deletions pokemongo_bot/cell_workers/evolve_pokemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ def _execute_pokemon_evolve(self, pokemon, cache):
'pokemon': pokemon.name,
'iv': pokemon.iv,
'cp': pokemon.cp,
'ncp': '?',
'dps': '?',
'xp': '?'
}
)
Expand Down
26 changes: 15 additions & 11 deletions pokemongo_bot/cell_workers/pokemon_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,18 +302,20 @@ def transfer_pokemon(self, pokemon):
if not response_dict:
return False

candy_awarded = response_dict.get("responses", {}).get("RELEASE_POKEMON", {}).get("candy_awarded", 0)
candy = inventory.candies().get(pokemon.pokemon_id)

if self.config_transfer and (not self.bot.config.test):
candy.add(candy_awarded)

self.emit_event("pokemon_release",
formatted="Exchanged {pokemon} [IV {iv}] [CP {cp}] [NCP {ncp}] [DPS {dps}]",
formatted="Exchanged {pokemon} [IV {iv}] [CP {cp}] [{candy} candies]",
data={"pokemon": pokemon.name,
"iv": pokemon.iv,
"cp": pokemon.cp,
"ncp": round(pokemon.ncp, 2),
"dps": round(pokemon.dps, 2)})
"candy": candy.quantity})

if self.config_transfer and (not self.bot.config.test):
candy = response_dict.get("responses", {}).get("RELEASE_POKEMON", {}).get("candy_awarded", 0)

inventory.candies().get(pokemon.pokemon_id).add(candy)
inventory.pokemons().remove(pokemon.unique_id)

with self.bot.database as db:
Expand Down Expand Up @@ -378,20 +380,22 @@ def evolve_pokemon(self, pokemon):
return False

xp = response_dict.get("responses", {}).get("EVOLVE_POKEMON", {}).get("experience_awarded", 0)
candy = response_dict.get("responses", {}).get("EVOLVE_POKEMON", {}).get("candy_awarded", 0)
candy_awarded = response_dict.get("responses", {}).get("EVOLVE_POKEMON", {}).get("candy_awarded", 0)
candy = inventory.candies().get(pokemon.pokemon_id)
evolution = response_dict.get("responses", {}).get("EVOLVE_POKEMON", {}).get("evolved_pokemon_data", {})

if self.config_evolve and (not self.bot.config.test):
candy.consume(pokemon.evolution_cost - candy_awarded)

self.emit_event("pokemon_evolved",
formatted="Evolved {pokemon} [IV {iv}] [CP {cp}] [NCP {ncp}] [DPS {dps}] [+{xp} xp]",
formatted="Evolved {pokemon} [IV {iv}] [CP {cp}] [{candy} candies] [+{xp} xp]",
data={"pokemon": pokemon.name,
"iv": pokemon.iv,
"cp": pokemon.cp,
"ncp": round(pokemon.ncp, 2),
"dps": round(pokemon.dps, 2),
"candy": candy.quantity,
"xp": xp})

if self.config_evolve and (not self.bot.config.test):
inventory.candies().get(pokemon.pokemon_id).consume(pokemon.evolution_cost - candy)
inventory.pokemons().remove(pokemon.unique_id)

new_pokemon = inventory.Pokemon(evolution)
Expand Down
7 changes: 3 additions & 4 deletions pokemongo_bot/cell_workers/transfer_pokemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,12 @@ def release_pokemon(self, pokemon):
self.bot.metrics.released_pokemon()
self.emit_event(
'pokemon_release',
formatted='Exchanged {pokemon} [CP {cp}] [IV {iv}] for candy.',
formatted='Exchanged {pokemon} [IV {iv}] [CP {cp}] [{candy} candies]',
data={
'pokemon': pokemon.name,
'cp': pokemon.cp,
'iv': pokemon.iv,
'ncp': pokemon.cp_percent,
'dps': pokemon.moveset.dps
'cp': pokemon.cp,
'candy': candy.quantity
}
)
with self.bot.database as conn:
Expand Down