Merge remote-tracking branch 'upstream/beta' into splash-tests

.github/workflows/create-release.yml

@@ -20,6 +20,7 @@ permissions:
 jobs:
   create-release:
     if: github.repository == 'pagefaultgames/pokerogue' && (vars.BETA_DEPLOY_BRANCH == '' || ! startsWith(vars.BETA_DEPLOY_BRANCH, 'release'))
+    timeout-minutes: 10
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed for github cli commands
     runs-on: ubuntu-latest
@@ -36,14 +37,24 @@ jobs:
             exit 1
           fi
         shell: bash
+
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ secrets.PAGEFAULT_APP_ID }}
+          private-key: ${{ secrets.PAGEFAULT_APP_PRIVATE_KEY }}
+
       - name: Check out code
         uses: actions/checkout@v4
         with:
           submodules: "recursive"
           # Always base off of beta branch, regardless of the branch the workflow was triggered from.
           ref: beta
+          token: ${{ steps.app-token.outputs.token }}
+
       - name: Create release branch
         run: git checkout -b release
+
       # In order to be able to open a PR into beta, we need the branch to have at least one change.
       - name: Overwrite RELEASE file
         run: |
@@ -52,11 +63,14 @@ jobs:
           echo "Release v${{ github.event.inputs.versionName }}" > RELEASE
           git add RELEASE
           git commit -m "Stage release v${{ github.event.inputs.versionName }}"
+
       - name: Push new branch
         run: git push origin release
+
       # The repository variable is used by the deploy-beta workflow to determine whether to deploy from beta or release.
       - name: Set repository variable
-        run: GITHUB_TOKEN="${{ secrets.RW_VARS_PAT }}" gh variable set BETA_DEPLOY_BRANCH --body "release"
+        run: GITHUB_TOKEN="${{ steps.app-token.outputs.token }}" gh variable set BETA_DEPLOY_BRANCH --body "release"
+
       - name: Create pull request to main
         run: |
           gh pr create --base main \
@@ -64,6 +78,7 @@ jobs:
                        --title "Release v${{ github.event.inputs.versionName }} to main" \
                        --body "This PR is for the release of v${{ github.event.inputs.versionName }}, and was created automatically by the GitHub Actions workflow invoked by ${{ github.actor }}" \
                        --draft
+
       - name: Create pull request to beta
         run: |
           gh pr create --base beta \

.github/workflows/deploy-beta.yml

@@ -12,6 +12,7 @@ on:
 jobs:
   deploy:
     if: github.repository == 'pagefaultgames/pokerogue' && github.ref_name == (vars.BETA_DEPLOY_BRANCH || 'beta')
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/deploy.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   deploy:
     if: github.repository == 'pagefaultgames/pokerogue'
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/github-pages.yml

@@ -5,10 +5,14 @@ on:
     branches:
       - main
       - beta
+      - release
+      - 'hotfix*'
   pull_request:
     branches:
       - main
       - beta
+      - release
+      - 'hotfix*'
   merge_group:
     types: [checks_requested]
 
@@ -16,9 +20,12 @@ jobs:
   pages:
     name: Github Pages
     if: github.repository == 'pagefaultgames/pokerogue'
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     env:
-      api-dir: ./
+      docs-dir: ./pokerogue_docs
+      # Only push docs when running on pushes to main/beta
+      DRY_RUN: ${{github.event_name != 'push' || (github.ref_name != 'beta' && github.ref_name != 'main')}}
 
     strategy:
       fail-fast: false
@@ -40,7 +47,7 @@ jobs:
         with:
           version: 10
 
-      - name: Setup Node 22.14.1
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version-file: "pokerogue_docs/.nvmrc"
@@ -53,26 +60,24 @@ jobs:
           ref: gh-pages
 
       - name: Install Node.js dependencies
-        working-directory: ${{env.api-dir}}
+        working-directory: ${{env.docs-dir}}
-        run: |
+        run: pnpm i
-          cd pokerogue_docs
-          pnpm i
 
       - name: Generate Typedoc docs
-        working-directory: ${{env.api-dir}}
+        working-directory: ${{env.docs-dir}}
-        run: |
+        env:
-          cd pokerogue_docs
+          REF_NAME: ${{github.ref_name}}
-          pnpm exec typedoc --out /tmp/docs --githubPages false --entryPoints ./src/
+          DRY_RUN: ${{env.DRY_RUN}}
+        run: pnpm typedoc
 
       - name: Commit & Push docs
-        if: github.event_name == 'push'
+        # env vars are stored as strings instead of booleans (hence why an explicit check is required)
+        if: ${{ env.DRY_RUN == 'false'}}
         run: |
           cd pokerogue_gh
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
-          mkdir -p $GITHUB_REF_NAME
+          rsync -rd --delete /tmp/docs/ $GITHUB_REF_NAME
-          rm -rf $GITHUB_REF_NAME/*
-          cp -r /tmp/docs/. $GITHUB_REF_NAME
           git add $GITHUB_REF_NAME
-          git commit --allow-empty -m "[skip ci] Deploy docs"
+          git commit -m "[skip ci] Deploy docs"
-          git push
+          git push

.github/workflows/linting.yml

@@ -5,16 +5,21 @@ on:
     branches:
       - main
       - beta
+      - release
+      - 'hotfix*'
   pull_request:
     branches:
       - main
       - beta
+      - release
+      - 'hotfix*'
   merge_group:
     types: [checks_requested]
 
 jobs:
   run-linters:
     name: Run linters
+    timeout-minutes: 10
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/post-release-deleted.yml

@@ -6,6 +6,7 @@ jobs:
   # Set the BETA_DEPLOY_BRANCH variable to beta when a release branch is deleted
   update-release-var:
     if: github.repository == 'pagefaultgames/pokerogue' && github.event.ref_type == 'branch' && github.event.ref == 'release'
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
       - name: Set BETA_DEPLOY_BRANCH to beta

.github/workflows/test-shard-template.yml

@@ -21,6 +21,7 @@ jobs:
   test:
     # We can't use dynmically named jobs until https://github.com/orgs/community/discussions/13261 is implemented
     name: Shard
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     if: ${{ !inputs.skip }}
     steps:

.github/workflows/tests.yml

@@ -5,16 +5,21 @@ on:
     branches:
       - main
       - beta
+      - release
+      - 'hotfix*'
   pull_request:
     branches:
       - main
       - beta
+      - release
+      - 'hotfix*'
   merge_group:
     types: [checks_requested]
   workflow_dispatch:
 
 jobs:
   check-path-change-filter:
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read
@@ -33,6 +38,8 @@ jobs:
     name: Run Tests
     needs: check-path-change-filter
     strategy:
+      # don't stop upon 1 shard failing
+      fail-fast: false
       matrix:
         shard: [1, 2, 3, 4, 5]
     uses: ./.github/workflows/test-shard-template.yml

README.md

@@ -1,4 +1,9 @@
-<picture><img src="./public/images/logo.png" width="300" alt="PokéRogue"></picture>
+<div align="center"><picture><img src="./public/images/logo.png" width="300" alt="PokéRogue"></picture>
+
+[![Discord Static Badge](https://img.shields.io/badge/Community_Discord-blurple?style=flat&logo=discord&logoSize=auto&labelColor=white&color=5865F2)](https://discord.gg/pokerogue)
+[![Docs Coverage Static Badge](https://pagefaultgames.github.io/pokerogue/beta/coverage.svg)](https://pagefaultgames.github.io/pokerogue/beta)
+[![Testing Badge](https://github.com/pagefaultgames/pokerogue/actions/workflows/tests.yml/badge.svg)](https://github.com/pagefaultgames/pokerogue/actions/workflows/tests.yml)
+[![License: GNU AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)</div>
 
 PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more!
 
@@ -7,7 +12,7 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite
 See [CONTRIBUTING.md](./CONTRIBUTING.md), this includes instructions on how to set up the game locally.
 
 # 📝 Credits
->
+
 > If this project contains assets you have produced and you do not see your name, **please** reach out, either [here on GitHub](https://github.com/pagefaultgames/pokerogue/issues/new) or via [Discord](https://discord.gg/pokerogue).
 
 Thank you to all the wonderful people that have contributed to the PokéRogue project! You can find the credits [here](./CREDITS.md).

RELEASE

@@ -0,0 +1 @@
+Release v1.10.0

global.d.ts

@@ -18,3 +18,14 @@ declare global {
     call<T extends AnyFn>(this: T, thisArg: ThisParameterType<T>, ...argArray: Parameters<T>): ReturnType<T>;
   }
 }
+
+// Global augments for `typedoc` to prevent TS from erroring when editing the config JS file
+declare module "typedoc" {
+  export interface TypeDocOptionMap {
+    coverageLabel: string;
+    coverageColor: string;
+    coverageOutputPath: string;
+    coverageOutputType: "svg" | "json" | "all";
+    coverageSvgWidth: number;
+  }
+}

package.json

@@ -1,10 +1,11 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.9.6",
+  "version": "1.10.6",
   "type": "module",
   "scripts": {
-    "start": "vite",
+    "start:prod": "vite --mode production",
+    "start:beta": "vite --mode beta",
     "start:dev": "vite --mode development",
     "build": "vite build",
     "build:beta": "vite build --mode beta",
@@ -14,10 +15,11 @@
     "test:watch": "vitest watch --coverage --no-isolate",
     "test:silent": "vitest run --silent='passed-only' --no-isolate",
     "test:create": "node scripts/create-test/create-test.js",
+    "scrape-trainers": "node scripts/scrape-trainer-names/main.js",
     "typecheck": "tsc --noEmit",
     "biome": "biome check --write --changed --no-errors-on-unmatched --diagnostic-level=error",
     "biome-ci": "biome ci --diagnostic-level=error --reporter=github --no-errors-on-unmatched",
-    "docs": "typedoc",
+    "typedoc": "typedoc",
     "depcruise": "depcruise src test",
     "postinstall": "lefthook install; git submodule update --init --recursive",
     "update-version:patch": "pnpm version patch --force --no-git-tag-version",
@@ -32,6 +34,7 @@
     "@types/node": "^22.16.5",
     "@vitest/coverage-istanbul": "^3.2.4",
     "@vitest/expect": "^3.2.4",
+    "@vitest/utils": "^3.2.4",
     "chalk": "^5.4.1",
     "dependency-cruiser": "^16.10.4",
     "inquirer": "^12.8.2",
@@ -40,6 +43,9 @@
     "msw": "^2.10.4",
     "phaser3spectorjs": "^0.0.8",
     "typedoc": "^0.28.8",
+    "typedoc-github-theme": "^0.3.1",
+    "typedoc-plugin-coverage": "^4.0.1",
+    "typedoc-plugin-mdn-links": "^5.0.9",
     "typescript": "^5.8.3",
     "vite": "^7.0.6",
     "vite-tsconfig-paths": "^5.1.4",

pnpm-lock.yaml

@@ -63,6 +63,9 @@ importers:
       '@vitest/expect':
         specifier: ^3.2.4
         version: 3.2.4
+      '@vitest/utils':
+        specifier: ^3.2.4
+        version: 3.2.4
       chalk:
         specifier: ^5.4.1
         version: 5.4.1
@@ -87,6 +90,15 @@ importers:
       typedoc:
         specifier: ^0.28.8
         version: 0.28.8(typescript@5.8.3)
+      typedoc-github-theme:
+        specifier: ^0.3.1
+        version: 0.3.1(typedoc@0.28.8(typescript@5.8.3))
+      typedoc-plugin-coverage:
+        specifier: ^4.0.1
+        version: 4.0.1(typedoc@0.28.8(typescript@5.8.3))
+      typedoc-plugin-mdn-links:
+        specifier: ^5.0.9
+        version: 5.0.9(typedoc@0.28.8(typescript@5.8.3))
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -1789,6 +1801,23 @@ packages:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
 
+  typedoc-github-theme@0.3.1:
+    resolution: {integrity: sha512-j6PmkAGmf/MGCzYjQcUH6jS9djPsNl/IoTXooxC+MoeMkBhbmPyKJlpR6Lw12BLoe2OYpYA2J1KMktUJXp/8Sw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      typedoc: ~0.28.0
+
+  typedoc-plugin-coverage@4.0.1:
+    resolution: {integrity: sha512-P1QBR5GJSfW3fDrpz4Vkd8z8lzWaBYjaHebRLk0u2Uga0oSFlPaqrCyiHzItBXxZX28aMlNlZwrUnsLgUgqA7g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      typedoc: 0.28.x
+
+  typedoc-plugin-mdn-links@5.0.9:
+    resolution: {integrity: sha512-kXssRKBhUd0JeHzFmxWVsGWVFR9WXafe70Y8Ed+MYH2Nu2647cqfGQN1OBKgvXpmAT8MTpACmUIQ7GnQnh1/iw==}
+    peerDependencies:
+      typedoc: 0.27.x || 0.28.x
+
   typedoc@0.28.8:
     resolution: {integrity: sha512-16GfLopc8icHfdvqZDqdGBoS2AieIRP2rpf9mU+MgN+gGLyEQvAO0QgOa6NJ5QNmQi0LFrDY9in4F2fUNKgJKA==}
     engines: {node: '>= 18', pnpm: '>= 10'}
@@ -3634,6 +3663,18 @@ snapshots:
 
   type-fest@4.41.0: {}
 
+  typedoc-github-theme@0.3.1(typedoc@0.28.8(typescript@5.8.3)):
+    dependencies:
+      typedoc: 0.28.8(typescript@5.8.3)
+
+  typedoc-plugin-coverage@4.0.1(typedoc@0.28.8(typescript@5.8.3)):
+    dependencies:
+      typedoc: 0.28.8(typescript@5.8.3)
+
+  typedoc-plugin-mdn-links@5.0.9(typedoc@0.28.8(typescript@5.8.3)):
+    dependencies:
+      typedoc: 0.28.8(typescript@5.8.3)
+
   typedoc@0.28.8(typescript@5.8.3):
     dependencies:
       '@gerrit0/mini-shiki': 3.8.1

public/battle-anims/common-wind.json

@@ -1102,6 +1102,112 @@
         "volume": 100,
         "pitch": 136,
         "eventType": "AnimTimedSoundEvent"
+      },
+      {
+        "frameIndex": 0,
+        "resourceName": "PRAS- Strong Winds",
+        "bgX": 0,
+        "bgY": 0,
+        "opacity": 0,
+        "duration": 4,
+        "eventType": "AnimTimedAddBgEvent"
+      },
+      {
+        "frameIndex": 0,
+        "resourceName": "",
+        "bgX": 0,
+        "bgY": 0,
+        "opacity": 32,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "4": [
+      {
+        "frameIndex": 4,
+        "resourceName": "",
+        "bgX": 10,
+        "bgY": 0,
+        "opacity": 64,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "8": [
+      {
+        "frameIndex": 8,
+        "resourceName": "",
+        "bgX": 20,
+        "bgY": 0,
+        "opacity": 128,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "12": [
+      {
+        "frameIndex": 12,
+        "resourceName": "",
+        "bgX": 30,
+        "bgY": 0,
+        "opacity": 128,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "16": [
+      {
+        "frameIndex": 16,
+        "resourceName": "",
+        "bgX": 40,
+        "bgY": 0,
+        "opacity": 128,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "20": [
+      {
+        "frameIndex": 20,
+        "resourceName": "",
+        "bgX": 50,
+        "bgY": 0,
+        "opacity": 128,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "24": [
+      {
+        "frameIndex": 24,
+        "resourceName": "",
+        "bgX": 60,
+        "bgY": 0,
+        "opacity": 64,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "28": [
+      {
+        "frameIndex": 28,
+        "resourceName": "",
+        "bgX": 70,
+        "bgY": 0,
+        "opacity": 32,
+        "duration": 4,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "32": [
+      {
+        "frameIndex": 32,
+        "resourceName": "",
+        "bgX": 80,
+        "bgY": 0,
+        "opacity": 0,
+        "duration": 3,
+        "eventType": "AnimTimedUpdateBgEvent"
       }
     ]
   },

public/images/pokemon/variant/586-autumn.json

@@ -1,11 +0,0 @@
-{
-	"0": {
-		"422110": "9d4f62",
-		"4a0808": "7f334a",
-		"dec56b": "ffd5f6",
-		"633121": "c66479",
-		"7b5231": "d98997",
-		"a57b4a": "e1b2d7",
-		"de8c29": "ffecfb"
-	}
-}

public/images/pokemon/variant/586-spring.json

@@ -1,11 +0,0 @@
-{
-	"0": {
-		"4a1008": "7f334a",
-		"dec56b": "ffd5f6",
-		"633a21": "c66479",
-		"422119": "9d4f62",
-		"de9429": "ffecfb",
-		"7b5a31": "d98997",
-		"a57b4a": "e1b2d7"
-	}
-}

public/images/pokemon/variant/586-summer.json

@@ -1,15 +0,0 @@
-{
-	"0": {
-		"193a29": "314a29",
-		"088c42": "4a8b4a",
-		"195a31": "416a39",
-		"dec56b": "ffd5f6",
-		"4a1008": "783046",
-		"422119": "944b5c",
-		"633a21": "bb5f73",
-		"7b5a31": "cc818e",
-		"a57b4a": "e1b2d7",
-		"de9429": "ffecfb",
-		"311010": "582333"
-	}
-}

public/images/pokemon/variant/586-winter.json

@@ -1,15 +0,0 @@
-{
-	"0": {
-		"6b6b6b": "cf9bc4",
-		"424a42": "b184a8",
-		"ffffff": "ffd5f6",
-		"adadad": "e1b2d7",
-		"4a1008": "7f334a",
-		"dec56b": "ffecfb",
-		"422119": "9d4f62",
-		"7b5a31": "d98997",
-		"633a21": "c66479",
-		"a57b4a": "e1b2d7",
-		"de9429": "ffecfb"
-	}
-}

public/images/pokemon/variant/_masterlist.json

@@ -515,14 +515,6 @@
 	"577": [1, 1, 1],
 	"578": [1, 1, 1],
 	"579": [1, 1, 1],
-	"585-autumn": [2, 0, 0],
-	"585-spring": [2, 0, 0],
-	"585-summer": [2, 0, 0],
-	"585-winter": [2, 0, 0],
-	"586-autumn": [1, 0, 0],
-	"586-spring": [1, 0, 0],
-	"586-summer": [1, 0, 0],
-	"586-winter": [1, 0, 0],
 	"587": [0, 1, 1],
 	"588": [0, 1, 1],
 	"589": [0, 1, 1],
@@ -1521,14 +1513,6 @@
 		"577": [1, 1, 1],
 		"578": [1, 1, 1],
 		"579": [1, 1, 1],
-		"585-autumn": [2, 0, 0],
-		"585-spring": [2, 0, 0],
-		"585-summer": [1, 0, 0],
-		"585-winter": [2, 0, 0],
-		"586-autumn": [1, 0, 0],
-		"586-spring": [1, 0, 0],
-		"586-summer": [1, 0, 0],
-		"586-winter": [1, 0, 0],
 		"587": [0, 1, 1],
 		"588": [0, 1, 1],
 		"589": [0, 1, 1],

public/images/pokemon/variant/back/585-summer.json

@@ -1,16 +0,0 @@
-{
-	"0": {
-		"315231": "314a29",
-		"317b42": "416a39",
-		"42b542": "4a8b4a",
-		"ce9c08": "d89ca6",
-		"7b5210": "c16b7d",
-		"ffde52": "ffffff",
-		"bda58c": "d89ca6",
-		"9c7b5a": "c16b7d",
-		"f7efc5": "ffd5f6",
-		"524219": "783046",
-		"313131": "783046",
-		"525252": "c16b7d"
-	}
-}

public/images/pokemon/variant/back/586-autumn.json

@@ -1,10 +0,0 @@
-{
-	"0": {
-		"7b5231": "d98997",
-		"422110": "9d4f62",
-		"633121": "c66479",
-		"de8c29": "ffecfb",
-		"a57b4a": "e1b2d7",
-		"dec56b": "ffd5f6"
-	}
-}

public/images/pokemon/variant/back/586-spring.json

@@ -1,15 +0,0 @@
-{
-	"0": {
-		"311010": "2a1418",
-		"731931": "5e263e",
-		"4a1008": "7f334a",
-		"633a21": "c66479",
-		"ce4263": "c66479",
-		"dec56b": "ffd5f6",
-		"422119": "9d4f62",
-		"7b5a31": "d98997",
-		"de9429": "ffecfb",
-		"dedede": "c8c8c8",
-		"a57b4a": "e1b2d7"
-	}
-}

public/images/pokemon/variant/back/586-summer.json

@@ -1,14 +0,0 @@
-{
-	"0": {
-		"193a29": "314a29",
-		"195a31": "416a39",
-		"088c42": "4a8b4a",
-		"4a1008": "7f334a",
-		"7b5a31": "d98997",
-		"422119": "9d4f62",
-		"633a21": "c66479",
-		"de9429": "ffecfb",
-		"a57b4a": "e1b2d7",
-		"dec56b": "ffd5f6"
-	}
-}

public/images/pokemon/variant/back/586-winter.json

@@ -1,15 +0,0 @@
-{
-	"0": {
-		"424a42": "99648f",
-		"ffffff": "ffd5f6",
-		"6b6b6b": "b184a8",
-		"adadad": "e1b2d7",
-		"4a1008": "7f334a",
-		"dec56b": "ffecfb",
-		"633a21": "c66479",
-		"422119": "9d4f62",
-		"7b5a31": "d98997",
-		"de9429": "ffecfb",
-		"a57b4a": "e1b2d7"
-	}
-}