Merge branch 'beta' into admin-panel-unlink-update

[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>
2025-07-20 23:32:19 +02:00 · 2024-09-13 15:38:12 -07:00 · 2024-09-13 13:03:11 -04:00 · 2024-09-13 17:52:52 +01:00 · 2024-09-13 12:46:22 -04:00 · 2024-09-13 12:44:42 -04:00
542 changed files with 369930 additions and 1036545 deletions
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@ -21,10 +21,10 @@ jobs:

    steps:
      - name: Check out Git repository  # Step to check out the repository
-        uses: actions/checkout@v2  # Use the checkout action version 2
+        uses: actions/checkout@v4  # Use the checkout action version 4

      - name: Set up Node.js  # Step to set up Node.js environment
-        uses: actions/setup-node@v1  # Use the setup-node action version 1
+        uses: actions/setup-node@v4  # Use the setup-node action version 4
        with:
          node-version: 20  # Specify Node.js version 20

@ -32,4 +32,4 @@ jobs:
        run: npm ci  # Use 'npm ci' to install dependencies

      - name: eslint  # Step to run linters
-        run: npm run eslint-ci
+        run: npm run eslint-ci
--- a/public/images/pokemon/10.json
+++ b/public/images/pokemon/10.json
--- a/public/images/pokemon/102.json
+++ b/public/images/pokemon/102.json
--- a/public/images/pokemon/103.json
+++ b/public/images/pokemon/103.json
--- a/public/images/pokemon/108.json
+++ b/public/images/pokemon/108.json
--- a/public/images/pokemon/109.json
+++ b/public/images/pokemon/109.json
--- a/public/images/pokemon/110.json
+++ b/public/images/pokemon/110.json
--- a/public/images/pokemon/114.json
+++ b/public/images/pokemon/114.json
--- a/public/images/pokemon/115.json
+++ b/public/images/pokemon/115.json
--- a/public/images/pokemon/117.json
+++ b/public/images/pokemon/117.json
--- a/public/images/pokemon/118.json
+++ b/public/images/pokemon/118.json
--- a/public/images/pokemon/119.json
+++ b/public/images/pokemon/119.json
--- a/public/images/pokemon/120.json
+++ b/public/images/pokemon/120.json
--- a/public/images/pokemon/121.json
+++ b/public/images/pokemon/121.json
--- a/public/images/pokemon/122.json
+++ b/public/images/pokemon/122.json
--- a/public/images/pokemon/127.json
+++ b/public/images/pokemon/127.json
--- a/public/images/pokemon/128.json
+++ b/public/images/pokemon/128.json
--- a/public/images/pokemon/130.json
+++ b/public/images/pokemon/130.json
--- a/public/images/pokemon/132.json
+++ b/public/images/pokemon/132.json
--- a/public/images/pokemon/134.json
+++ b/public/images/pokemon/134.json
--- a/public/images/pokemon/138.json
+++ b/public/images/pokemon/138.json
--- a/public/images/pokemon/139.json
+++ b/public/images/pokemon/139.json
--- a/public/images/pokemon/141.json
+++ b/public/images/pokemon/141.json
--- a/public/images/pokemon/151.json
+++ b/public/images/pokemon/151.json
--- a/public/images/pokemon/169.json
+++ b/public/images/pokemon/169.json
--- a/public/images/pokemon/18.json
+++ b/public/images/pokemon/18.json
--- a/public/images/pokemon/190.json
+++ b/public/images/pokemon/190.json
--- a/public/images/pokemon/192.json
+++ b/public/images/pokemon/192.json
--- a/public/images/pokemon/194.json
+++ b/public/images/pokemon/194.json
--- a/public/images/pokemon/198.json
+++ b/public/images/pokemon/198.json
--- a/public/images/pokemon/20.json
+++ b/public/images/pokemon/20.json
--- a/public/images/pokemon/200.json
+++ b/public/images/pokemon/200.json
--- a/public/images/pokemon/201-a.json
+++ b/public/images/pokemon/201-a.json
--- a/public/images/pokemon/201-b.json
+++ b/public/images/pokemon/201-b.json
--- a/public/images/pokemon/201-c.json
+++ b/public/images/pokemon/201-c.json
--- a/public/images/pokemon/201-d.json
+++ b/public/images/pokemon/201-d.json
--- a/public/images/pokemon/201-e.json
+++ b/public/images/pokemon/201-e.json
--- a/public/images/pokemon/201-exclamation.json
+++ b/public/images/pokemon/201-exclamation.json
--- a/public/images/pokemon/201-f.json
+++ b/public/images/pokemon/201-f.json
--- a/public/images/pokemon/201-g.json
+++ b/public/images/pokemon/201-g.json
--- a/public/images/pokemon/201-h.json
+++ b/public/images/pokemon/201-h.json
--- a/public/images/pokemon/201-i.json
+++ b/public/images/pokemon/201-i.json
--- a/public/images/pokemon/201-j.json
+++ b/public/images/pokemon/201-j.json
--- a/public/images/pokemon/201-k.json
+++ b/public/images/pokemon/201-k.json
--- a/public/images/pokemon/201-l.json
+++ b/public/images/pokemon/201-l.json
--- a/public/images/pokemon/201-m.json
+++ b/public/images/pokemon/201-m.json
--- a/public/images/pokemon/201-n.json
+++ b/public/images/pokemon/201-n.json
--- a/public/images/pokemon/201-p.json
+++ b/public/images/pokemon/201-p.json
--- a/public/images/pokemon/201-q.json
+++ b/public/images/pokemon/201-q.json
--- a/public/images/pokemon/201-question.json
+++ b/public/images/pokemon/201-question.json
--- a/public/images/pokemon/201-r.json
+++ b/public/images/pokemon/201-r.json
--- a/public/images/pokemon/201-s.json
+++ b/public/images/pokemon/201-s.json
--- a/public/images/pokemon/201-t.json
+++ b/public/images/pokemon/201-t.json
--- a/public/images/pokemon/201-u.json
+++ b/public/images/pokemon/201-u.json
--- a/public/images/pokemon/201-v.json
+++ b/public/images/pokemon/201-v.json
--- a/public/images/pokemon/201-w.json
+++ b/public/images/pokemon/201-w.json
--- a/public/images/pokemon/201-x.json
+++ b/public/images/pokemon/201-x.json
--- a/public/images/pokemon/201-y.json
+++ b/public/images/pokemon/201-y.json
--- a/public/images/pokemon/201-z.json
+++ b/public/images/pokemon/201-z.json
--- a/public/images/pokemon/206.json
+++ b/public/images/pokemon/206.json
--- a/public/images/pokemon/218.json
+++ b/public/images/pokemon/218.json
--- a/public/images/pokemon/219.json
+++ b/public/images/pokemon/219.json
--- a/public/images/pokemon/220.json
+++ b/public/images/pokemon/220.json
--- a/public/images/pokemon/222.json
+++ b/public/images/pokemon/222.json
--- a/public/images/pokemon/226.json
+++ b/public/images/pokemon/226.json
--- a/public/images/pokemon/23.json
+++ b/public/images/pokemon/23.json
--- a/public/images/pokemon/24.json
+++ b/public/images/pokemon/24.json
--- a/public/images/pokemon/274.json
+++ b/public/images/pokemon/274.json
--- a/public/images/pokemon/280.json
+++ b/public/images/pokemon/280.json
--- a/public/images/pokemon/288.json
+++ b/public/images/pokemon/288.json
--- a/public/images/pokemon/30.json
+++ b/public/images/pokemon/30.json
--- a/public/images/pokemon/300.json
+++ b/public/images/pokemon/300.json
--- a/public/images/pokemon/307.json
+++ b/public/images/pokemon/307.json
--- a/public/images/pokemon/309.json
+++ b/public/images/pokemon/309.json
--- a/public/images/pokemon/310.json
+++ b/public/images/pokemon/310.json
--- a/public/images/pokemon/32.json
+++ b/public/images/pokemon/32.json
--- a/public/images/pokemon/321.json
+++ b/public/images/pokemon/321.json
--- a/public/images/pokemon/328.json
+++ b/public/images/pokemon/328.json
--- a/public/images/pokemon/341.json
+++ b/public/images/pokemon/341.json
--- a/public/images/pokemon/345.json
+++ b/public/images/pokemon/345.json
--- a/public/images/pokemon/349.json
+++ b/public/images/pokemon/349.json
--- a/public/images/pokemon/38.json
+++ b/public/images/pokemon/38.json
--- a/public/images/pokemon/386-speed.json
+++ b/public/images/pokemon/386-speed.json
--- a/public/images/pokemon/47.json
+++ b/public/images/pokemon/47.json
--- a/public/images/pokemon/472.json
+++ b/public/images/pokemon/472.json
--- a/public/images/pokemon/474.json
+++ b/public/images/pokemon/474.json
--- a/public/images/pokemon/479.json
+++ b/public/images/pokemon/479.json
--- a/public/images/pokemon/482.json
+++ b/public/images/pokemon/482.json
--- a/public/images/pokemon/53.json
+++ b/public/images/pokemon/53.json
--- a/public/images/pokemon/57.json
+++ b/public/images/pokemon/57.json
--- a/public/images/pokemon/59.json
+++ b/public/images/pokemon/59.json
--- a/public/images/pokemon/62.json
+++ b/public/images/pokemon/62.json
--- a/public/images/pokemon/67.json
+++ b/public/images/pokemon/67.json
--- a/public/images/pokemon/71.json
+++ b/public/images/pokemon/71.json
--- a/public/images/pokemon/77.json
+++ b/public/images/pokemon/77.json
--- a/public/images/pokemon/79.json
+++ b/public/images/pokemon/79.json
--- a/public/images/pokemon/83.json
+++ b/public/images/pokemon/83.json
--- a/public/images/pokemon/86.json
+++ b/public/images/pokemon/86.json
--- a/public/images/pokemon/91.json
+++ b/public/images/pokemon/91.json
--- a/public/images/pokemon/98.json
+++ b/public/images/pokemon/98.json
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
flx-sta	79c2829a77	Merge branch 'beta' into admin-panel-unlink-update	2024-09-13 15:38:12 -07: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
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
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
MokaStitcher	48c2bdf1d8	[Bug] fix starter select crash when a variant preference is incorrect (#4209 )	2024-09-13 09:29:35 -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
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
AJ Fontaine	bfc4f2d1cd	[Balance] Tweak trainer evolution delay so trainers are more likely to use evolved Pokemon in later waves (#4190 ) * Tweak trainer evolution delay * Document getStrengthLevelDiff	2024-09-12 11:21:43 -04:00
Leo Kim	5724ed4a5c	[Enhancement] Add option for egg skip to settings (#4193 ) * add option for egg skip * change eggSkip variable name more descriptive to eggSkipPreference * update requested changes from opaquer and tinylad and walker * update requested change from tinylad * update comment	2024-09-12 10:33:36 -04:00
Lugiad	c294e0846d	[Localization] Catalan translation batch (#4194 ) * Update arena-flyout.json * Update biome.json * Update common.json * Update menu.json * Update nature.json * Update pokemon-info.json * Update pokemon-info.json	2024-09-12 10:22:30 -04:00
Chapybara-jp	d4d1788789	[Localisation] [JA] Translated modifier-type.json.json (#4195 ) * Update ability-trigger.json * Update ability.json * Update arena-flyout.json * Update arena-tag.json * Update battle.json * Update fight-ui-handler.json * Update berry.json * Update menu.json * Update party-ui-handler.json * Update starter-select-ui-handler.json * Update tutorial.json * Update move.json * Update battle.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-tag.json * Update party-ui-handler.json * Update settings.json * Update move-trigger.json * Translate modifier-type.json * Update modifier-type.json * Translated modifier-type.json * Update move-trigger.json * Update move-trigger.json * Update move-trigger.json * Update modifier-type.json	2024-09-12 10:16:45 -04:00
Leo Kim	b422239a82	[Localization(ko)] Update Korean translation (#4196 )	2024-09-12 10:16:10 -04:00