Merge branch 'main' into main

.github/workflows/tests.yml

@@ -0,0 +1,31 @@
+name: Tests
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - main  # Trigger on push events to the main branch
+  pull_request:
+    branches:
+      - main  # Trigger on pull request events targeting the main branch
+
+jobs:
+  run-tests:  # Define a job named "run-tests"
+    name: Run tests  # Human-readable name for the job
+    runs-on: ubuntu-latest  # Specify the latest Ubuntu runner for the job
+
+    steps:
+      - name: Check out Git repository  # Step to check out the repository
+        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@v4  # Use the setup-node action version 4
+        with:
+          node-version: 20  # Specify Node.js version 20
+
+      - name: Install Node.js dependencies  # Step to install Node.js dependencies
+        run: npm ci  # Use 'npm ci' to install dependencies
+
+      - name: tests  # Step to run tests
+        run: npm run test:silent

.gitignore

@@ -34,6 +34,7 @@ src/data/battle-anim-data.ts
 src/overrides.ts
 
 coverage
+/.vs
 
 # Local Documentation
 /typedoc

README.md

@@ -46,7 +46,14 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
     - Keisuke Ito
     - Arata Iiyoshi
     - Atsuhiro Ishizuna
+  - Pokémon HeartGold/SoulSilver
   - Pokémon Black/White 2
+  - Pokémon X/Y
+  - Pokémon Omega Ruby/Alpha Sapphire
+  - Pokémon Sun/Moon
+  - Pokémon Ultra Sun/Ultra Moon
+  - Pokémon Sword/Shield
+  - Pokémon Scarlet/Violet
   - Firel (Custom Metropolis and Laboratory biome music)
   - Lmz (Custom Jungle biome music)
 

index.html

@@ -19,6 +19,11 @@
 			font-family: 'emerald';
 			src: url('./fonts/pokemon-emerald-pro.ttf') format('truetype');
 		}
+		@font-face {
+			font-family: 'unifont';
+			src: url('./fonts/unifont-15.1.05.otf') format('opentype');
+			size-adjust: 70%;
+		}
 
 		@font-face {
 			font-family: 'pkmnems';

package.json

@@ -11,6 +11,7 @@
 		"test": "vitest run",
 		"test:cov": "vitest run --coverage",
 		"test:watch": "vitest watch --coverage",
+		"test:silent": "vitest run --silent",
 		"eslint": "eslint --fix .",
 		"eslint-ci": "eslint .",
 		"docs": "typedoc"

public/images/pokemon/variant/641-incarnate.json

@@ -1,18 +0,0 @@
-{
-	"0": {
-		"737373": "737373",
-		"ffffff": "ffffff",
-		"101010": "101010",
-		"b5b5bd": "b5b5bd",
-		"8442ad": "282828",
-		"5a3173": "121212",
-		"294a31": "294a31",
-		"4a9c42": "5fd054",
-		"422152": "000000",
-		"ffc500": "ffc500",
-		"42733a": "317c25",
-		"6b4229": "6b4229",
-		"ad7b4a": "ad7b4a",
-		"deb56b": "deb56b"
-	}
-}

public/images/pokemon/variant/641-therian.json

@@ -1,18 +0,0 @@
-{
-	"0": {
-		"5a3a73": "121212",
-		"8442ad": "282828",
-		"101010": "101010",
-		"422152": "000000",
-		"737373": "737373",
-		"ffffff": "ffffff",
-		"b5b5bd": "b5b5bd",
-		"294a31": "294a31",
-		"4a9c42": "5fd054",
-		"deb56b": "ffc500",
-		"42733a": "317c25",
-		"ad7b4a": "ad7b4a",
-		"6b4229": "6b4229",
-		"de3a29": "deb56b"
-	}
-}

public/images/pokemon/variant/642-incarnate.json

@@ -1,19 +0,0 @@
-{
-	"0": {
-		"737373": "737373",
-		"101010": "101010",
-		"b5b5bd": "878787",
-		"ffffff": "ffffff",
-		"102152": "521010",
-		"5a42ad": "992828",
-		"29426b": "6b2929",
-		"5284a5": "952f2f",
-		"63c5ff": "ff6363",
-		"313131": "313131",
-		"31317b": "3a1111",
-		"4a4a4a": "4a4a4a",
-		"212121": "212121",
-		"ffc55a": "ffc55a",
-		"d69431": "d69431"
-	}
-}

public/images/pokemon/variant/642-therian.json

@@ -1,18 +0,0 @@
-{
-	"0": {
-		"192952": "521010",
-		"737373": "6a0d0d",
-		"ffffff": "ffffff",
-		"101010": "101010",
-		"5a4aad": "952f2f",
-		"b5b5bd": "a49696",
-		"3a3a84": "3a1111",
-		"5284a5": "7c0b0b",
-		"29426b": "6b2929",
-		"63c5ff": "c83f3f",
-		"d69431": "ffc55a",
-		"ffc55a": "d69431",
-		"313131": "313131",
-		"212121": "212121"
-	}
-}

public/images/pokemon/variant/645-incarnate.json

@@ -1,18 +0,0 @@
-{
-	"0": {
-		"b5b5bd": "999999",
-		"737373": "737373",
-		"101010": "101010",
-		"ffffff": "d0d0d0",
-		"6b213a": "838383",
-		"bd4a52": "380d5f",
-		"a55a3a": "451c6a",
-		"f77b42": "69418e",
-		"633110": "2c2c2c",
-		"ffce63": "9386ff",
-		"4a2919": "191919",
-		"634231": "2c143a",
-		"84634a": "311e42",
-		"943142": "0b0b0b"
-	}
-}