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

Doubles support #51

Closed
wants to merge 81 commits into from
Closed

Doubles support #51

wants to merge 81 commits into from

Commits on May 20, 2020

  1. Create a draft of AbstractBattle

    @szymonWojdat
    szymonWojdat committed May 20, 2020
    Configuration menu
    Copy the full SHA
    e5191ac View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Merge remote-tracking branch 'upstream/master' into doubles-support

    @szymonWojdat
    szymonWojdat committed May 24, 2020
    Configuration menu
    Copy the full SHA
    e1050fa View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Move generic logic from Battle to AbstractBattle

    @szymonWojdat
    szymonWojdat committed May 27, 2020
    Configuration menu
    Copy the full SHA
    af74803 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Remove unused pyre-ignore (x2) from abstract_battle.py

    @szymonWojdat
    szymonWojdat committed May 28, 2020
    Configuration menu
    Copy the full SHA
    74cb63b View commit details
    Browse the repository at this point in the history

  2. Create DoubleBattle class

    @szymonWojdat
    szymonWojdat committed May 28, 2020
    Configuration menu
    Copy the full SHA
    77ef20e View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Move singles-related logic from AbstractBattle to Battle, adapt it fo… 

    …r doubles in DoubleBattle
    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    5a2d8d2 View commit details
    Browse the repository at this point in the history

  2. Move.target documentation

    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ca9b630 View commit details
    Browse the repository at this point in the history

  3. Fix flake8 errors in double_battle.py

    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    5528219 View commit details
    Browse the repository at this point in the history

  4. Fix flake8 errors in double_battle.py (p2)

    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    501beb0 View commit details
    Browse the repository at this point in the history

  5. Move can_dynamax() and opponent_can_dynamax() from AbstractBattle to … 

    …children classes
    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    007418e View commit details
    Browse the repository at this point in the history

  6. Fix return type documentation in double_battle.py

    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    3e1e601 View commit details
    Browse the repository at this point in the history

  7. Fix bug in AbstractBattle.(opponent_)dynamax_turns_left

    @szymonWojdat
    szymonWojdat committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    0ab1cf5 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Merge branch 'master' into doubles-support

    @szymonWojdat
    szymonWojdat committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    4a0e885 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. Add abstract_battle and double_battle to environment.__init__.py

    @szymonWojdat
    szymonWojdat committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    8854b11 View commit details
    Browse the repository at this point in the history

  2. Integrate Player class with AbstractBattle/Battle/DoubleBattle

    @szymonWojdat
    szymonWojdat committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    d0872d2 View commit details
    Browse the repository at this point in the history

  3. Fix bug in Pokemon class - initialize _item as None

    @szymonWojdat
    szymonWojdat committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    e8643e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Fix test_baselines.py - monkey player.Battle with PseudoBattle

    @szymonWojdat
    szymonWojdat committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    32b4d7f View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  1. Add opponent_role and player_role computed properties to AbstractBattle

    @szymonWojdat
    szymonWojdat committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    a69b156 View commit details
    Browse the repository at this point in the history

  2. Implement DoubleBattle.get_possible_showdown_targets()

    @szymonWojdat
    szymonWojdat committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    5650ce4 View commit details
    Browse the repository at this point in the history

  3. Adapt Player.choose_random_move() for doubles [WIP]

    @szymonWojdat
    szymonWojdat committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    2af2429 View commit details
    Browse the repository at this point in the history

  4. Fix bug in DoubleBattle._parse_request() [WIP]

    @szymonWojdat
    szymonWojdat committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    51fbb1d View commit details
    Browse the repository at this point in the history

  5. Fix bug in DoubleBattle.opponent_active_pokemon

    @szymonWojdat
    szymonWojdat committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    a764942 View commit details
    Browse the repository at this point in the history

  6. Break line in double_battle.py

    @szymonWojdat
    szymonWojdat committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    33302da View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Adjust styling using black

    @szymonWojdat
    szymonWojdat committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    2e210c9 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. Use DoubleBattle class attributes to handle pokemon battle positions

    @szymonWojdat
    szymonWojdat committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    474c930 View commit details
    Browse the repository at this point in the history

  2. Adapt EnvPlayer and TrainablePlayer to AbstractBattle/Battle split

    @szymonWojdat
    szymonWojdat committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    6ebc114 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

  1. Reset pokemon.active for each ally pokemon at each request

    @szymonWojdat
    szymonWojdat committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    50251b4 View commit details
    Browse the repository at this point in the history

  2. Reformat double_battle.py code for better readability

    @szymonWojdat
    szymonWojdat committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    c8724a3 View commit details
    Browse the repository at this point in the history

  3. Fix bug: incorrect fetch of spread-move-user-dynamax-partner's move t… 

    …argets
    @szymonWojdat
    szymonWojdat committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    fd981ab View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. Fix bug: max guard target selection

    @szymonWojdat
    szymonWojdat committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    94e9897 View commit details
    Browse the repository at this point in the history

  2. Rename DoubleBattle.ALL_TARGETS_POSITION to EMPTY_TARGET_POSITION

    @szymonWojdat
    szymonWojdat committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    22892fa View commit details
    Browse the repository at this point in the history

  3. Fix bug: clear alpha characters from max hp string in Pokemon._set_hp… 

    …_status()
    @szymonWojdat
    szymonWojdat committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    bd961ba View commit details
    Browse the repository at this point in the history

  4. Make a pokemon inactive right after it faints

    @szymonWojdat
    szymonWojdat committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    d984307 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Fix bug: DoubleBattle.active_pokemon order mish-mash

    @szymonWojdat
    szymonWojdat committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    2c019b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. Simplify DoubleBattle.get_possible_showdown_targets(), remove _get_po… 

    …kemon_id_for_move()
    @szymonWojdat
    szymonWojdat committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    f2b7555 View commit details
    Browse the repository at this point in the history

  2. Add docs to DoubleBattle.get_possible_showdown_targets()

    @szymonWojdat
    szymonWojdat committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    f01d4f2 View commit details
    Browse the repository at this point in the history

  3. Fix clarity of conditionals within DoubleBattle.get_possible_showdown… 

    …_targets()
    @szymonWojdat
    szymonWojdat committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    c49d53f View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Fix special moves bug in DoubleBattle.get_possible_showdown_targets()

    @szymonWojdat
    szymonWojdat committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    7e5e837 View commit details
    Browse the repository at this point in the history

  2. Fix bug in Player.choose_random_move() - getting active pokemon

    @szymonWojdat
    szymonWojdat committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    ee27edb View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Fix swapboost bug in AbstractBattle._parse_message()

    @szymonWojdat
    szymonWojdat committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    18ccb0d View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. Only return non-fainted Pokemon at DoubleBattle.active_pokemon

    @szymonWojdat
    szymonWojdat committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    b2c105b View commit details
    Browse the repository at this point in the history

  2. Make DoubleBattle.available_switches store info for each active mon

    @szymonWojdat
    szymonWojdat committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    8b7500a View commit details
    Browse the repository at this point in the history

  3. Fix typing issues for AbstractBattle._available_switches

    @szymonWojdat
    szymonWojdat committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    5eb994e View commit details
    Browse the repository at this point in the history

  4. Fix DoubleBattle.can_z_move related bug in Player.choose_random_move()

    @szymonWojdat
    szymonWojdat committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    db8b40d View commit details
    Browse the repository at this point in the history

  5. Fix Pokemon.__str__()

    @szymonWojdat
    szymonWojdat committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    a5d279a View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. add ordered access to opp active pokemon and implement slot swapping … 

    …(through ally switch) for doubles
    @dmizr
    dmizr committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    baa32aa View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2020

  1. Merge pull request #1 from dmizr/doubles-support-dmizr 

    Ordered opp active and ally switch slot switching implementation
    @szymonWojdat
    szymonWojdat committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    76db146 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. Merge remote-tracking branch 'origin/doubles-support' into doubles-su… 

    …pport

# Conflicts:
#	src/poke_env/environment/double_battle.py
    @szymonWojdat
    szymonWojdat committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    083956a View commit details
    Browse the repository at this point in the history

  2. Don't raise error if no active pokemon are found (singles)

    @szymonWojdat
    szymonWojdat committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    ef639af View commit details
    Browse the repository at this point in the history

  3. Don't raise error if no active pokemon are found (singles) - pt. 2

    @szymonWojdat
    szymonWojdat committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    d96335f View commit details
    Browse the repository at this point in the history

  4. Fix circleci cache management

    @szymonWojdat
    szymonWojdat committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    5c0ccc9 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. Fix Ghost-type Curse targets

    @szymonWojdat
    szymonWojdat committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    225870a View commit details
    Browse the repository at this point in the history

  2. Fix Curse for Normal types

    @szymonWojdat
    szymonWojdat committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    e7c8c81 View commit details
    Browse the repository at this point in the history

  3. DoubleBattle.active_pokemon and opponent_active_pokemon can now retur… 

    …n 2x None
    @szymonWojdat
    szymonWojdat committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    8f737be View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2020

  1. Populate DoubleBattle._active_pokemon when parsing request

    @szymonWojdat
    szymonWojdat committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    3137903 View commit details
    Browse the repository at this point in the history

  2. Fix bug in populating DoubleBattle._active_pokemon when parsing request

    @szymonWojdat
    szymonWojdat committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    55905aa View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Assign _player_role before populating _active_pokemon in DoubleBattle… 

    …._parse_request()
    @szymonWojdat
    szymonWojdat committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    4c408e3 View commit details
    Browse the repository at this point in the history

  2. Add tests for DoubleBattle

    @szymonWojdat
    szymonWojdat committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    39d40f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Update cache version, just in case it fails the build

    @szymonWojdat
    szymonWojdat committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    5954e93 View commit details
    Browse the repository at this point in the history

  2. Add more tests for DoubleBattle

    @szymonWojdat
    szymonWojdat committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    0e5004c View commit details
    Browse the repository at this point in the history

  3. Add tests for DoubleBattle.get_possible_showdown_targets()

    @szymonWojdat
    szymonWojdat committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    5789c3c View commit details
    Browse the repository at this point in the history

  4. Add more tests for DoubleBattle.get_possible_showdown_targets()

    @szymonWojdat
    szymonWojdat committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    bf82a21 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2020

  1. Fix bug with DoubleBattle._end_illusion()

    @szymonWojdat
    szymonWojdat committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    b18e7f8 View commit details
    Browse the repository at this point in the history

  2. Implement test_end_illusion for DoubleBattle

    @szymonWojdat
    szymonWojdat committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    91220ed View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. Add doubles-related effects (thanks @dmizr)

    @szymonWojdat
    szymonWojdat committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    59a8389 View commit details
    Browse the repository at this point in the history

  2. Add tests for Battle._end_illusion()

    @szymonWojdat
    szymonWojdat committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    47f0768 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2020

  1. Fix bug in Pokemon._mega_evolve()

    @szymonWojdat
    szymonWojdat committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    94d5e02 View commit details
    Browse the repository at this point in the history

  2. Add more test cases for Battle._parse_message()

    @szymonWojdat
    szymonWojdat committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    258cd98 View commit details
    Browse the repository at this point in the history

  3. Update Pokemon._species when updating Pokemon from Pokedex

    @szymonWojdat
    szymonWojdat committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    3a93e0b View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. Fix bug in handling "-swapboost" message

    @szymonWojdat
    szymonWojdat committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    747fc46 View commit details
    Browse the repository at this point in the history

  2. Test ally switch mechanics in doubles via _parse_message()

    @szymonWojdat
    szymonWojdat committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    10bdef3 View commit details
    Browse the repository at this point in the history

  3. Fix bug in Pokemon._transform() - copy stat boosts from target

    @szymonWojdat
    szymonWojdat committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    3881d08 View commit details
    Browse the repository at this point in the history

  4. Add more test cases of AbstractBattle._parse_message()

    @szymonWojdat
    szymonWojdat committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    2202742 View commit details
    Browse the repository at this point in the history

  5. Bump circleci cache version

    @szymonWojdat
    szymonWojdat committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    5921293 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. Fix a nasty, nasty silent bug in double_battle.py _parse_request()

    @szymonWojdat
    szymonWojdat committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    1e8d863 View commit details
    Browse the repository at this point in the history

  2. Fix bug in get_possible_showdown_targets()

    @szymonWojdat
    szymonWojdat committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    393e744 View commit details
    Browse the repository at this point in the history

  3. Break up docstrings in exceptions.py because flake is failing in CI f… 

    …or some reason
    @szymonWojdat
    szymonWojdat committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    e21e8a7 View commit details
    Browse the repository at this point in the history

  4. Add tests for Player.choose_random_move() - for doubles

    @szymonWojdat
    szymonWojdat committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    578d41b View commit details
    Browse the repository at this point in the history

  5. Append mega/primal species string only if it hasn't been appended yet… 

    …. Needed bc Pokemon._update_from_pokedex() updates self._species since recently.
    @szymonWojdat
    szymonWojdat committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    cde3b85 View commit details
    Browse the repository at this point in the history

  6. Bump circleci cache version just in case

    @szymonWojdat
    szymonWojdat committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    52c0963 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2020

  1. Merge branch 'feature-add-doubles' into doubles-support

    @hsahovic
    hsahovic committed Sep 13, 2020
    Configuration menu
    Copy the full SHA
    630e39a View commit details
    Browse the repository at this point in the history