From 432a51c3908b1148b33a61c431fb740e58bf3d9f Mon Sep 17 00:00:00 2001 From: goedzo Date: Tue, 18 Jul 2017 00:56:34 +0200 Subject: [PATCH 1/2] Fixed Heal Pokemon Event "revived_pokemon" was not registerd. --- pokemongo_bot/__init__.py | 1 + pokemongo_bot/event_handlers/logging_handler.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index 08b7b208ca..3095b34224 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -559,6 +559,7 @@ def _register_events(self): self.event_manager.register_event('catch_limit') self.event_manager.register_event('spin_limit') self.event_manager.register_event('show_best_pokemon', parameters=('pokemons')) + self.event_manager.register_event('revived_pokemon') # level up stuff self.event_manager.register_event( diff --git a/pokemongo_bot/event_handlers/logging_handler.py b/pokemongo_bot/event_handlers/logging_handler.py index c873cc7a0f..ce07aeb6c1 100644 --- a/pokemongo_bot/event_handlers/logging_handler.py +++ b/pokemongo_bot/event_handlers/logging_handler.py @@ -128,7 +128,8 @@ class LoggingHandler(EventHandler): 'threw_pokeball': 'none', 'used_lucky_egg': 'none', 'catch_limit_on': 'yellow', - 'catch_limit_off': 'green' + 'catch_limit_off': 'green', + 'revived_pokemon': 'green' } COLOR_CODE = { 'gray': '\033[90m', From de9cb21f590331c4870fb1d9ce3635a114bd2f99 Mon Sep 17 00:00:00 2001 From: goedzo Date: Tue, 18 Jul 2017 01:08:50 +0200 Subject: [PATCH 2/2] Fixed all Heal Pokemon bugs --- pokemongo_bot/__init__.py | 1 + pokemongo_bot/event_handlers/logging_handler.py | 4 +++- pokemongo_bot/inventory.py | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index 3095b34224..3e8bd41a67 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -560,6 +560,7 @@ def _register_events(self): self.event_manager.register_event('spin_limit') self.event_manager.register_event('show_best_pokemon', parameters=('pokemons')) self.event_manager.register_event('revived_pokemon') + self.event_manager.register_event('healing_pokemon') # level up stuff self.event_manager.register_event( diff --git a/pokemongo_bot/event_handlers/logging_handler.py b/pokemongo_bot/event_handlers/logging_handler.py index ce07aeb6c1..86c9fa5a92 100644 --- a/pokemongo_bot/event_handlers/logging_handler.py +++ b/pokemongo_bot/event_handlers/logging_handler.py @@ -129,7 +129,9 @@ class LoggingHandler(EventHandler): 'used_lucky_egg': 'none', 'catch_limit_on': 'yellow', 'catch_limit_off': 'green', - 'revived_pokemon': 'green' + 'revived_pokemon': 'green', + 'healing_pokemon': 'green' + } COLOR_CODE = { 'gray': '\033[90m', diff --git a/pokemongo_bot/inventory.py b/pokemongo_bot/inventory.py index 49de951e78..e7a5129e4b 100644 --- a/pokemongo_bot/inventory.py +++ b/pokemongo_bot/inventory.py @@ -522,6 +522,11 @@ def add(self, pokemon): raise ValueError("Pokemon already present in the inventory") self._data[pokemon.unique_id] = pokemon + def get_from_unique_id(self, pokemon_unique_id): + if pokemon_unique_id not in self._data: + raise ValueError("Pokemon not present in the inventory") + return self._data[pokemon_unique_id] + def remove(self, pokemon_unique_id): if pokemon_unique_id not in self._data: raise ValueError("Pokemon not present in the inventory")