Commit Graph

4430 Commits

Author SHA1 Message Date
ImperialSympathizer
bb21de335f
Merge pull request #4237 from ben-lear/mystery-encounters
update ME tsdocs with links
2024-09-13 21:52:04 -04:00
ImperialSympathizer
1533af5b5d update ME tsdocs with links 2024-09-13 21:50:50 -04:00
ImperialSympathizer
6159d938b6
Merge pull request #4236 from ben-lear/mystery-encounters
update ME tsdocs with links
2024-09-13 21:45:18 -04:00
ImperialSympathizer
9ccb15ee8b update ME tsdocs with links 2024-09-13 21:44:43 -04:00
ImperialSympathizer
ae88966a11
Merge pull request #4235 from ben-lear/mystery-encounters
more ME nits
2024-09-13 21:12:21 -04:00
ImperialSympathizer
cc0220e30a more nits 2024-09-13 21:11:19 -04:00
ImperialSympathizer
2970ca530b
Merge pull request #4233 from ben-lear/mystery-encounters
MEs nits and money formatting
2024-09-13 21:05:28 -04:00
ImperialSympathizer
894d71631d more nits 2024-09-13 21:04:47 -04:00
ImperialSympathizer
550fe76eb1 fix money formatting and some nits 2024-09-13 21:03:26 -04:00
ImperialSympathizer
393b733cc9
Update src/ui/modifier-select-ui-handler.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-13 19:34:51 -04:00
ImperialSympathizer
f8f157a319
Merge pull request #4229 from ben-lear/mystery-encounters
Change how reroll button gets disabled in Modifier Shop Phase
2024-09-13 19:29:09 -04:00
ImperialSympathizer
d4565158b1 update continue button text logic 2024-09-13 19:28:05 -04:00
ImperialSympathizer
28dd929da2 Change how reroll button gets disabled in Modifier Shop Phase 2024-09-13 19:15:31 -04:00
ImperialSympathizer
d51f294c03
Merge pull request #4222 from ben-lear/mystery-encounters
fix unit test
2024-09-13 16:50:54 -04:00
ImperialSympathizer
e232fc0f52 fix unit test 2024-09-13 16:50:09 -04:00
ImperialSympathizer
36e3a0d2a9
Merge pull request #4221 from ben-lear/mystery-encounters
more PR feedback and update field trip with Rarer Candy
2024-09-13 16:45:48 -04:00
ImperialSympathizer
0e7f9dc723 more PR feedback and update field trip with Rarer Candy 2024-09-13 16:44:42 -04:00
ImperialSympathizer
282eee8dd8
Merge branch 'beta' into mystery-encounters 2024-09-13 13:40:32 -04:00
seanrmon
a085d3d416
[Bug] Fix for unpausing evolutions for secondary Pokémon in a fusion (#4007)
* [Bug] Cannot unpause evolutions for secondary Pokémon in fusion

* [Bug] Fusion Pokémon now inherit "Pause Evolutions" from both Pokémon

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-13 13:03:11 -04:00
ImperialSympathizer
45d6c68b89
Merge branch 'beta' into mystery-encounters 2024-09-13 12:53:07 -04:00
ImperialSympathizer
9aadcd8240
Merge pull request #4217 from ben-lear/mystery-encounters
Mystery encounters
2024-09-13 12:52:54 -04:00
Sion Kang
4dfcc96746
ci: Bump actions version (#2341)
* ci: Bump actions version

* Update .github/workflows/eslint.yml

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Update .github/workflows/eslint.yml

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-13 17:52:52 +01:00
ImperialSympathizer
9905464483 merge latest from beta 2024-09-13 12:52:30 -04:00
ImperialSympathizer
6ef8312f6a
Merge pull request #4216 from ben-lear/mystery-encounters
locales updates and bug fixes for safari zone
2024-09-13 12:49:03 -04:00
ImperialSympathizer
ce573629ab locales updates and bug fixes for safari zone 2024-09-13 12:48:23 -04:00
innerthunder
70295280da
[Move] Implement Substitute (#2559)
* Implement Substitute

Squashed commit from working branch

* Fix integration test imports

* Use Override Helper utils + Fix Baton Pass test

* Update src/test/moves/substitute.test.ts

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

* Fix test imports + nits

* Document RemoveAllSubstitutesAttr

* Fix some strict-null issues

* more strict-null fixes

* Fix baton pass test

* Reorganized Substitute translation keys

* Added checks for substitute in contact logic

* Clean up Unseen Fist contact logic

* Remove misleading comment in Download attr

* RIP phases.ts

* Fix imports post-phase migration

* Rewrite `move.canIgnoreSubstitute` to `move.hitsSubstitute`

* Also fixed interactions with Shell Trap and Beak Blast

* Removed some leftover `canIgnoreSubstitute`s

* fix issues after beta merge

* Status move effectiveness now accounts for substitute

* More edge case tests (Counter test failing)

* Fix Counter + Trap edge cases + add Fail messagesd

* Fix leftover nit

* Resolve leftover test issues

* Fix Sub offset carrying over to Trainer fights

* Hide substitute sprite during catch attempts

* Make substitutes baton-passable again

* Remove placeholder locale keys and SPLASH_ONLY

* Fix imports and other nits

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* ESLint

* Fix imports

* Fix incorrect `resetSprite` timing

* Fix substitute disappearing on hit (maybe?)

* More animation fixes (mostly for Roar)

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-13 12:46:22 -04:00
Tempoanon
526f9ae2bc
[Balance] Tweak evil boss teams, fix aesthetic details (#4214)
* oops

* Swap phero and nihi, fix typo

* Actually make the change
2024-09-13 12:44:42 -04:00
Amani H.
1cf075adc9
[Bug] Fix Guard Swap and Power Swap swapping all stats (#4213)
* [Bug] Fix `SwapStatStagesAttr` Oversight

* Remove SPLASH_ONLY Leftover
2024-09-13 12:31:25 -04:00
Lugiad
dd61950cb1
[Localization] Tiny FR adjustments (#4212)
* Update tutorial.json

* Update challenges.json
2024-09-13 12:31:00 -04:00
ImperialSympathizer
a0ac4adbaa
Merge branch 'beta' into mystery-encounters 2024-09-13 09:33:47 -04:00
ImperialSympathizer
ab4e9d69ff
Merge pull request #4211 from ben-lear/mystery-encounters
disable Uncommon Breed tests
2024-09-13 09:32:45 -04:00
MokaStitcher
48c2bdf1d8
[Bug] fix starter select crash when a variant preference is incorrect (#4209) 2024-09-13 09:29:35 -04:00
ImperialSympathizer
6b3f8b8f55 disable Uncommon Breed tests 2024-09-13 09:19:32 -04:00
ImperialSympathizer
44e3c4516a
Merge branch 'beta' into mystery-encounters 2024-09-13 09:05:09 -04:00
ImperialSympathizer
1870926f3b
Merge pull request #4210 from ben-lear/mystery-encounters
PR feedback from NightKev
2024-09-13 09:04:00 -04:00
ImperialSympathizer
ac6f769bc8 PR feedback from NightKev 2024-09-13 09:01:36 -04:00
NightKev
8409f39b8d
[Misc] Allow Meloetta's starting form to be selected (#4192)
* Allow Meloetta's starting form to be selected

* Meloetta won't change forms during a monotype challenge

Also removes reversion to Aria form when arena resets
2024-09-13 03:49:28 -07:00
NightKev
5f9bd21a51
[Test] Speed up tests and make enemy item override remove existing items (#4203)
* Make enemy held items override remove randomly generated items

Remove cries from tests

* Override callback delays to 1ms
2024-09-13 01:09:12 -04:00
chaosgrimmon
5f918ca001
[Sprite] Remove repeated animation frames (#4205)
* [Sprite] Remove fronts repeated frame data

* [Sprite] Remove shiny fronts repeated frame data

* [Sprite] Remove shiny fem fronts repeated frame data

* [Sprite] Remove fem fronts repeated frame data

* [Sprite] Remove backs repeated frame data

* [Sprite] Remove more backs repeated frame data

* [Sprite] Remove fem backs repeated frame data

* [Sprite] Remove shiny backs repeated frame data

* [Sprite] Remove more shiny backs repeated frame data

* [Sprite] Remove shiny fem backs repeated frame data

* [Sprite] Remove exp backs repeated frame data

* [Sprite] Remove shiny exp backs repeated frame data

* [Sprite] Remove exp fronts repeated frame data

* [Sprite] Remove shiny exp fronts repeated frame data

* [Sprite] Togedemaru exp shiny typo

* [Sprite] Togedemaru exp typo
2024-09-13 01:08:38 -04:00
NightKev
9026214f05
[Move] Mark Sky Drop as partial due to missing effects (#4204) 2024-09-13 01:07:43 -04:00
ImperialSympathizer
cabb1692ba
Merge pull request #4207 from ben-lear/mystery-encounters
handle undefined introVisuals properly
2024-09-12 23:22:45 -04:00
ImperialSympathizer
588c48dbce handle undefined introVisuals properly 2024-09-12 23:22:13 -04:00
ImperialSympathizer
2884517f7c
Merge pull request #4206 from ben-lear/mystery-encounters
re-enable stubbed function for Phaser text styling
2024-09-12 23:13:37 -04:00
ImperialSympathizer
acc1fa2b4e re-enable stubbed function for Phaser text styling 2024-09-12 23:12:48 -04:00
ImperialSympathizer
75a02c24ad
Merge pull request #4202 from ben-lear/mystery-encounters
ME updates
2024-09-12 20:15:24 -04:00
ImperialSympathizer
6186e80a1e merge latest from beta 2024-09-12 20:14:11 -04:00
ImperialSympathizer
0954162573 remove unintentional console log 2024-09-12 20:12:18 -04:00
ImperialSympathizer
3531086a67 update tests, bug fix MEs, and sprite assets 2024-09-12 20:05:22 -04:00
PrabbyDD
f80c073def
[Bug] Fix for Roost Grounds the User Rather than Removing Flying Typing#3984 (#4164)
* double checking tests on a new made branch for bug 3984

* roost test update

* added roost test file

* Roost test update

* removed random stackdump

* cleaned up message for roost

* fixed test file for linter

* cleaning up code and fixing some desync test issues

* Cleaned up more code and added case for double shock

* fixing some messages and putting burn up and double shock in same class

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-12 15:27:47 -04:00
Blitzy
ef4d2ec91e
[Balance] More Evil Team Adjustments (#4056)
* Update trainer-config.ts

* Update trainer-config.ts

* Devolve 98% of the list

* Update trainer-config.ts

* Update trainer-config.ts

* Update Pools / Minor Giovanni Changes

* Update trainer-config.ts

* Make Ghetsis2 Basculegion/Jellicent male

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-09-12 12:01:32 -04:00