Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev merge to master, PR #4178

Merged
merged 41 commits into from
Aug 17, 2016
Merged

Dev merge to master, PR #4178

merged 41 commits into from
Aug 17, 2016

Commits on Aug 16, 2016

  1. Do not spin fort on timeout when restarting the bot (#3931)

    Fix bot stuck between forts when inventory is full
    julienlavergne authored and TheSavior committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    c1743c9 View commit details
    Browse the repository at this point in the history
  2. Fixed references to self.bot.config.walk (#4046)

    * Fixed error
    
    * Fixed error
    mjmadsen authored and TheSavior committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    ad32f1d View commit details
    Browse the repository at this point in the history
  3. Updating run.sh and install.sh (#4033)

    * Update run.sh
    
    * Update setup.sh
    
    * Update setup.sh
    
    * Update setup.sh
    simonsmh authored and TheSavior committed Aug 16, 2016
    3 Configuration menu
    Copy the full SHA
    6fa57fe View commit details
    Browse the repository at this point in the history
  4. Fixing typo

    TheSavior committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    7d0da5a View commit details
    Browse the repository at this point in the history
  5. Added heartbeat threshold, it's not reasonable to send heartbeat to s…

    …erver every second. (#4058)
    
    * Added heartbeat threshold, it's not reasonable to send heartbeat to server every second.
    
    * Added example in config.
    solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    91aea57 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f2853ff View commit details
    Browse the repository at this point in the history
  7. heartbeat_threshold using time delta (#4095)

    * changed hearbeat threshold to work on a delta time
    
    * renamed variable for clarity
    
    * tidy up
    Quantra authored and solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    0c5da81 View commit details
    Browse the repository at this point in the history
  8. 1 Configuration menu
    Copy the full SHA
    46c1b28 View commit details
    Browse the repository at this point in the history
  9. try to fix system platform in init.py (#4068)

    Fix for other system we don't know but should run without problem.
    simonsmh authored and solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    2825452 View commit details
    Browse the repository at this point in the history
  10. 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
    julienlavergne authored and solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    c80dc40 View commit details
    Browse the repository at this point in the history
  11. 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
    Alex Yao authored and TheSavior committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    2dd8a5e View commit details
    Browse the repository at this point in the history
  12. MoveToMapPokemon: Replacing min_time with reachable distance calculat…

    …ion (#4022)
    
    * * replacing min_time functionality of MoveToMapPokemon by a more sophisticated way of determining reachability on time
    
    * * fixing #3609
    
    * moving config values to top
    mvrska authored and TheSavior committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    e6c8f53 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    64c7575 View commit details
    Browse the repository at this point in the history
  14. 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
    Quantra authored and BriceSD committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    abb8570 View commit details
    Browse the repository at this point in the history
  15. re-Wording followPath to more readable, recycle_items.should_run shou…

    …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
    fake-or-dead authored and solderzzc committed Aug 16, 2016
    1 Configuration menu
    Copy the full SHA
    e68c2e8 View commit details
    Browse the repository at this point in the history
  16. 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
    Matthew Crowson authored and solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    20491b0 View commit details
    Browse the repository at this point in the history
  17. Update setup.sh (#4117)

    jonhkr authored and solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    8dc5e63 View commit details
    Browse the repository at this point in the history
  18. Update run.sh (#4123)

    typo
    simonsmh authored and solderzzc committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    488a037 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    86994d4 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Configuration menu
    Copy the full SHA
    e98b52c View commit details
    Browse the repository at this point in the history
  2. 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
    Quantra authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    805930d View commit details
    Browse the repository at this point in the history
  3. User configurable delay when spinning fort (#4109)

    * user configurable delay for spin fort
    
    * replaced time.sleep(2) with configurable delay
    
    * updated configs
    Quantra authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8a7580e View commit details
    Browse the repository at this point in the history
  4. 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
    mvrska authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    ad91ac7 View commit details
    Browse the repository at this point in the history
  5. Showing detailed sleep info (#4066)

    cmezh authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    7cb32e3 View commit details
    Browse the repository at this point in the history
  6. 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.
    danielsdian authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8e40230 View commit details
    Browse the repository at this point in the history
  7. 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
    Quantra authored and solderzzc committed Aug 17, 2016
    2 Configuration menu
    Copy the full SHA
    7136348 View commit details
    Browse the repository at this point in the history
  8. Update update_live_stats.py (#3985)

    Kassadd authored and TheSavior committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    3d5e270 View commit details
    Browse the repository at this point in the history
  9. SQLite backend for bot/plugin use (#4129)

    * Initial attempt at implementing an SQLite backend for plugin use
    
    * Fixed attribute error when accessing DB
    cwild authored and brantje committed Aug 17, 2016
    2 Configuration menu
    Copy the full SHA
    41d5628 View commit details
    Browse the repository at this point in the history
  10. Patch snipey in move_to_map_pokemon.py (#4146)

    to solve issue #4142
    Gurzeh authored and brantje committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    0233882 View commit details
    Browse the repository at this point in the history
  11. Add files via upload (#4151)

    RedViper9 authored and brantje committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    a940e54 View commit details
    Browse the repository at this point in the history
  12. fix example config

    rawgni committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    6181839 View commit details
    Browse the repository at this point in the history
  13. fix config file

    rawgni committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8baa4c9 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    332aec5 View commit details
    Browse the repository at this point in the history
  15. Update json-validate.py

    rawgni committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    a96c18e View commit details
    Browse the repository at this point in the history
  16. 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.
    Matthew Crowson authored and douglascamata committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    4df7d6e View commit details
    Browse the repository at this point in the history
  17. Remove , at line 112 (#4171)

    thanhson1085 authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    e253db1 View commit details
    Browse the repository at this point in the history
  18. Merge branch 'fix-example-config' of https://github.com/rawgni/Pokemo…

    …nGo-Bot into rawgni-fix-example-config
    solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    0768ae8 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    0c010fb View commit details
    Browse the repository at this point in the history
  20. Minor config fix (#4173)

    Fixes indent
    Bashin authored and solderzzc committed Aug 17, 2016
    4 Configuration menu
    Copy the full SHA
    181fba5 View commit details
    Browse the repository at this point in the history
  21. 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
    umbreon222 authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    96bdbb6 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    6af2c32 View commit details
    Browse the repository at this point in the history