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

[Bug] Refactor moves that call a random move (Metronome, Assist, Sleep Talk, Copycat, Mirror Move) #3380

Open
wants to merge 59 commits into
base: beta
Choose a base branch
from
Open

[Bug] Refactor moves that call a random move (Metronome, Assist, Sleep Talk, Copycat, Mirror Move) #3380

wants to merge 59 commits into from

Commits on Aug 6, 2024

  1. Combines moveset from allies and uses it to get a move

    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    bd60de6 View commit details
    Browse the repository at this point in the history

  2. Clearer implementation of combining user and teammates' moves

    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ad26883 View commit details
    Browse the repository at this point in the history

  3. Refactor assist and sleep talk to use metronome's attribute for calli… 

    …ng a move
    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    f9bd2df View commit details
    Browse the repository at this point in the history

  4. Refactors move filtering in RandomMovesetMoveAttr, creates arrays wit… 

    …h invalid moves for assist/sleep talk
    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    8352f1a View commit details
    Browse the repository at this point in the history

  5. Refactors RandomMoveAttr to set moveId in condition, places reused co… 

    …de in callMove in RandomMoveAttr
    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    d712c3f View commit details
    Browse the repository at this point in the history

  6. Cherrypicks due to beta branch issue

    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    67a04e1 View commit details
    Browse the repository at this point in the history

  7. Corrects invalid move lists, adds Max/Z moves to metronome's list

    @schmidtc1
    schmidtc1 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    e10ed43 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Merge branch 'beta' into assistbug2

    @Tempo-anon
    Tempo-anon authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    86b9f88 View commit details
    Browse the repository at this point in the history

  2. Removes ignoresVirtual from beta merge

    @schmidtc1
    schmidtc1 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    c1d018e View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge branch 'beta' into assistbug2

    @schmidtc1
    schmidtc1 authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    e66b75a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in… 

    …to assistbug2
    @schmidtc1
    schmidtc1 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    42ec629 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue i… 

    …nto assistbug2
    @schmidtc1
    schmidtc1 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    040a877 View commit details
    Browse the repository at this point in the history

  4. Attempts to resolve merge conflicts

    @schmidtc1
    schmidtc1 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    eb1d071 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Removes Max/Z moves per frutescens' comment

    @schmidtc1
    schmidtc1 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    df5da77 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Merge branch 'beta' into assistbug2

    @schmidtc1
    schmidtc1 authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    e588c14 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in… 

    …to assistbug2
    @schmidtc1
    schmidtc1 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    15ff2c7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue i… 

    …nto assistbug2
    @schmidtc1
    schmidtc1 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    b854a37 View commit details
    Browse the repository at this point in the history

  4. Fixes bug with metronome/copycat/assist/sleep talk targeting ally

    @schmidtc1
    schmidtc1 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    1e64ef0 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Experimental async/await to be tested

    @schmidtc1
    schmidtc1 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    70dcc75 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Refactors other attributes to extend CallMoveAttr

    @schmidtc1
    schmidtc1 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    fbb2a44 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Merge branch 'beta' into assistbug2

    @DayKev
    DayKev authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4c9bcdc View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in… 

    …to assistbug2
    @schmidtc1
    schmidtc1 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    d874f98 View commit details
    Browse the repository at this point in the history

  2. Replaces QueuedMove with TurnMove, refactors to attempt two-turn move… 

    … fix for metronome
    @schmidtc1
    schmidtc1 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    714211d View commit details
    Browse the repository at this point in the history

  3. Update src/data/move.ts 

    Co-authored-by: NightKev <[email protected]>
    @schmidtc1 @DayKev
    schmidtc1 and DayKev authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    85c6a49 View commit details
    Browse the repository at this point in the history

  4. Fix Swallow test due to TurnMove refactor

    @schmidtc1
    schmidtc1 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    364e4cd View commit details
    Browse the repository at this point in the history

  5. Further fixes for TurnMove refactor

    @schmidtc1
    schmidtc1 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    bfef09e View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Fixes metronome two turn moves for enemy pokemon

    @schmidtc1
    schmidtc1 committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    ae0504b View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Merge beta and fix conflicts

    @schmidtc1
    schmidtc1 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    0008881 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Replaces nested ternary with if-else block per DayKev's comment

    @schmidtc1
    schmidtc1 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    6c656d8 View commit details
    Browse the repository at this point in the history

  2. Clarity in if statement

    @schmidtc1
    schmidtc1 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    68ecc3d View commit details
    Browse the repository at this point in the history

  3. Revert clarity change due to causing bug with move selection

    @schmidtc1
    schmidtc1 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    76dba4c View commit details
    Browse the repository at this point in the history

  4. Minor fixes

    @schmidtc1
    schmidtc1 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f86b348 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta' into assistbug2

    @schmidtc1
    schmidtc1 authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c42b9da View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Merge beta into assistbug2

    @schmidtc1
    schmidtc1 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    56ea4be View commit details
    Browse the repository at this point in the history

  2. Adjust command phase args handling

    @schmidtc1
    schmidtc1 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9c60d1d View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Merge branch 'beta' into assistbug2

    @schmidtc1
    schmidtc1 authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    259f06c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Creates metronome test, refactors RandomMoveAttr for easier testing

    @schmidtc1
    schmidtc1 committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    6b5436f View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Adds unit test for recharge moves

    @schmidtc1
    schmidtc1 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e37805d View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Refactors Copycat and Mirror Move, adjusts move targeting

    @schmidtc1
    schmidtc1 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    3206fa8 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Adds unit test for ally targeting with Aromatic Mist

    @schmidtc1
    schmidtc1 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    3c209f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Merge beta into assistbug2 and fix conflicts

    @schmidtc1
    schmidtc1 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    dfdbe13 View commit details
    Browse the repository at this point in the history

  2. eslint fixes

    @schmidtc1
    schmidtc1 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    0ac69d1 View commit details
    Browse the repository at this point in the history

  3. Adds tests for secondary effects and recharge moves for metronome

    @schmidtc1
    schmidtc1 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    931025d View commit details
    Browse the repository at this point in the history

  4. Add test for Roar, remove test for Acupressure

    @schmidtc1
    schmidtc1 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    463f86f View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in… 

    …to assistbug2
    @schmidtc1
    schmidtc1 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    a509842 View commit details
    Browse the repository at this point in the history

  2. Creates test for Assist

    @schmidtc1
    schmidtc1 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b1fb1bd View commit details
    Browse the repository at this point in the history

  3. Adds test for assist failing

    @schmidtc1
    schmidtc1 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    fb29682 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in… 

    …to assistbug2
    @schmidtc1
    schmidtc1 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c9a4e88 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in… 

    …to assistbug2
    @schmidtc1
    schmidtc1 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    25e4037 View commit details
    Browse the repository at this point in the history

  2. Adds sleep talk unit test coverage

    @schmidtc1
    schmidtc1 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    ce717b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'beta' into assistbug2

    @DayKev
    DayKev committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    33809f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. Merge beta and resolve conflicts

    @schmidtc1
    schmidtc1 committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    df04e31 View commit details
    Browse the repository at this point in the history

  2. Adjusts move-phase to better track last move for copycat, writes and … 

    …updates unit tests for assist/copycat
    @schmidtc1
    schmidtc1 committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    29c7629 View commit details
    Browse the repository at this point in the history

  3. Creates moveHistory in Battle to track all moves used, adjusts mirror… 

    … move to use this, writes unit tests
    @schmidtc1
    schmidtc1 committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    365e77d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta' into assistbug2

    @schmidtc1
    schmidtc1 authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    83bafbe View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. Corrects mirror move implementation, rewrite unit test to adjust

    @schmidtc1
    schmidtc1 committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    468275b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue i… 

    …nto assistbug2
    @schmidtc1
    schmidtc1 committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    7d15533 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge changes and resolve conflicts

    @schmidtc1
    schmidtc1 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    77c9fb0 View commit details
    Browse the repository at this point in the history

  2. Attempt to fix merge conflicts

    @schmidtc1
    schmidtc1 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    c229371 View commit details
    Browse the repository at this point in the history