Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nickname delay #5018

Merged
merged 1 commit into from
Aug 31, 2016
Merged

Nickname delay #5018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion configs/config.json.cluster.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion configs/config.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion configs/config.json.map.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion configs/config.json.path.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion configs/config.json.pokemon.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
{
Expand Down
18 changes: 10 additions & 8 deletions pokemongo_bot/cell_workers/nickname_pokemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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')
Expand All @@ -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):
Expand Down