From a1c9419521c9ed28e361aaecc87581addfce6ba8 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <Anakin5@users.noreply.github.com>
Date: Sat, 20 Aug 2016 23:28:40 +0800
Subject: [PATCH] Display current candy count after evolution and transfer
 (#4352)

---
 pokemongo_bot/__init__.py                     |  4 +--
 pokemongo_bot/cell_workers/evolve_pokemon.py  |  2 --
 .../cell_workers/pokemon_optimizer.py         | 26 +++++++++++--------
 .../cell_workers/transfer_pokemon.py          |  7 +++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py
index a7d3e6f05e..3927ccfa1a 100644
--- a/pokemongo_bot/__init__.py
+++ b/pokemongo_bot/__init__.py
@@ -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')
         )
         self.event_manager.register_event('skip_evolve')
         self.event_manager.register_event('threw_berry_failed', parameters=('status_code',))
@@ -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
diff --git a/pokemongo_bot/cell_workers/evolve_pokemon.py b/pokemongo_bot/cell_workers/evolve_pokemon.py
index a7983ee647..b91ecd2895 100644
--- a/pokemongo_bot/cell_workers/evolve_pokemon.py
+++ b/pokemongo_bot/cell_workers/evolve_pokemon.py
@@ -112,8 +112,6 @@ def _execute_pokemon_evolve(self, pokemon, cache):
                     'pokemon': pokemon.name,
                     'iv': pokemon.iv,
                     'cp': pokemon.cp,
-                    'ncp': '?',
-                    'dps': '?',
                     'xp': '?'
                 }
             )
diff --git a/pokemongo_bot/cell_workers/pokemon_optimizer.py b/pokemongo_bot/cell_workers/pokemon_optimizer.py
index 2d837bf0b6..d31cc23dfa 100644
--- a/pokemongo_bot/cell_workers/pokemon_optimizer.py
+++ b/pokemongo_bot/cell_workers/pokemon_optimizer.py
@@ -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:
@@ -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)
diff --git a/pokemongo_bot/cell_workers/transfer_pokemon.py b/pokemongo_bot/cell_workers/transfer_pokemon.py
index 622d9fe170..dd1e9b16d2 100644
--- a/pokemongo_bot/cell_workers/transfer_pokemon.py
+++ b/pokemongo_bot/cell_workers/transfer_pokemon.py
@@ -179,13 +179,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: