From 4dfcc96746f4ca2bdf9920ed8c167bf312277f64 Mon Sep 17 00:00:00 2001 From: Sion Kang Date: Sat, 14 Sep 2024 01:52:52 +0900 Subject: [PATCH 1/2] 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 Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- .github/workflows/eslint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 2850418bc59..a8eea069ba6 100644 --- 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 \ No newline at end of file + run: npm run eslint-ci From a085d3d4167eac4be441a65aad9273a7fd59f370 Mon Sep 17 00:00:00 2001 From: seanrmon <76178227+seanrmon@users.noreply.github.com> Date: Fri, 13 Sep 2024 18:03:11 +0100 Subject: [PATCH 2/2] =?UTF-8?q?[Bug]=20Fix=20for=20unpausing=20evolutions?= =?UTF-8?q?=20for=20secondary=20Pok=C3=A9mon=20in=20a=20fusion=20(#4007)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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> --- src/field/pokemon.ts | 3 +++ src/ui/party-ui-handler.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index c5d8e039f9a..c648ff485b7 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -3984,6 +3984,9 @@ export class PlayerPokemon extends Pokemon { this.fusionVariant = pokemon.variant; this.fusionGender = pokemon.gender; this.fusionLuck = pokemon.luck; + if ((pokemon.pauseEvolutions) || (this.pauseEvolutions)) { + this.pauseEvolutions = true; + } this.scene.validateAchv(achvs.SPLICE); this.scene.gameData.gameStats.pokemonFused++; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 9e025dbe086..270163a3d3e 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -877,7 +877,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.options.push(PartyOption.SUMMARY); this.options.push(PartyOption.RENAME); - if (pokemon.pauseEvolutions && pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId)) { + if (pokemon.pauseEvolutions && (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)))) { this.options.push(PartyOption.UNPAUSE_EVOLUTION); }