diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example index 5169ecd646..4deddb7db1 100644 --- a/configs/config.json.cluster.example +++ b/configs/config.json.cluster.example @@ -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 } diff --git a/configs/config.json.example b/configs/config.json.example index c0b01f4ee2..b821c10a95 100644 --- a/configs/config.json.example +++ b/configs/config.json.example @@ -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 } diff --git a/configs/config.json.map.example b/configs/config.json.map.example index 7ace7d5306..4d52e7ea08 100644 --- a/configs/config.json.map.example +++ b/configs/config.json.map.example @@ -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 } diff --git a/configs/config.json.path.example b/configs/config.json.path.example index d909855591..da649ce38d 100644 --- a/configs/config.json.path.example +++ b/configs/config.json.path.example @@ -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 } diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example index 02da627d3a..000fa1deec 100644 --- a/configs/config.json.pokemon.example +++ b/configs/config.json.pokemon.example @@ -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 } diff --git a/docs/configuration_files.md b/docs/configuration_files.md index 1b5c2258ee..3c81355554 100644 --- a/docs/configuration_files.md +++ b/docs/configuration_files.md @@ -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" } } diff --git a/pokemongo_bot/cell_workers/nickname_pokemon.py b/pokemongo_bot/cell_workers/nickname_pokemon.py index 5619ac21c1..c77c816cc7 100644 --- a/pokemongo_bot/cell_workers/nickname_pokemon.py +++ b/pokemongo_bot/cell_workers/nickname_pokemon.py @@ -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}" } } @@ -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' @@ -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) @@ -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 diff --git a/pokemongo_bot/cell_workers/transfer_pokemon.py b/pokemongo_bot/cell_workers/transfer_pokemon.py index 7d87059176..8c57726587 100644 --- a/pokemongo_bot/cell_workers/transfer_pokemon.py +++ b/pokemongo_bot/cell_workers/transfer_pokemon.py @@ -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,