.github/workflows/github-pages.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - beta
   pull_request:
     branches:
       - main

.github/workflows/linting.yml

@@ -41,7 +41,4 @@ jobs:
         run: pnpm biome-ci
 
       - name: Check dependencies with depcruise
-        run: pnpm depcruise
+        run: pnpm depcruise
-      
-      - name: Lint with ls-lint
-        run: pnpm ls-lint

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

@@ -44,4 +44,4 @@ jobs:
         run: pnpm i
 
       - name: Run tests
-        run: pnpm test:silent --shard=${{ inputs.shard }}/${{ inputs.totalShards }}
+        run: pnpm exec vitest --project ${{ inputs.project }} --no-isolate --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}

.github/workflows/tests.yml

@@ -11,7 +11,6 @@ on:
       - beta
   merge_group:
     types: [checks_requested]
-  workflow_dispatch:
 
 jobs:
   check-path-change-filter:

.ls-lint.yml

@@ -1,28 +0,0 @@
-# Base settings to use
-# Note that the `_cfg` key isn't part of ls-lint's configuration, it's just a YAML anchor for reuse.
-_cfg: &cfg
-   .ps1: kebab-case
-   .ts: kebab-case
-   .js: kebab-case
-   .*.ts: kebab-case
-   .*.js: kebab-case
-   .dir: kebab-case
-   .py: snake_case # python files should always use snake_case
-
-ls:
-   <<: *cfg
-   src: &src
-      <<: *cfg
-      .dir: kebab-case | regex:@types
-      .js: exists:0
-   src/system/version-migration/versions:
-      .ts: snake_case
-      <<: *cfg
-   test: *src
-ignore:
-   - node_modules
-   - .vscode
-   - .github
-   - .git
-   - public
-   - dist

CONTRIBUTING.md

@@ -104,7 +104,7 @@ Most non-trivial changes (*especially bug fixes*) should come along with new tes
     - Test edge cases. A good strategy is to think of edge cases beforehand and create tests for them using `it.todo`. Once the edge case has been handled, you can remove the `todo` marker.
 
 ## 😈 Development Save File
-> Some issues may require you to have unlocks on your save file which go beyond normal overrides. For this reason, the repository contains a [save file](../test/test-utils/saves/everything.psrv) with _everything_ unlocked (even ones not legitimately obtainable, like unimplemented variant shinies).
+> Some issues may require you to have unlocks on your save file which go beyond normal overrides. For this reason, the repository contains a [save file](../test/testUtils/saves/everything.psrv) with _everything_ unlocked (even ones not legitimately obtainable, like unimplemented variant shinies).
 
 1. Start the game up locally and navigate to `Menu -> Manage Data -> Import Data`
-2. Select [everything.prsv](test/test-utils/saves/everything.prsv) (`test/test-utils/saves/everything.prsv`) and confirm.
+2. Select [everything.prsv](test/testUtils/saves/everything.prsv) (`test/testUtils/saves/everything.prsv`) and confirm.

biome.jsonc

@@ -19,6 +19,7 @@
     // and having to verify whether each individual file is ignored
     "includes": [
       "**",
+      "!**/*.d.ts",
       "!**/dist/**/*",
       "!**/build/**/*",
       "!**/coverage/**/*",
@@ -176,10 +177,9 @@
       }
     },
 
-    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes),
+    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes)
-    // as well as in all TS files in `scripts/` (which are assumed to be boilerplate templates).
     {
-      "includes": ["**/src/overrides.ts", "**/src/enums/**/*", "**/scripts/**/*.ts", "**/*.d.ts"],
+      "includes": ["**/src/overrides.ts", "**/src/enums/**/*"],
       "linter": {
         "rules": {
           "correctness": {
@@ -189,7 +189,7 @@
       }
     },
     {
-      "includes": ["**/src/overrides.ts", "**/scripts/**/*.ts"],
+      "includes": ["**/src/overrides.ts"],
       "linter": {
         "rules": {
           "style": {

global.d.ts

@@ -1,20 +1,14 @@
-import type { AnyFn } from "#types/type-helpers";
 import type { SetupServerApi } from "msw/node";
 
+export {};
+
 declare global {
   /**
    * Only used in testing.
    * Can technically be undefined/null but for ease of use we are going to assume it is always defined.
    * Used to load i18n files exclusively.
    *
-   * To set up your own server in a test see `game-data.test.ts`
+   * To set up your own server in a test see `game_data.test.ts`
    */
   var server: SetupServerApi;
-
-  // Overloads for `Function.apply` and `Function.call` to add type safety on matching argument types
-  interface Function {
-    apply<T extends AnyFn>(this: T, thisArg: ThisParameterType<T>, argArray: Parameters<T>): ReturnType<T>;
-
-    call<T extends AnyFn>(this: T, thisArg: ThisParameterType<T>, ...argArray: Parameters<T>): ReturnType<T>;
-  }
 }

lefthook.yml

@@ -1,13 +1,11 @@
 pre-commit:
-  skip: 
-    - merge
-    - rebase
   commands:
     biome-lint:
       run: pnpm exec biome check --write --reporter=summary --staged --no-errors-on-unmatched
       stage_fixed: true
-    ls-lint:
+      skip:
-      run: pnpm exec ls-lint
+        - merge
+        - rebase
 
 post-merge:
   commands:

package.json

@@ -12,12 +12,12 @@
     "test": "vitest run --no-isolate",
     "test:cov": "vitest run --coverage --no-isolate",
     "test:watch": "vitest watch --coverage --no-isolate",
-    "test:silent": "vitest run --silent='passed-only' --no-isolate",
+    "test:silent": "vitest run --silent --no-isolate",
     "test:create": "node scripts/create-test/create-test.js",
     "typecheck": "tsc --noEmit",
     "eslint": "eslint --fix .",
     "eslint-ci": "eslint .",
-    "biome": "biome check --write --changed --no-errors-on-unmatched --diagnostic-level=error",
+    "biome": "biome check --write --changed --no-errors-on-unmatched",
     "biome-ci": "biome ci --diagnostic-level=error --reporter=github --no-errors-on-unmatched",
     "docs": "typedoc",
     "depcruise": "depcruise src test",
@@ -28,21 +28,19 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.0.0",
-    "@ls-lint/ls-lint": "2.3.1",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^22.16.5",
+    "@types/node": "^22.16.3",
     "@vitest/coverage-istanbul": "^3.2.4",
-    "@vitest/expect": "^3.2.4",
     "chalk": "^5.4.1",
     "dependency-cruiser": "^16.10.4",
-    "inquirer": "^12.8.2",
+    "inquirer": "^12.7.0",
     "jsdom": "^26.1.0",
     "lefthook": "^1.12.2",
     "msw": "^2.10.4",
     "phaser3spectorjs": "^0.0.8",
-    "typedoc": "^0.28.8",
+    "typedoc": "^0.28.7",
     "typescript": "^5.8.3",
-    "vite": "^7.0.6",
+    "vite": "^6.3.5",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4",
     "vitest-canvas-mock": "^0.3.3"

public/exp-sprites.json

@@ -333,6 +333,8 @@
     "671-yellow",
     "6713",
     "6713",
+    "672",
+    "672",
     "6724",
     "6724",
     "673",
@@ -375,6 +377,10 @@
     "690",
     "691",
     "691",
+    "692",
+    "692",
+    "693",
+    "693",
     "695",
     "695",
     "696",
@@ -497,6 +503,10 @@
     "751",
     "752",
     "752",
+    "753",
+    "753",
+    "754",
+    "754",
     "755",
     "755",
     "756",
@@ -1449,6 +1459,8 @@
     "671b-yellow",
     "6713b",
     "6713b",
+    "672b",
+    "672b",
     "6724b",
     "6724b",
     "673b",
@@ -1491,6 +1503,10 @@
     "690b",
     "691b",
     "691b",
+    "692b",
+    "692b",
+    "693b",
+    "693b",
     "695b",
     "695b",
     "696b",
@@ -1613,6 +1629,10 @@
     "751b",
     "752b",
     "752b",
+    "753b",
+    "753b",
+    "754b",
+    "754b",
     "755b",
     "755b",
     "756b",
@@ -2565,6 +2585,8 @@
     "671sb-yellow",
     "6713sb",
     "6713sb",
+    "672sb",
+    "672sb",
     "6724sb",
     "6724sb",
     "673sb",
@@ -2607,6 +2629,10 @@
     "690sb",
     "691sb",
     "691sb",
+    "692sb",
+    "692sb",
+    "693sb",
+    "693sb",
     "695sb",
     "695sb",
     "696sb",
@@ -2729,6 +2755,10 @@
     "751sb",
     "752sb",
     "752sb",
+    "753sb",
+    "753sb",
+    "754sb",
+    "754sb",
     "755sb",
     "755sb",
     "756sb",
@@ -3686,6 +3716,8 @@
     "671s-yellow",
     "6713s",
     "6713s",
+    "672s",
+    "672s",
     "6724s",
     "6724s",
     "673s",
@@ -3728,6 +3760,10 @@
     "690s",
     "691s",
     "691s",
+    "692s",
+    "692s",
+    "693s",
+    "693s",
     "695s",
     "695s",
     "696s",
@@ -3850,6 +3886,10 @@
     "751s",
     "752s",
     "752s",
+    "753s",
+    "753s",
+    "754s",
+    "754s",
     "755s",
     "755s",
     "756s",
@@ -4585,6 +4625,8 @@
     "730",
     "747",
     "748",
+    "753",
+    "754",
     "755",
     "756",
     "761",