Dev merge to master, PR (#4178) #2
Closed
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
* Do not spin fort on timeout when restarting the bot (#3931) Fix bot stuck between forts when inventory is full * Fixed references to self.bot.config.walk (#4046) * Fixed error * Fixed error * Updating run.sh and install.sh (#4033) * Update run.sh * Update setup.sh * Update setup.sh * Update setup.sh * Fixing typo * Added heartbeat threshold, it's not reasonable to send heartbeat to server every second. (#4058) * Added heartbeat threshold, it's not reasonable to send heartbeat to server every second. * Added example in config. * heartbeat_threshold using time delta (#4095) * changed hearbeat threshold to work on a delta time * renamed variable for clarity * tidy up * Fixing live stats crash on first run (#4088) * try to fix system platform in init.py (#4068) Fix for other system we don't know but should run without problem. * Fix get_top_rank (#3823) Refresh inventory when opening it Do not use rare pokemon to xp Fix an issue when use_lucky_egg=true and evolve_only_with_lucky_egg=false Save web inventory after refresh Add parameter evolve_time default to 20. Rename parameter use_candies_for_xp in evolve_for_xp Rename parameter minimum_evolve_for_lucky_egg in evolve_count_for_lucky_egg Rename parameter use_lucky_egg in may_use_lucky_egg Add 1 percent rule = Do not use rare pokemon candies for xp Handle lucky egg already active case Plan bad Eevees for transfer if evolve is deactivated * Enhancement/sleep schedule check if current sleep is over (#4031) * SleepSchedule check if current sleep period is over Enhances #2193 * Add config field "skip_current_sleep_cycle" * Edit sample config files to include skip_current_sleep_cycle * Remove skip_current_sleep_cycle * Add one more check for current sleep * MoveToMapPokemon: Replacing min_time with reachable distance calculation (#4022) * * replacing min_time functionality of MoveToMapPokemon by a more sophisticated way of determining reachability on time * * fixing #3609 * moving config values to top * Make PokemonOptimizer calculate correct transfer / evolve groups (#4099) * Humanize & better app simulation for catches (#3872) * changed 2 second delay between retrying throws to use action_delay minimum delay is 2 seconds * quick randomise 2,4 or 6 secs between failed throw and next throw to simulate app better * added config option to turn randomize_flee_duration off (default = on) * configurable delay for throwing balls added action_delay when changing ball or using razzberry * moved delay for razzberry to more appropriate place * updated config files with catch_wait_min and catch_wait_max * updated config files with randomize_flee_duration * grouped catch simulation and humanization settings added settings for all catch related sleeps * Changed the logic for randomly choosing a sleep for flee animation to something reasonable * docs clean up import * re-Wording followPath to more readable, recycle_items.should_run should accept <= for min_empty_space: 0 (#4105) * re-wording follow path, inventory should have -1 value instead of 0 * remove unused * refactor: inventory.get_space_left should return 0 so change conditions from recycle.should_run instead * Send bot through Tor (#4108) * Send bot through Tor All of the bot's API requests go through tor * links privoxy you gotta link if you want to reference * keep privoxy up too * Update setup.sh (#4117) * Update run.sh (#4123) typo * Fixing values on UpdateLiveStatus (#4127) * Updated wiki, explain how to use Docker under Windows (#4136) * Bring together CatchVisiblePokemon & CatchLuredPokemon in config (#3966) * CatchPokemon calls CatchLuredPokemon and CatchVisiblePokemon methods. Config now only needs one catch related worker. All catch related config including option to catch lured and/or visible can be kept with the task. * example config * indentation * defaults for catch_lured/visible_pokemon * deprecated command line options for throw parameters * catch_throw_parameters defaults match config.json.example * added deprecation functionality for CatchVisiblePokemon and CatchLuredPokemon * min_ultraball_to_keep default reflects example config * tree_config_builder_test uses CatchPokemon instead of CatchLuredPokemon * deprecation warning message * catchsim config moved to CatchPokemon * updated example configs * updated docs * User configurable delay when spinning fort (#4109) * user configurable delay for spin fort * replaced time.sleep(2) with configurable delay * updated configs * fix followCluster & MoveToMapPokemon (#4115) * * fixed followCluster not following lured clusters because of outdated pokestop data structure * fixed very annoying followCluster wording (OCD senses were tickling) * fixed #4022 * no message * string formatting * correcting message to display lured only when walking to lured cluster * message formatting * forgot to add regester event variable * Showing detailed sleep info (#4066) * Windows installation instructions refit (#3898) * Delete PokemonGo-Bot-Repair.bat * Update PokemonGo-Bot-Install.bat * Update PokemonGo-Bot-Start.bat Removed an update procedure that was making the map not to work. * Update installation.md Modified Windows installation instructions to use the batch files. * Update PokemonGo-Bot-Install.bat Added links for the configuration instructions. Still missing links for the encrypt files. Need help on it. * Update manual_installation.md Recreated the installations instructions for Windows. * Update installation.md Removed the need to download PyYAML and modified the instructions to download only the required encrypt files. * Update manual_installation.md Removed the requirement to download PyYAML as the installer already downloads it during git pull. Also removed the requirement to download all encrypt files. * Update PokemonGo-Bot-Install.bat * Update PokemonGo-Bot-Install.bat * Update PokemonGo-Bot-Start.bat Added a pause in the end so the promp wont close in the end if `pokecli.py` goes to error. * Update PokemonGo-Bot-Install.bat Added a procedure to deal with the installation path issue. Also, added a command to install protobuff automatically. * Update installation.md Removed the requirement to install protobuff as it will be installed automatically by the install batch. * Update PokemonGo-Bot-Install.bat * Update manual_installation.md Removed the requirement for protoc and added command line to download it. * Update PokemonGo-Bot-Install.bat * Update PokemonGo-Bot-Start.bat Updated in order to work anywhere as long its inside the windows_bat folder * Update PokemonGo-Bot-Install.bat * Update installation.md * Update PokemonGo-Bot-Start.bat * Update PokemonGo-Bot-Install.bat * Update CONTRIBUTORS.md * Update PokemonGo-Bot-Start.bat * Update PokemonGo-Bot-Start.bat * Update PokemonGo-Bot-Start.bat * Update PokemonGo-Bot-Install.bat * Revert "Update CONTRIBUTORS.md" This reverts commit 856a0fd. * Revert "Delete PokemonGo-Bot-Repair.bat" This reverts commit a459a86. * Revert "Update PokemonGo-Bot-Start.bat" This reverts commit 510570d. * Revert "Update PokemonGo-Bot-Install.bat" This reverts commit 9db2798. # Conflicts: # windows_bat/PokemonGo-Bot-Install.bat * Complete refit of all batches We can now choose an install location and all required software is automatically installed. * Added contributors Added new contributors * Revert "Added contributors" This reverts commit a1d364c. * Deprecate action_wait_min/max in favour of task specific options (#4048) * RecycleItems uses it's own recycle_wait_min/max instead of action_wait_min/max * TransferPokemon uses it's own transfer_wait_min/max instead of action_wait_min/max * PokemonOptimizer uses it's own transfer_wait_min/max instead of action_wait_min/max * Deprecated action_wait_min and action_wait_max * fixed mistake * Update update_live_stats.py (#3985) * SQLite backend for bot/plugin use (#4129) * Initial attempt at implementing an SQLite backend for plugin use * Fixed attribute error when accessing DB * Patch snipey in move_to_map_pokemon.py (#4146) to solve issue #4142 * Add files via upload (#4151) * fix example config * fix config file * added a script to check json, and updated .travis.yml * Update json-validate.py * Documenting docker-compose with Tor (#4161) * Send bot through Tor All of the bot's API requests go through tor * links privoxy you gotta link if you want to reference * keep privoxy up too * Docker documentation update Including example command for using the alternate tor proxy command. Additionally changed line 114 to down rather than rm so that the containers are stopped before they are removed in the case that the containers were launched in detached mode. * Remove `,` at line 112 (#4171) * Minor config fix (#4173) Fixes indent * Fix no pokeballs log spamming (#4000) * Fix looping between equidstant pokestops * :D * emp * changes * fix no pokeballs log spamming, fix possible bug * remove unnesscessary return * revert pokemongo_bot/cell_workers/move_to_fort.py * solve merge conflicts * Remove extra whitespace
seehuily
pushed a commit
that referenced
this pull request
Sep 2, 2016
* 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.
seehuily
pushed a commit
that referenced
this pull request
Sep 2, 2016
* Update merge (#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 (#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.
Please Note - You may remove this section before opening your PR
We receive lots of PRs and it is hard to give proper review to PRs. Please make it easy on us by following these guidelines:
master. Please make sure your pull request is aimed atdev.config.jsonexample files.Short Description:
Fixes/Resolves/Closes (please use correct syntax):
Fix bot stuck between forts when inventory is full
Fix for other system we don't know but should run without problem.
Refresh inventory when opening it
Do not use rare pokemon to xp
Fix an issue when use_lucky_egg=true and evolve_only_with_lucky_egg=false
Save web inventory after refresh
Add parameter evolve_time default to 20.
Rename parameter use_candies_for_xp in evolve_for_xp
Rename parameter minimum_evolve_for_lucky_egg in evolve_count_for_lucky_egg
Rename parameter use_lucky_egg in may_use_lucky_egg
Add 1 percent rule = Do not use rare pokemon candies for xp
Handle lucky egg already active case
Plan bad Eevees for transfer if evolve is deactivated
Enhances PokemonGoF#2193
minimum delay is 2 seconds
added action_delay when changing ball or using razzberry
added settings for all catch related sleeps
clean up import
All of the bot's API requests go through tor
you gotta link if you want to reference
typo
Config now only needs one catch related worker. All catch related config including option to catch lured and/or visible can be kept with the task.
Removed an update procedure that was making the map not to work.
Modified Windows installation instructions to use the batch files.
Added links for the configuration instructions. Still missing links for the encrypt files. Need help on it.
Recreated the installations instructions for Windows.
Removed the need to download PyYAML and modified the instructions to download only the required encrypt files.
Removed the requirement to download PyYAML as the installer already downloads it during git pull. Also removed the requirement to download all encrypt files.
Added a pause in the end so the promp wont close in the end if
pokecli.pygoes to error.Added a procedure to deal with the installation path issue. Also, added a command to install protobuff automatically.
Removed the requirement to install protobuff as it will be installed automatically by the install batch.
Removed the requirement for protoc and added command line to download it.
Updated in order to work anywhere as long its inside the windows_bat folder
This reverts commit 856a0fd.
This reverts commit a459a86.
This reverts commit 510570d.
This reverts commit 9db2798.
Conflicts:
windows_bat/PokemonGo-Bot-Install.bat
We can now choose an install location and all required software is
automatically installed.
Added new contributors
This reverts commit a1d364c.
to solve issue PokemonGoF#4142
All of the bot's API requests go through tor
you gotta link if you want to reference
Including example command for using the alternate tor proxy command. Additionally changed line 114 to down rather than rm so that the containers are stopped before they are removed in the case that the containers were launched in detached mode.
,at line 112 (Remove,at line 112 PokemonGoF/PokemonGo-Bot#4171)Fixes indent