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 #4952

Merged
merged 46 commits into from
Aug 30, 2016
Merged

Dev merge to master #4952

merged 46 commits into from
Aug 30, 2016

Commits on Aug 28, 2016

  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
    Gobberwart authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    6c9f865 View commit details
    Browse the repository at this point in the history
  2. Changed ) to } (#4845)

    Fixed an faulty character
    LuckyMe4Evers authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    2832a37 View commit details
    Browse the repository at this point in the history
  3. fix incubator logic (#4848)

    rawgni authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    d896a80 View commit details
    Browse the repository at this point in the history
  4. corrected logic to respect snipe = true

    Dmitri Barski committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    af985e8 View commit details
    Browse the repository at this point in the history
  5. Update configuration_files.md (#4854)

    askovpen authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    6acdc53 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5a1e246 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4dd28e3 View commit details
    Browse the repository at this point in the history
  8. dont forget to update the docs when adding config changes... (#4856)

    * dont forget to update the docs when adding config changes...
    
    * reflect config changes....
    nivong authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    f1fe942 View commit details
    Browse the repository at this point in the history
  9. please keep this as is (#4859)

    Add stuff in the right order.
    nivong authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    f6775cc View commit details
    Browse the repository at this point in the history
  10. Clarify Max_distance for Sniping (#4858)

    * Clarify Max_distance
    
    * Added distance unit and updated configuration_files.md
    Jasperrr91 authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    1b90f3f View commit details
    Browse the repository at this point in the history
  11. - debug improvements for MoveToMap (#4860)

    - fix for Telegram to accept "@username" as "master", too, along with numeric  IDs
    DBa2016 authored and mjmadsen committed Aug 28, 2016
    3 Configuration menu
    Copy the full SHA
    a01f4dd View commit details
    Browse the repository at this point in the history
  12. Fixes catch rates. (#4863)

    Jasperrr91 authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    18d7589 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    007f02a View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ec35ab2 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e43f8f9 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2016

  1. Merge pull request #4874 from DBa2016/dev

    Implemented more granular parameters for Telegram notifications
    Gobberwart authored Aug 29, 2016
    Configuration menu
    Copy the full SHA
    a388c10 View commit details
    Browse the repository at this point in the history
  2. 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.
    Gobberwart authored and mjmadsen committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    dc31c8d View commit details
    Browse the repository at this point in the history
  3. 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
    DeXtroTip authored and mjmadsen committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    3ebabfb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6da3d13 View commit details
    Browse the repository at this point in the history
  5. add some sanitycheck (#4891)

    rawgni authored and mjmadsen committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    de572e2 View commit details
    Browse the repository at this point in the history
  6. 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
    rawgni authored and mjmadsen committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    9c6cec4 View commit details
    Browse the repository at this point in the history
  7. 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
    walkerlee authored and mjmadsen committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    b81aaeb View commit details
    Browse the repository at this point in the history
  8. Call level_up_rewards on exp changes/Some pep-8 (#4896)

    * Call level_up_rewards on exp changes.
    
    * Cleanup
    sohje authored and mjmadsen committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    431a628 View commit details
    Browse the repository at this point in the history
  9. 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
    mjmadsen authored Aug 29, 2016
    Configuration menu
    Copy the full SHA
    5eb9fb2 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2016

  1. 2000 pokestop in 24h limit (#4906)

    * 2000 pokestop in 24h limit
    
    * 2000 pokestop in 24h limit
    
    * add config variable
    
    * config update
    askovpen authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    a0812c1 View commit details
    Browse the repository at this point in the history
  2. 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
    alexyaoyang authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    48e507b View commit details
    Browse the repository at this point in the history
  3. 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
    Gobberwart authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    734a0a3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d7cf555 View commit details
    Browse the repository at this point in the history
  5. add telegram check messages interval (#4919)

    * add telegram check messages interval
    
    * config changed
    
    * fix config
    
    * telegram doc update
    askovpen authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    94c4343 View commit details
    Browse the repository at this point in the history
  6. Add documentation (#4921)

    See documentation for full list of new features
    anakin5 authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    d56ffb5 View commit details
    Browse the repository at this point in the history
  7. documented docker for the auth.json use case (#4922)

    add instructions for the docker run command for the multiple config files use case.
    th3w4y authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    56a0d11 View commit details
    Browse the repository at this point in the history
  8. Fix for #4718 (#4924)

    * Add except variable
    
    * Add except variable
    mjmadsen authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    daca13f View commit details
    Browse the repository at this point in the history
  9. Fix filter (#4925)

    mjmadsen authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    3323a75 View commit details
    Browse the repository at this point in the history
  10. improve docker pull speed (#4899)

    walkerlee authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    85545e5 View commit details
    Browse the repository at this point in the history
  11. Update inventory.py (#4928)

    FIX: #4926
    sohje authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    9e81c6e View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    5858a02 View commit details
    Browse the repository at this point in the history
  13. Catch exception telegram.error.NetworkError.

    Fixs some pylint complain.
    solderzzc committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    47e1ddd View commit details
    Browse the repository at this point in the history
  14. Merge branch 'dev' into fix_exception_tbot_pylint

    Another pylint improve
    solderzzc committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    6de967a View commit details
    Browse the repository at this point in the history
  15. Merge pull request #4940 from PokemonGoF/fix_exception_tbot_pylint

    Catch exception telegram.error.NetworkError.
    solderzzc authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    1d68ec2 View commit details
    Browse the repository at this point in the history
  16. More config parameters for MoveToMap (#4937)

    * fixed a runtime error caused by incorrect imports
    
    * Moving module-level constants (snipe parameters) into config file
    DBa2016 authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    2ea7e3e View commit details
    Browse the repository at this point in the history
  17. Add experimental pokemon upgrade (power-up) logic (#4938)

    Add upgrade cost data file
    Add last pokemon level.
    anakin5 authored and mjmadsen committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    8c2d0a5 View commit details
    Browse the repository at this point in the history
  18. Set default value of skip_rounds to 30 since many people just use the…

    … default value.
    
    30 will behave close to human.
    solderzzc committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    28450ce View commit details
    Browse the repository at this point in the history
  19. Add exception handling for cached forts (#4943)

    * Add exception handling for cached forts
    
    * whitespace fix
    mjmadsen authored Aug 30, 2016
    Configuration menu
    Copy the full SHA
    8c6a578 View commit details
    Browse the repository at this point in the history
  20. 1 Configuration menu
    Copy the full SHA
    1d9c94c View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    c3a521c View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    8c74150 View commit details
    Browse the repository at this point in the history