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

#5404 fix and rname_pokemon telegram fix #5438

Merged
merged 2 commits into from
Sep 13, 2016
Merged

#5404 fix and rname_pokemon telegram fix #5438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
548b775
Merge remote-tracking branch 'PokemonGoF/dev'
javajohnHub Sep 13, 2016
6e4783c
Rename pokemon now works in Telegram
javajohnHub Sep 13, 2016
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
2 changes: 1 addition & 1 deletion configs/config.json.cluster.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"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
2 changes: 1 addition & 1 deletion configs/config.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"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
2 changes: 1 addition & 1 deletion configs/config.json.map.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"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
2 changes: 1 addition & 1 deletion configs/config.json.path.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"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
2 changes: 1 addition & 1 deletion configs/config.json.pokemon.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"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
2 changes: 1 addition & 1 deletion docs/configuration_files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ Key | Info
"enabled": true,
"dont_nickname_favorite": false,
"good_attack_threshold": 0.7,
"nickname_template": "{iv_pct}_{iv_ads}"
"nickname_template": "{iv_pct}-{iv_ads}"
"locale": "en"
}
}
Expand Down
10 changes: 5 additions & 5 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 @@ -68,7 +68,7 @@ class NicknamePokemon(BaseTask):
"enabled": true,
"dont_nickname_favorite": false,
"good_attack_threshold": 0.7,
"nickname_template": "{iv_pct}_{iv_ads}"
"nickname_template": "{iv_pct}-{iv_ads}"
}
}

Expand Down Expand Up @@ -174,7 +174,7 @@ class NicknamePokemon(BaseTask):

EXAMPLES:

1. "nickname_template": "{ivcp_pct}_{iv_pct}_{iv_ads}"
1. "nickname_template": "{ivcp_pct}-{iv_pct}-{iv_ads}"

Golbat with IV (attack: 9, defense: 4 and stamina: 8) will result in:
'48_46_9/4/8'
Expand Down Expand Up @@ -279,7 +279,7 @@ def _nickname_pokemon(self, pokemon):
elif result == 1:
self.emit_event(
'rename_pokemon',
formatted="*{} Renamed* to {}".format(old_nickname, new_nickname),
formatted="*{} Renamed* to *{}*".format(old_nickname, new_nickname),
data={'old_name': old_nickname, 'current_name': new_nickname}
)
pokemon.update_nickname(new_nickname)
Expand Down Expand Up @@ -337,8 +337,8 @@ def _generate_new_nickname(self, pokemon, template):
pokemon.name = self._localize(pokemon.name)

# Remove spaces from Nidoran M/F
pokemon.name = pokemon.name.replace("Nidoran M","NidoranM")
pokemon.name = pokemon.name.replace("Nidoran F","NidoranF")
pokemon.name = pokemon.name.replace("Nidoran M", "NidoranM")
pokemon.name = pokemon.name.replace("Nidoran F", "NidoranF")

#
# Generate new nickname
Expand Down
2 changes: 1 addition & 1 deletion pokemongo_bot/cell_workers/transfer_pokemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def should_release_pokemon(self, pokemon, keep_best_mode=False):
self.emit_event(
'future_pokemon_release',
formatted="*Releasing {}* CP: {}, IV: {} | based on rule: CP < {} {} IV < {}".format(pokemon.name, pokemon.cp, pokemon.iv,
release_cp, cp_iv_logic.upper(),release_cp),
release_cp, cp_iv_logic.upper(),release_iv),
data={
'pokemon': pokemon.name,
'cp': pokemon.cp,
Expand Down