Merge branch 'beta' into discord-oauth

.env.beta

@@ -0,0 +1,3 @@
+VITE_BYPASS_LOGIN=0
+VITE_BYPASS_TUTORIAL=0
+VITE_SERVER_URL=https://api.beta.pokerogue.net

.env.production

@@ -0,0 +1,3 @@
+VITE_BYPASS_LOGIN=0
+VITE_BYPASS_TUTORIAL=0
+VITE_SERVER_URL=https://api.pokerogue.net

.github/workflows/deploy-beta.yml

@@ -0,0 +1,33 @@
+name: Deploy Beta
+
+on:
+  push: {}
+  pull_request: {}
+
+jobs:
+  deploy:
+    if: github.repository == 'pagefaultgames/pokerogue'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - name: Install dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build:beta
+        env:
+          NODE_ENV: production
+      - name: Set up SSH
+        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        run: |
+          mkdir ~/.ssh
+          echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
+          echo "${{ secrets.BETA_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/*
+          ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
+      - name: Deploy build on server
+        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        run: | 
+          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}

.github/workflows/eslint.yml

@@ -6,9 +6,11 @@ on:
   push:
     branches:
       - main  # Trigger on push events to the main branch
+      - beta # Trigger on push events to the beta branch
   pull_request:
     branches:
       - main  # Trigger on pull request events targeting the main branch
+      - beta # Trigger on pull request events targeting the beta branch
 
 jobs:
   run-linters:  # Define a job named "run-linters"

.github/workflows/github-pages.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+      - beta
 
 jobs:
   pages:

.github/workflows/tests.yml

@@ -6,9 +6,11 @@ on:
   push:
     branches:
       - main  # Trigger on push events to the main branch
+      - beta # Trigger on push events to the beta branch
   pull_request:
     branches:
       - main  # Trigger on pull request events targeting the main branch
+      - beta # Trigger on pull request events targeting the beta branch
 
 jobs:
   run-tests:  # Define a job named "run-tests"

README.md

@@ -54,7 +54,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
   - Pokémon Ultra Sun/Ultra Moon
   - Pokémon Sword/Shield
   - Pokémon Scarlet/Violet
-  - Firel (Custom Metropolis and Laboratory biome music)
+  - Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
   - Lmz (Custom Jungle biome music)
 
 ### 🎵 Sound Effects

index.html

@@ -31,11 +31,6 @@
 			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-lock.json

@@ -8365,9 +8365,9 @@
 			"dev": true
 		},
 		"node_modules/ws": {
-			"version": "8.16.0",
+			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-			"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+			"integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
 			"dev": true,
 			"engines": {
 				"node": ">=10.0.0"

package.json

@@ -7,6 +7,7 @@
 		"start": "vite",
 		"start:dev": "vite --mode development",
 		"build": "vite build",
+		"build:beta": "vite build --mode beta",
 		"preview": "vite preview",
 		"test": "vitest run",
 		"test:cov": "vitest run --coverage",