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.

Sign up for GitHub

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

Jump to bottom

Restore vip functionality #5502

Merged
merged 8 commits into from
Sep 17, 2016
Merged

Restore vip functionality #5502

merged 8 commits into from
Sep 17, 2016

Commits on Sep 17, 2016

  1. Fixed VIP and pokemon catch rules logic

    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    ca73c8b View commit details
    Browse the repository at this point in the history

  2. Minor tweak 

    If catch_above_cp (or other rule) set to 0, was not returning true.
    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    fc8c2a9 View commit details
    Browse the repository at this point in the history

  3. Turned off debug

    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    1ee1872 View commit details
    Browse the repository at this point in the history

  4. Set different defaults based on catch logic or, and, andor, orand

    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    a8d83eb View commit details
    Browse the repository at this point in the history

  5. Added back functionality 

    Accidentally removed this while bugfixing. Now that
_pokemon_matches_config works correctly, it can go back.
    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    715ace5 View commit details
    Browse the repository at this point in the history

  6. Fixed conflicts 

    # Conflicts:
#	pokemongo_bot/cell_workers/pokemon_catch_worker.py
    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    ae58209 View commit details
    Browse the repository at this point in the history

  7. Fixed more conflicts

    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    e4ca9a0 View commit details
    Browse the repository at this point in the history

  8. Added back matches_config logic

    @Gobberwart
    Gobberwart committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    96faddb View commit details
    Browse the repository at this point in the history