Dev merge to master, PR #4439
Merged
Dev merge to master, PR #4439
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
Fix bot stuck between forts when inventory is full
* Fixed error * Fixed error
* Update run.sh * Update setup.sh * Update setup.sh * Update setup.sh
…erver every second. (#4058) * Added heartbeat threshold, it's not reasonable to send heartbeat to server every second. * Added example in config.
* changed hearbeat threshold to work on a delta time * renamed variable for clarity * tidy up
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
* 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
* 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
…ld 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 All of the bot's API requests go through tor * links privoxy you gotta link if you want to reference * keep privoxy up too
* 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 for spin fort * replaced time.sleep(2) with configurable delay * updated configs
* * 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
* 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.
* 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
* Initial attempt at implementing an SQLite backend for plugin use * Fixed attribute error when accessing DB
to solve issue #4142
missing from #4285
Missing move
…4313) Make sure optimizer try its best to reach the minimum evolve count if we want to use lucky eggs Do not transfer favorite pokemon and pokemon in fort Add database logging stuff Update pokemon optimizer config example Update pokemon.json
* To fix CI build in api_wraper.py * added self.config is none to make CI happy.
* revert some unexpected changes * added default argument to constructor to fix CI issue * fixing wrong default value & added config example * fixed alt issue and CI * changed default not to use noise
* Dev merge to master, PR (#4178) * 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 * Update pokemon.json (#4308) confirmed * Revert "Update pokemon.json" (#4315) * added Mud Slap to Diglett moveset
* reordered moves alphabetically * removed repeated line
* bugfix for polyline * leftovers * changed default value of pokecli config aswell * added fix for #4250 * fixed spiral aswell * original current and last are wrong... * seems it was ok, reverted partly... * upside down * changed message * cleanup & polyline support for move_to_fort * fixed default conf to StepWalker
* Transfert pokemon only when we don't have free slots * Update configuration file * Added tip * Typo
* Added PokemonBag to UpdateLiveInventory * Added documentation
It was not possible to execute the script with './'.
* bugfix for polyline * leftovers * changed default value of pokecli config aswell * added fix for #4250 * fixed spiral aswell * original current and last are wrong... * seems it was ok, reverted partly... * upside down * changed message * cleanup & polyline support for move_to_fort * fixed default conf to StepWalker * fixed ValueError issue
Added FollowPath and UpdateLiveStats description. The UpdateLiveStats options are taken from the source code.
* Ban Notifications (Slack) PokemonCatchWorker * Update requirements.txt (slack notif) * Update pokemon_catch_worker.py * spin_fort.py slack notifcations * Update config.json.cluster.example * Update config.json.example * Update config.json.map.example * Update config.json.optimizer.example * Update config.json.path.example * Update config.json.pokemon.example * pokecli.py slack variable * Update pokecli.py * Update pokemon_catch_worker.py * Update spin_fort.py * Update pokecli.py
- Add parameter `candy` to `pokemon_evolved` event. - Fix PokemonOptimizer evolve problem with `pokemon_evolved` event. - EvolvePokemon now correctly updates inventory even if evolve_log fails. - EvolvePokemon now emits evolved event with xp & candy.
* Minor update/fix * Fixed bad function call at update_live_inventory.py * Fixed 'Total eggs' only show not incubating eggs * Updated configuration file * Small fix * Small fix * Minor fix * Fixed typo mistake
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.
No description provided.