Nickname delay

PokemonGoF · Aug 31, 2016 · 99c6380 · 99c6380
1 parent a7fb0ed
commit 99c6380
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example
@@ -88,7 +88,9 @@
         "config": {
           "enabled": false,
           "nickname_above_iv": 0.9,
-          "nickname_template": "{iv_pct}_{iv_ads}"
+          "nickname_template": "{iv_pct}_{iv_ads}",
+          "nickname_wait_min": 3,
+          "nickname_wait_max": 5
         }
       },
       {

diff --git a/configs/config.json.example b/configs/config.json.example
@@ -113,7 +113,9 @@
         "config": {
           "enabled": false,
           "nickname_above_iv": 0.9,
-          "nickname_template": "{iv_pct}_{iv_ads}"
+          "nickname_template": "{iv_pct}_{iv_ads}",
+          "nickname_wait_min": 3,
+          "nickname_wait_max": 5
         }
       },
       {

diff --git a/configs/config.json.map.example b/configs/config.json.map.example
@@ -88,7 +88,9 @@
         "config": {
           "enabled": false,
           "nickname_above_iv": 0.9,
-          "nickname_template": "{iv_pct}_{iv_ads}"
+          "nickname_template": "{iv_pct}_{iv_ads}",
+          "nickname_wait_min": 3,
+          "nickname_wait_max": 5
         }
       },
       {

diff --git a/configs/config.json.path.example b/configs/config.json.path.example
@@ -88,7 +88,9 @@
         "config": {
           "enabled": false,
           "nickname_above_iv": 0.9,
-          "nickname_template": "{iv_pct}_{iv_ads}"
+          "nickname_template": "{iv_pct}_{iv_ads}",
+          "nickname_wait_min": 3,
+          "nickname_wait_max": 5
         }
       },
       {

diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example
@@ -88,7 +88,9 @@
         "config": {
           "enabled": false,
           "nickname_above_iv": 0.9,
-          "nickname_template": "{iv_pct}_{iv_ads}"
+          "nickname_template": "{iv_pct}_{iv_ads}",
+          "nickname_wait_min": 3,
+          "nickname_wait_max": 5
         }
       },
       {

diff --git a/pokemongo_bot/cell_workers/nickname_pokemon.py b/pokemongo_bot/cell_workers/nickname_pokemon.py
@@ -13,6 +13,8 @@
 DEFAULT_IGNORE_FAVORITES = False
 DEFAULT_GOOD_ATTACK_THRESHOLD = 0.7
 DEFAULT_TEMPLATE = '{name}'
+DEFAULT_NICKNAME_WAIT_MIN = 3
+DEFAULT_NICKNAME_WAIT_MAX = 3
 
 MAXIMUM_NICKNAME_LENGTH = 12
 
@@ -187,14 +189,12 @@ class NicknamePokemon(BaseTask):
 
     # noinspection PyAttributeOutsideInit
     def initialize(self):
-        self.ignore_favorites = self.config.get(
-            'dont_nickname_favorite', DEFAULT_IGNORE_FAVORITES)
-        self.good_attack_threshold = self.config.get(
-            'good_attack_threshold', DEFAULT_GOOD_ATTACK_THRESHOLD)
-        self.template = self.config.get(
-            'nickname_template', DEFAULT_TEMPLATE)
-        self.nickname_above_iv = self.config.get(
-            'nickname_above_iv', 0)
+        self.ignore_favorites = self.config.get('dont_nickname_favorite', DEFAULT_IGNORE_FAVORITES)
+        self.good_attack_threshold = self.config.get('good_attack_threshold', DEFAULT_GOOD_ATTACK_THRESHOLD)
+        self.template = self.config.get('nickname_template', DEFAULT_TEMPLATE)
+        self.nickname_above_iv = self.config.get('nickname_above_iv', 0)
+        self.nickname_wait_min = self.config.get('nickname_wait_min', DEFAULT_NICKNAME_WAIT_MIN)
+        self.nickname_wait_max = self.config.get('nickname_wait_max', DEFAULT_NICKNAME_WAIT_MAX)
 
         self.translate = None
         locale = self.config.get('locale', 'en')
@@ -210,6 +210,8 @@ def work(self):
         for pokemon in pokemons().all():  # type: Pokemon
             if not pokemon.is_favorite or not self.ignore_favorites:
                 if pokemon.iv >= self.nickname_above_iv:
+                    # Make the bot appears more human
+                    action_delay(self.nickname_wait_min, self.nickname_wait_max)
                     self._nickname_pokemon(pokemon)
 
     def _localize(self, string):