Merge branch 'beta' into egg-move-scripts

.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:

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

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",
@@ -15,6 +15,7 @@
     "test:silent": "vitest run --silent='passed-only' --no-isolate",
     "test:create": "node scripts/create-test/create-test.js",
     "eggMoves:parse": "node scripts/parse-egg-moves/main.js",
+    "scrape-trainers": "node scripts/scrape-trainer-names/main.js",
     "typecheck": "tsc --noEmit",
     "typecheck:scripts": "tsc -p scripts/jsconfig.json",
     "biome": "biome check --write --changed --no-errors-on-unmatched --diagnostic-level=error",

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"
-	}
-}