Pokemon Optimizer round 4 #4921
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
julienlavergne
commented
Aug 30, 2016
julienlavergne
commented
- Add full documentation of Pokemon Optimizer (need to add a few things but mostly done)
- Add support for different mode of selection "by_pokemon", "by_family", "overall"
- Add parameter to create and reference groups of Pokemon
- Add possibility to exclude Pokemon or groups of Pokemon
- Add possibility to configure evolution threshold when selecting Pokemon to keep
- Add possibility to keep Pokemon whose stats are no further that x% of the best
- Auto correct misspelled Pokemon names in configuration
|
@anakin5, thanks for your PR! By analyzing the annotation information on this pull request, we identified @RedViper9, @DeXtroTip and @mjmadsen to be potential reviewers |
See documentation for full list of new features
|
👍 |
|
I wonder if lines 261 to 263 of pokemon_optimizer.py are not a duplicate of lines above ? I've a TypeError 'Pokemon' type not iterable when I reach this step. |
|
Which lines are you referring to ? |
| keep_all += keep | ||
|
|
||
| try_evolve, keep = self.sort_pokemon_list(other_family_list, rule) | ||
| try_evolve_all += try_evolve |
|
Sorry, can you point me on which line is reported in the error message ? I do not see where the error is. |
|
I don't have the error on my screen anymore, but it was pointing to line 262 of pokemon_optimizer.py. Bit if you check the file pokemon_optimizer.py, you can see that line 261, 262 and 263 are just a duplicating of above lines 257, 258, 259 but outside of the "for" loop. I don't catch all the logic behind the code, so I may be wrong. Edit : no sorry, code is different, not duplicate, sorry. |
|
Ok I see the error, I will fix. For the lines you are talking about, they are not exactly duplicated, there is a small difference ;) |
|
I pushed the fix in the other pull request. |
alexyaoyang
pushed a commit
that referenced
this pull request
Sep 1, 2016
* Update merge (#1) * Expand simple logging options (#4832) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Changed ) to } (#4845) Fixed an faulty character * fix incubator logic (#4848) * corrected logic to respect snipe = true * Update configuration_files.md (#4854) * corrected logic to respect snipe = true (#4855) * Revert "corrected logic to respect snipe = true" (#4857) * dont forget to update the docs when adding config changes... (#4856) * dont forget to update the docs when adding config changes... * reflect config changes.... * please keep this as is (#4859) Add stuff in the right order. * Clarify Max_distance for Sniping (#4858) * Clarify Max_distance * Added distance unit and updated configuration_files.md * - debug improvements for MoveToMap (#4860) - fix for Telegram to accept "@username" as "master", too, along with numeric IDs * Fixes catch rates. (#4863) * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Add exceptions to json file read/writes (#4877) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Incubate eggs fix (#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * add some sanitycheck (#4891) * execute setup.sh -u if there is a need to (#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Call level_up_rewards on exp changes/Some pep-8 (#4896) * Call level_up_rewards on exp changes. * Cleanup * Improvements to evolve + config md updates (#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * 2000 pokestop in 24h limit (#4906) * 2000 pokestop in 24h limit * 2000 pokestop in 24h limit * add config variable * config update * Update readme.md + Improve FollowPath & SleepSchedule messages (#4911) * Use logger for follow path loiter message * Update readme.md * Improve sleep message * Allow follow_path to use config's distance unit * Allow follow_path to use config's distance unit * Reduce API calls (#4916) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Update player data in web from metrics Uses existing metrics instead of waiting on liveupdate * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Improvements to evolve + config md updates (#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * Incubate eggs fix (#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * Call level_up_rewards on exp changes/Some pep-8 (#4896) * Call level_up_rewards on exp changes. * Cleanup * add some sanitycheck (#4891) * execute setup.sh -u if there is a need to (#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Refactoring to share inventory and reduce api calls Modifications to share cached inventory and reduce overall required api calls from 4 to 1. Only remaining api call comes from heartbeat which updates the cached inventory for sanity reasons. * Remove import of UpdateWebPlayerdata Decided there was a better way to go with this, since both UpdateWebInventory and UpdateWebPlayerdata share the same inventory input/output, just different sections. Combined into UpdateWebInventory. * Fixed conflict * Import inventory added to metrics Allows metrics to use the cached inventory to retrieve player stats instead of making another api call * Removed api call from incubate_eggs Cached inventory should be accurate enough for this * Swap auth and config position (#4909) * add telegram check messages interval (#4919) * add telegram check messages interval * config changed * fix config * telegram doc update * Add documentation (#4921) See documentation for full list of new features * documented docker for the auth.json use case (#4922) add instructions for the docker run command for the multiple config files use case. * Fix for #4718 (#4924) * Add except variable * Add except variable * Fix filter (#4925) * improve docker pull speed (#4899) * Update inventory.py (#4928) FIX: #4926 * fixed a runtime error caused by incorrect imports (#4931) * Catch exception telegram.error.NetworkError. Fixs some pylint complain. * More config parameters for MoveToMap (#4937) * fixed a runtime error caused by incorrect imports * Moving module-level constants (snipe parameters) into config file * Add experimental pokemon upgrade (power-up) logic (#4938) Add upgrade cost data file Add last pokemon level. * Set default value of skip_rounds to 30 since many people just use the default value. 30 will behave close to human. * Add exception handling for cached forts (#4943) * Add exception handling for cached forts * whitespace fix * telegram to thread * config update * doc update * update web repo to have better web ui contribute. * Using $TIMEZONE environment variable to set timezone * fix errors * fix errors * Fixing clean run issues. * During startup, no bot object. * Added option PokemonGo-Bot-Configurator Smoothed some things up Added option to run PokemonGo-Bot-Configurator at the end of the installation. * Hotfix for EvolvePokemon (#4960) * Compatiable with old protocol define in map-chat. * Update merge (#2) * Expand simple logging options (#4832) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Changed ) to } (#4845) Fixed an faulty character * fix incubator logic (#4848) * corrected logic to respect snipe = true * Update configuration_files.md (#4854) * corrected logic to respect snipe = true (#4855) * Revert "corrected logic to respect snipe = true" (#4857) * dont forget to update the docs when adding config changes... (#4856) * dont forget to update the docs when adding config changes... * reflect config changes.... * please keep this as is (#4859) Add stuff in the right order. * Clarify Max_distance for Sniping (#4858) * Clarify Max_distance * Added distance unit and updated configuration_files.md * - debug improvements for MoveToMap (#4860) - fix for Telegram to accept "@username" as "master", too, along with numeric IDs * Fixes catch rates. (#4863) * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Add exceptions to json file read/writes (#4877) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Incubate eggs fix (#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * add some sanitycheck (#4891) * execute setup.sh -u if there is a need to (#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Call level_up_rewards on exp changes/Some pep-8 (#4896) * Call level_up_rewards on exp changes. * Cleanup * Improvements to evolve + config md updates (#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * 2000 pokestop in 24h limit (#4906) * 2000 pokestop in 24h limit * 2000 pokestop in 24h limit * add config variable * config update * Update readme.md + Improve FollowPath & SleepSchedule messages (#4911) * Use logger for follow path loiter message * Update readme.md * Improve sleep message * Allow follow_path to use config's distance unit * Allow follow_path to use config's distance unit * Reduce API calls (#4916) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Update player data in web from metrics Uses existing metrics instead of waiting on liveupdate * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Improvements to evolve + config md updates (#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * Incubate eggs fix (#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * Call level_up_rewards on exp changes/Some pep-8 (#4896) * Call level_up_rewards on exp changes. * Cleanup * add some sanitycheck (#4891) * execute setup.sh -u if there is a need to (#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Refactoring to share inventory and reduce api calls Modifications to share cached inventory and reduce overall required api calls from 4 to 1. Only remaining api call comes from heartbeat which updates the cached inventory for sanity reasons. * Remove import of UpdateWebPlayerdata Decided there was a better way to go with this, since both UpdateWebInventory and UpdateWebPlayerdata share the same inventory input/output, just different sections. Combined into UpdateWebInventory. * Fixed conflict * Import inventory added to metrics Allows metrics to use the cached inventory to retrieve player stats instead of making another api call * Removed api call from incubate_eggs Cached inventory should be accurate enough for this * Swap auth and config position (#4909) * add telegram check messages interval (#4919) * add telegram check messages interval * config changed * fix config * telegram doc update * Add documentation (#4921) See documentation for full list of new features * documented docker for the auth.json use case (#4922) add instructions for the docker run command for the multiple config files use case. * Fix for #4718 (#4924) * Add except variable * Add except variable * Fix filter (#4925) * improve docker pull speed (#4899) * Update inventory.py (#4928) FIX: #4926 * fixed a runtime error caused by incorrect imports (#4931) * Catch exception telegram.error.NetworkError. Fixs some pylint complain. * More config parameters for MoveToMap (#4937) * fixed a runtime error caused by incorrect imports * Moving module-level constants (snipe parameters) into config file * Add experimental pokemon upgrade (power-up) logic (#4938) Add upgrade cost data file Add last pokemon level. * Set default value of skip_rounds to 30 since many people just use the default value. 30 will behave close to human. * Add exception handling for cached forts (#4943) * Add exception handling for cached forts * whitespace fix * telegram to thread * config update * doc update * update web repo to have better web ui contribute. * Using $TIMEZONE environment variable to set timezone * fix errors * fix errors * Fixing clean run issues. * During startup, no bot object. * Added option PokemonGo-Bot-Configurator Smoothed some things up Added option to run PokemonGo-Bot-Configurator at the end of the installation. * Hotfix for EvolvePokemon (#4960) * Compatiable with old protocol define in map-chat. * Provided a default for max_walking_distance and max_sniping_distance in order to avoid unhandled exceptions * Made sure nicknaming only waits if real api-relevant action was taken.
rawgni
added a commit
to rawgni/PokemonGo-Bot
that referenced
this pull request
Sep 1, 2016
Fix nickname (PokemonGoF#5031) * Update merge (PokemonGoF#1) * Expand simple logging options (PokemonGoF#4832) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Changed ) to } (PokemonGoF#4845) Fixed an faulty character * fix incubator logic (PokemonGoF#4848) * corrected logic to respect snipe = true * Update configuration_files.md (PokemonGoF#4854) * corrected logic to respect snipe = true (PokemonGoF#4855) * Revert "corrected logic to respect snipe = true" (PokemonGoF#4857) * dont forget to update the docs when adding config changes... (PokemonGoF#4856) * dont forget to update the docs when adding config changes... * reflect config changes.... * please keep this as is (PokemonGoF#4859) Add stuff in the right order. * Clarify Max_distance for Sniping (PokemonGoF#4858) * Clarify Max_distance * Added distance unit and updated configuration_files.md * - debug improvements for MoveToMap (PokemonGoF#4860) - fix for Telegram to accept "@username" as "master", too, along with numeric IDs * Fixes catch rates. (PokemonGoF#4863) * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Add exceptions to json file read/writes (PokemonGoF#4877) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Incubate eggs fix (PokemonGoF#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * add some sanitycheck (PokemonGoF#4891) * execute setup.sh -u if there is a need to (PokemonGoF#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (PokemonGoF#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Call level_up_rewards on exp changes/Some pep-8 (PokemonGoF#4896) * Call level_up_rewards on exp changes. * Cleanup * Improvements to evolve + config md updates (PokemonGoF#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * 2000 pokestop in 24h limit (PokemonGoF#4906) * 2000 pokestop in 24h limit * 2000 pokestop in 24h limit * add config variable * config update * Update readme.md + Improve FollowPath & SleepSchedule messages (PokemonGoF#4911) * Use logger for follow path loiter message * Update readme.md * Improve sleep message * Allow follow_path to use config's distance unit * Allow follow_path to use config's distance unit * Reduce API calls (PokemonGoF#4916) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Update player data in web from metrics Uses existing metrics instead of waiting on liveupdate * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Improvements to evolve + config md updates (PokemonGoF#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * Incubate eggs fix (PokemonGoF#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * Call level_up_rewards on exp changes/Some pep-8 (PokemonGoF#4896) * Call level_up_rewards on exp changes. * Cleanup * add some sanitycheck (PokemonGoF#4891) * execute setup.sh -u if there is a need to (PokemonGoF#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (PokemonGoF#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Refactoring to share inventory and reduce api calls Modifications to share cached inventory and reduce overall required api calls from 4 to 1. Only remaining api call comes from heartbeat which updates the cached inventory for sanity reasons. * Remove import of UpdateWebPlayerdata Decided there was a better way to go with this, since both UpdateWebInventory and UpdateWebPlayerdata share the same inventory input/output, just different sections. Combined into UpdateWebInventory. * Fixed conflict * Import inventory added to metrics Allows metrics to use the cached inventory to retrieve player stats instead of making another api call * Removed api call from incubate_eggs Cached inventory should be accurate enough for this * Swap auth and config position (PokemonGoF#4909) * add telegram check messages interval (PokemonGoF#4919) * add telegram check messages interval * config changed * fix config * telegram doc update * Add documentation (PokemonGoF#4921) See documentation for full list of new features * documented docker for the auth.json use case (PokemonGoF#4922) add instructions for the docker run command for the multiple config files use case. * Fix for PokemonGoF#4718 (PokemonGoF#4924) * Add except variable * Add except variable * Fix filter (PokemonGoF#4925) * improve docker pull speed (PokemonGoF#4899) * Update inventory.py (PokemonGoF#4928) FIX: PokemonGoF#4926 * fixed a runtime error caused by incorrect imports (PokemonGoF#4931) * Catch exception telegram.error.NetworkError. Fixs some pylint complain. * More config parameters for MoveToMap (PokemonGoF#4937) * fixed a runtime error caused by incorrect imports * Moving module-level constants (snipe parameters) into config file * Add experimental pokemon upgrade (power-up) logic (PokemonGoF#4938) Add upgrade cost data file Add last pokemon level. * Set default value of skip_rounds to 30 since many people just use the default value. 30 will behave close to human. * Add exception handling for cached forts (PokemonGoF#4943) * Add exception handling for cached forts * whitespace fix * telegram to thread * config update * doc update * update web repo to have better web ui contribute. * Using $TIMEZONE environment variable to set timezone * fix errors * fix errors * Fixing clean run issues. * During startup, no bot object. * Added option PokemonGo-Bot-Configurator Smoothed some things up Added option to run PokemonGo-Bot-Configurator at the end of the installation. * Hotfix for EvolvePokemon (PokemonGoF#4960) * Compatiable with old protocol define in map-chat. * Update merge (PokemonGoF#2) * Expand simple logging options (PokemonGoF#4832) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Changed ) to } (PokemonGoF#4845) Fixed an faulty character * fix incubator logic (PokemonGoF#4848) * corrected logic to respect snipe = true * Update configuration_files.md (PokemonGoF#4854) * corrected logic to respect snipe = true (PokemonGoF#4855) * Revert "corrected logic to respect snipe = true" (PokemonGoF#4857) * dont forget to update the docs when adding config changes... (PokemonGoF#4856) * dont forget to update the docs when adding config changes... * reflect config changes.... * please keep this as is (PokemonGoF#4859) Add stuff in the right order. * Clarify Max_distance for Sniping (PokemonGoF#4858) * Clarify Max_distance * Added distance unit and updated configuration_files.md * - debug improvements for MoveToMap (PokemonGoF#4860) - fix for Telegram to accept "@username" as "master", too, along with numeric IDs * Fixes catch rates. (PokemonGoF#4863) * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Add exceptions to json file read/writes (PokemonGoF#4877) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Incubate eggs fix (PokemonGoF#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * add some sanitycheck (PokemonGoF#4891) * execute setup.sh -u if there is a need to (PokemonGoF#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (PokemonGoF#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Call level_up_rewards on exp changes/Some pep-8 (PokemonGoF#4896) * Call level_up_rewards on exp changes. * Cleanup * Improvements to evolve + config md updates (PokemonGoF#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * 2000 pokestop in 24h limit (PokemonGoF#4906) * 2000 pokestop in 24h limit * 2000 pokestop in 24h limit * add config variable * config update * Update readme.md + Improve FollowPath & SleepSchedule messages (PokemonGoF#4911) * Use logger for follow path loiter message * Update readme.md * Improve sleep message * Allow follow_path to use config's distance unit * Allow follow_path to use config's distance unit * Reduce API calls (PokemonGoF#4916) * Fix bot crash at start on permaban * Expanded logging options Added "logging" section to config, with options "color", "show_datetime", "show_process_name" and "show_log_level" * Added warning about deprecated logging_color arg * Display log message moved No point trying to use the logger before it's been initialised. Moved to init_config. * Remove milliseconds from datetime Because really, do we need that? * Reversed condition order for clarity First check: "if not in config", OR Second check: "is in config AND set to true" If either condition matches, the logging detail will be displayed. * Documented new log options * Modified conditions again Removed unnecessary second check for config values and slightly modified parentheses as per suggestion from @mjmadsen * Add exception handling to json file read/write ops * Removed API call in update live stats Instead of making a new api call, utilise stats already contained in metrics. * Update player data in web from metrics Uses existing metrics instead of waiting on liveupdate * Implemented more granularity in the "alert_catch" parameter for Telegram alerts. * Improvements to evolve + config md updates (PokemonGoF#4900) * Better do not evolve handling * Edit config * Update config * Edit config * Edit config * Edit config * Update config.json.path.example * Update config.json.map.example * Update config.json.example * Update config.json.cluster.example * Updated configuration_files.md * Add extra tests * Update config * Update config * Update config * Update config * Update config.json.pokemon.example * Update config.json.cluster.example * Begin fixing configuration_files.md * Small fix * Small fix * Bit for of config updated * Bit more on config * A few more to config md * Bit more of of an update * Incubate eggs fix (PokemonGoF#4881) * Fixed incubator_eggs wrong print * Fixed pokemon hatched from eggs not added to cached inventory * Fix * Fixed not using breakable incubators * Fixed error adding pokemon to cached inventory * Moved remove egg and add Pokemon to _hatch_eggs * Call level_up_rewards on exp changes/Some pep-8 (PokemonGoF#4896) * Call level_up_rewards on exp changes. * Cleanup * add some sanitycheck (PokemonGoF#4891) * execute setup.sh -u if there is a need to (PokemonGoF#4870) * execute setup.sh -u if there is a need to * ask the user whether to run setup.sh -u or not * fix grammatical error * Add PokemonGo bot version to docker image (PokemonGoF#4886) * fix pep8 * Add PokemonGo bot version to docker image * Use https://api.github.com/repos/PokemonGoF/PokemonGo-Bot/commits{/sha} API * Fix remove pyc, pyo files * Refactoring to share inventory and reduce api calls Modifications to share cached inventory and reduce overall required api calls from 4 to 1. Only remaining api call comes from heartbeat which updates the cached inventory for sanity reasons. * Remove import of UpdateWebPlayerdata Decided there was a better way to go with this, since both UpdateWebInventory and UpdateWebPlayerdata share the same inventory input/output, just different sections. Combined into UpdateWebInventory. * Fixed conflict * Import inventory added to metrics Allows metrics to use the cached inventory to retrieve player stats instead of making another api call * Removed api call from incubate_eggs Cached inventory should be accurate enough for this * Swap auth and config position (PokemonGoF#4909) * add telegram check messages interval (PokemonGoF#4919) * add telegram check messages interval * config changed * fix config * telegram doc update * Add documentation (PokemonGoF#4921) See documentation for full list of new features * documented docker for the auth.json use case (PokemonGoF#4922) add instructions for the docker run command for the multiple config files use case. * Fix for PokemonGoF#4718 (PokemonGoF#4924) * Add except variable * Add except variable * Fix filter (PokemonGoF#4925) * improve docker pull speed (PokemonGoF#4899) * Update inventory.py (PokemonGoF#4928) FIX: PokemonGoF#4926 * fixed a runtime error caused by incorrect imports (PokemonGoF#4931) * Catch exception telegram.error.NetworkError. Fixs some pylint complain. * More config parameters for MoveToMap (PokemonGoF#4937) * fixed a runtime error caused by incorrect imports * Moving module-level constants (snipe parameters) into config file * Add experimental pokemon upgrade (power-up) logic (PokemonGoF#4938) Add upgrade cost data file Add last pokemon level. * Set default value of skip_rounds to 30 since many people just use the default value. 30 will behave close to human. * Add exception handling for cached forts (PokemonGoF#4943) * Add exception handling for cached forts * whitespace fix * telegram to thread * config update * doc update * update web repo to have better web ui contribute. * Using $TIMEZONE environment variable to set timezone * fix errors * fix errors * Fixing clean run issues. * During startup, no bot object. * Added option PokemonGo-Bot-Configurator Smoothed some things up Added option to run PokemonGo-Bot-Configurator at the end of the installation. * Hotfix for EvolvePokemon (PokemonGoF#4960) * Compatiable with old protocol define in map-chat. * Provided a default for max_walking_distance and max_sniping_distance in order to avoid unhandled exceptions * Made sure nicknaming only waits if real api-relevant action was taken.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.