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

Changes from 13 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
bd60de6
Combines moveset from allies and uses it to get a move
schmidtc1 Jul 19, 2024
ad26883
Clearer implementation of combining user and teammates' moves
schmidtc1 Jul 19, 2024
f9bd2df
Refactor assist and sleep talk to use metronome's attribute for calli…
schmidtc1 Jul 20, 2024
8352f1a
Refactors move filtering in RandomMovesetMoveAttr, creates arrays wit…
schmidtc1 Jul 23, 2024
d712c3f
Refactors RandomMoveAttr to set moveId in condition, places reused co…
schmidtc1 Jul 24, 2024
67a04e1
Cherrypicks due to beta branch issue
schmidtc1 Jul 25, 2024
e10ed43
Corrects invalid move lists, adds Max/Z moves to metronome's list
schmidtc1 Aug 6, 2024
86b9f88
Merge branch 'beta' into assistbug2
Tempo-anon Aug 7, 2024
c1d018e
Removes ignoresVirtual from beta merge
schmidtc1 Aug 7, 2024
e66b75a
Merge branch 'beta' into assistbug2
schmidtc1 Aug 26, 2024
42ec629
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…
schmidtc1 Aug 26, 2024
040a877
Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue i…
schmidtc1 Aug 26, 2024
eb1d071
Attempts to resolve merge conflicts
schmidtc1 Aug 26, 2024
df5da77
Removes Max/Z moves per frutescens' comment
schmidtc1 Aug 27, 2024
e588c14
Merge branch 'beta' into assistbug2
schmidtc1 Aug 28, 2024
15ff2c7
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…
schmidtc1 Aug 28, 2024
b854a37
Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue i…
schmidtc1 Aug 28, 2024
1e64ef0
Fixes bug with metronome/copycat/assist/sleep talk targeting ally
schmidtc1 Aug 28, 2024
70dcc75
Experimental async/await to be tested
schmidtc1 Aug 29, 2024
fbb2a44
Refactors other attributes to extend CallMoveAttr
schmidtc1 Aug 30, 2024
4c9bcdc
Merge branch 'beta' into assistbug2
DayKev Sep 6, 2024
d874f98
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…
schmidtc1 Sep 7, 2024
714211d
Replaces QueuedMove with TurnMove, refactors to attempt two-turn move…
schmidtc1 Sep 7, 2024
85c6a49
Update src/data/move.ts
schmidtc1 Sep 7, 2024
364e4cd
Fix Swallow test due to TurnMove refactor
schmidtc1 Sep 7, 2024
bfef09e
Further fixes for TurnMove refactor
schmidtc1 Sep 7, 2024
ae0504b
Fixes metronome two turn moves for enemy pokemon
schmidtc1 Sep 8, 2024
0008881
Merge beta and fix conflicts
schmidtc1 Sep 15, 2024
6c656d8
Replaces nested ternary with if-else block per DayKev's comment
schmidtc1 Sep 16, 2024
68ecc3d
Clarity in if statement
schmidtc1 Sep 16, 2024
76dba4c
Revert clarity change due to causing bug with move selection
schmidtc1 Sep 16, 2024
f86b348
Minor fixes
schmidtc1 Sep 16, 2024
c42b9da
Merge branch 'beta' into assistbug2
schmidtc1 Sep 16, 2024
56ea4be
Merge beta into assistbug2
schmidtc1 Sep 19, 2024
9c60d1d
Adjust command phase args handling
schmidtc1 Sep 19, 2024
259f06c
Merge branch 'beta' into assistbug2
schmidtc1 Sep 21, 2024
6b5436f
Creates metronome test, refactors RandomMoveAttr for easier testing
schmidtc1 Sep 22, 2024
e37805d
Adds unit test for recharge moves
schmidtc1 Sep 25, 2024
3206fa8
Refactors Copycat and Mirror Move, adjusts move targeting
schmidtc1 Sep 26, 2024
3c209f3
Adds unit test for ally targeting with Aromatic Mist
schmidtc1 Sep 29, 2024
dfdbe13
Merge beta into assistbug2 and fix conflicts
schmidtc1 Oct 4, 2024
0ac69d1
eslint fixes
schmidtc1 Oct 4, 2024
931025d
Adds tests for secondary effects and recharge moves for metronome
schmidtc1 Oct 4, 2024
463f86f
Add test for Roar, remove test for Acupressure
schmidtc1 Oct 4, 2024
a509842
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…
schmidtc1 Oct 10, 2024
b1fb1bd
Creates test for Assist
schmidtc1 Oct 10, 2024
fb29682
Adds test for assist failing
schmidtc1 Oct 10, 2024
c9a4e88
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…
schmidtc1 Oct 15, 2024
25e4037
Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…
schmidtc1 Oct 17, 2024
ce717b2
Adds sleep talk unit test coverage
schmidtc1 Oct 17, 2024
33809f4
Merge branch 'beta' into assistbug2
DayKev Oct 21, 2024
df04e31
Merge beta and resolve conflicts
schmidtc1 Oct 26, 2024
29c7629
Adjusts move-phase to better track last move for copycat, writes and …
schmidtc1 Oct 26, 2024
365e77d
Creates moveHistory in Battle to track all moves used, adjusts mirror…
schmidtc1 Oct 26, 2024
83bafbe
Merge branch 'beta' into assistbug2
schmidtc1 Oct 26, 2024
468275b
Corrects mirror move implementation, rewrite unit test to adjust
schmidtc1 Oct 27, 2024
7d15533
Merge branch 'assistbug2' of https://github.com/schmidtc1/pokerogue i…
schmidtc1 Oct 27, 2024
77c9fb0
Merge changes and resolve conflicts
schmidtc1 Oct 31, 2024
c229371
Attempt to fix merge conflicts
schmidtc1 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading