From 17cc2b4fc31d7b3c9d48259956576c1dc8553090 Mon Sep 17 00:00:00 2001 From: Ghoster Date: Wed, 5 Oct 2016 11:27:46 +0200 Subject: [PATCH] Sniper task : More logs + correction of pokewatcher 's source Add more logs to see which pokemons will be used by the Sniper task. Correction of the pokewatcher source, change the expiration format type from "milliseconds" to "seconds" in configs files and documentation --- configs/config.json.example | 2 +- configs/config.json.map.example | 2 +- docs/configuration_files.md | 2 +- pokemongo_bot/cell_workers/sniper.py | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configs/config.json.example b/configs/config.json.example index 901bae608d..568a62bad4 100644 --- a/configs/config.json.example +++ b/configs/config.json.example @@ -252,7 +252,7 @@ "name": { "param": "pokemon" }, "latitude": { "param": "cords" }, "longitude": { "param": "cords" }, - "expiration": { "param": "timeend", "format": "milliseconds" } + "expiration": { "param": "timeend", "format": "seconds" } } }, { diff --git a/configs/config.json.map.example b/configs/config.json.map.example index af64d62a77..be06a3f36c 100644 --- a/configs/config.json.map.example +++ b/configs/config.json.map.example @@ -506,7 +506,7 @@ "name": { "param": "pokemon" }, "latitude": { "param": "cords" }, "longitude": { "param": "cords" }, - "expiration": { "param": "timeend", "format": "milliseconds" } + "expiration": { "param": "timeend", "format": "seconds" } } }, { diff --git a/docs/configuration_files.md b/docs/configuration_files.md index 77b57afc16..854292238d 100644 --- a/docs/configuration_files.md +++ b/docs/configuration_files.md @@ -846,7 +846,7 @@ This task is an upgrade version of the MoveToMapPokemon task. It will fetch poke "name": { "param": "pokemon" }, "latitude": { "param": "cords" }, "longitude": { "param": "cords" }, - "expiration": { "param": "timeend", "format": "milliseconds" } + "expiration": { "param": "timeend", "format": "seconds" } } } ], diff --git a/pokemongo_bot/cell_workers/sniper.py b/pokemongo_bot/cell_workers/sniper.py index f4c9e648e5..edac1fd7ce 100644 --- a/pokemongo_bot/cell_workers/sniper.py +++ b/pokemongo_bot/cell_workers/sniper.py @@ -416,6 +416,16 @@ def work(self): if targets: # Order the targets (descending) targets = sorted(targets, key=itemgetter(*self.order), reverse=True) + #List Pokemons found + self._trace('Sniping the {} best Pokemons found, ordered by {}'.format(self.bullets, self.order)) + self._trace('+----+------+----------------+-------+----------+---------+---------+----------+') + self._trace('| # | Id | Name | IV | Verified | VIP | Missing | Priority |') + self._trace('+----+------+----------------+-------+----------+---------+---------+----------+') + row_format ="|{:>3} |{:>5} | {:<15}|{:>6} | {:<9}| {:<8}| {:<8}|{:>9} |" + for index, target in enumerate(targets): + self._trace(row_format.format(*[index+1, target.get('pokemon_id'), target.get('pokemon_name'), target.get('iv'), str(target.get('verified')), str(target.get('vip')), str(target.get('missing')), target.get('priority')])) + + self._trace('+----+------+----------------+-------+----------+---------+---------+----------+') shots = 0 # For as long as there are targets available, try to snipe untill we run out of bullets