Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into faetur…

…e/xp-improvements
PokemonGoF · Aug 8, 2016 · ef2bb53 · ef2bb53
2 parents bb931f4 + 4b16e9d
commit ef2bb53
Show file tree

Hide file tree

Showing 3 changed files with 357 additions and 452 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -51,6 +51,7 @@
  * matheussampaio
  * Abraxas000
  * lucasfevi
+ * pokepal
  * Moonlight-Angel
  * mjmadsen
  * nikofil
diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py
@@ -235,10 +235,12 @@ def _register_events(self):
                 'iv_display',
             )
         )
+        self.event_manager.register_event('no_pokeballs')
         self.event_manager.register_event(
             'pokemon_catch_rate',
             parameters=(
                 'catch_rate',
+                'ball_name',
                 'berry_name',
                 'berry_count'
             )
@@ -247,25 +249,28 @@ def _register_events(self):
             'threw_berry',
             parameters=(
                 'berry_name',
+                'ball_name',
                 'new_catch_rate'
             )
         )
         self.event_manager.register_event(
             'threw_pokeball',
             parameters=(
-                'pokeball',
+                'ball_name',
                 'success_percentage',
                 'count_left'
             )
         )
         self.event_manager.register_event(
-            'pokemon_escaped',
+            'pokemon_capture_failed',
             parameters=('pokemon',)
         )
         self.event_manager.register_event(
             'pokemon_vanished',
             parameters=('pokemon',)
         )
+        self.event_manager.register_event('pokemon_not_in_range')
+        self.event_manager.register_event('pokemon_inventory_full')
         self.event_manager.register_event(
             'pokemon_caught',
             parameters=(