Merge branch 'beta' into mortal-spin

.devcontainer/devcontainer.json

@@ -0,0 +1,61 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+  "name": "Node.js & TypeScript",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {
+      "installDirectlyFromGitHubRelease": true,
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers-extra/features/pnpm:2": {
+      "version": "latest"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        // # Formatter configs
+        "editor.defaultFormatter": "biomejs.biome",
+        "editor.tabSize": 2,
+        "editor.insertSpaces": true,
+        "editor.codeActionsOnSave": {
+          "source.addMissingImports.ts": "always",
+          "source.removeUnusedImports": "always",
+          "source.fixAll.biome": "always",
+          "source.organizeImports.biome": "always"
+        },
+        "biome.suggestInstallingGlobally": false,
+
+        // # JS/TS setting overrides
+        "javascript.preferences.importModuleSpecifier": "non-relative",
+        "javascript.preferences.importModuleSpecifierEnding": "index",
+        "javascript.preferGoToSourceDefinition": true,
+        "javascript.updateImportsOnFileMove.enabled": "always",
+
+        "typescript.preferences.importModuleSpecifier": "non-relative",
+        "typescript.preferences.importModuleSpecifierEnding": "index",
+        "typescript.preferGoToSourceDefinition": true,
+        "typescript.updateImportsOnFileMove.enabled": "always",
+
+        "typescript.tsserver.experimental.enableProjectDiagnostics": true,
+
+        // # Miscellaneous
+        "npm.packageManager": "pnpm",
+        "npm.scriptRunner": "pnpm",
+        "vitest.cliArguments": "--no-isolate"
+      },
+      "extensions": [
+        "biomejs.biome",
+        "YoavBls.pretty-ts-errors",
+        "vitest.explorer",
+        "adpyke.codesnap", // Bind to a hotkey (ctrl+\, etc) for best results
+        "aaron-bond.better-comments",
+        "MuTsunTsai.jsdoc-link"
+      ]
+    }
+  },
+  "postCreateCommand": "pnpm install",
+  "forwardPorts": [8000]
+}

.github/workflows/create-release.yml

@@ -36,12 +36,18 @@ 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.
@@ -56,7 +62,7 @@ jobs:
         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 \

.github/workflows/github-pages.yml

@@ -5,10 +5,12 @@ on:
     branches:
       - main
       - beta
+      - release
   pull_request:
     branches:
       - main
       - beta
+      - release
   merge_group:
     types: [checks_requested]
 

.github/workflows/linting.yml

@@ -5,10 +5,12 @@ on:
     branches:
       - main
       - beta
+      - release
   pull_request:
     branches:
       - main
       - beta
+      - release
   merge_group:
     types: [checks_requested]
 

.github/workflows/tests.yml

@@ -5,10 +5,12 @@ on:
     branches:
       - main
       - beta
+      - release
   pull_request:
     branches:
       - main
       - beta
+      - release
   merge_group:
     types: [checks_requested]
   workflow_dispatch:

.gitignore

@@ -12,9 +12,10 @@ dist
 dist-ssr
 *.local
 
-# Editor directories and files
-.vscode
+# Editor directories and files (excluding `extensions.json` for devcontainer)
 *.code-workspace
+.vscode/*
+!.vscode/extensions.json
 .idea
 .DS_Store
 *.suo

.ls-lint.yml

@@ -26,3 +26,4 @@ ignore:
    - .git
    - public
    - dist
+   - .devcontainer

.vscode/extensions.json

@@ -0,0 +1,13 @@
+{
+  "recommendations": [
+    "biomejs.biome",
+    "YoavBls.pretty-ts-errors",
+    "vitest.explorer",
+
+    // This stuff isn't mandatory - it's just nice to have :)
+
+    "adpyke.codesnap", // Bind to a hotkey (ctrl+\, etc) for best results
+    "aaron-bond.better-comments",
+    "MuTsunTsai.jsdoc-link"
+  ]
+}

CONTRIBUTING.md

@@ -18,17 +18,34 @@ We are here to help and the better you understand what you're working on, the ea
 
 PokéRogue is built with [Typescript](https://www.typescriptlang.org/docs/handbook/intro.html), using the [Phaser](https://github.com/phaserjs/phaser) game framework.
 
-If you have the motivation and experience with Typescript/Javascript (or are willing to learn) you can contribute by forking the repository and making pull requests with contributions. 
+If you have the motivation and experience with Typescript/Javascript (or are willing to learn), you can contribute by forking the repository and making pull requests with contributions.
 
 ## 💻 Environment Setup
 
-### Prerequisites
+### Codespaces/Devcontainer Environment
 
-- node: >=22.14.0 - [manage with pnpm](https://pnpm.io/cli/env) | [manage with fnm](https://github.com/Schniz/fnm) | [manage with nvm](https://github.com/nvm-sh/nvm)
+Arguably the easiest way to get started is by using the prepared development environment.
+
+We have a `.devcontainer/devcontainer.json` file, meaning we are compatible with:
+
+- [![Open in GitHub Codespaces][codespaces-badge]][codespaces-link], or
+- the [Visual Studio Code Remote - Containers][devcontainer-ext] extension.
+
+This Linux environment comes with all required dependencies needed to start working on the project.
+
+[codespaces-badge]: <https://github.com/codespaces/badge.svg>
+[codespaces-link]: <https://github.com/codespaces/new?hide_repo_select=true&repo=620476224&ref=beta>
+[devcontainer-ext]: <https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers>
+
+### Local Development
+
+#### Prerequisites
+
+- node: >=22.14.0 - [manage with pnpm](https://pnpm.io/cli/env) | [manage with fnm](https://github.com/Schniz/fnm) | [manage with nvm](https://github.com/nvm-sh/nvm) | [manage with volta.sh](https://volta.sh/)
 - pnpm: 10.x - [how to install](https://pnpm.io/installation) (not recommended to install via `npm` on Windows native) | [alternate method - volta.sh](https://volta.sh/)
 - The repository [forked](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) and [cloned](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) locally on your device
 
-### Running Locally
+#### Running Locally
 
 1. Run `pnpm install` from the repository root
     - *if you run into any errors, reach out in the **#dev-corner** channel on Discord*
@@ -50,7 +67,7 @@ Most issues are bugs and are labeled with their area, such as `Move`, `Ability`,
 - `P2`: Minor - Incorrect (but non-crashing) move/ability/interaction
 - `P3`: No gameplay impact - typo, minor graphical error, etc.
 
-Also under issues, you can take a look at the [List of Partial / Unimplemented Moves and Abilities](https://github.com/pagefaultgames/pokerogue/issues/3503) and the [Bug Board](https://github.com/orgs/pagefaultgames/projects/3) (the latter is essentially the same as the issues page but easier to work with).
+Also under issues, you can take a look at the [List of Partial / Unimplemented Moves and Abilities](https://github.com/pagefaultgames/pokerogue/issues/3503) and the [Bug Board](https://github.com/orgs/pagefaultgames/projects/3). The latter is essentially the same as the issues page, so take your pick.
 
 You are free to comment on any issue so that you may be assigned to it and we can avoid multiple people working on the same thing.
 
@@ -58,7 +75,7 @@ You are free to comment on any issue so that you may be assigned to it and we ca
 
 You can find the auto-generated documentation [here](https://pagefaultgames.github.io/pokerogue/main/index.html).
 
-Additionally, the [docs folder](./docs) contains a variety of in-depth documents and guides useful for aspiring contributors.  
+Additionally, the [docs folder](./docs) contains a variety of in-depth documents and guides useful for aspiring contributors. \
 Notable topics include:
 - [Commenting your code](./docs/comments.md)
 - [Linting & Formatting](./docs/linting.md)

CREDITS.md

@@ -24,9 +24,10 @@
 - Pokémon Sword/Shield
 - Pokémon Legends: Arceus
 - Pokémon Scarlet/Violet
-- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
+- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, Volcano, and Desert biome music)
 - Lmz (Custom Ancient Ruins, Jungle, and Lake biome music)
-- Andr06 (Custom Forest, Slum and Sea biome music)
+- Andr06 (Custom Forest, Slum, Sea, and Fairy Cave biome music)
+- Leavannite (Custom Wasteland biome music)
 - _tresnoir
 - unveiler
 

RELEASE

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

biome.jsonc

@@ -36,7 +36,6 @@
       "!**/src/data/balance/tms.ts"
     ]
   },
-
   "assist": {
     "actions": {
       "source": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.9.6",
+  "version": "1.11.0",
   "type": "module",
   "scripts": {
     "start": "vite",
@@ -14,6 +14,7 @@
     "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",

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],