Merge branch 'main' of github.com:pagefaultgames/pokerogue into pokerogue-main

.env.beta

@@ -1,6 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=https://api.beta.pokerogue.net
+VITE_SERVER_URL=https://apibeta.pokerogue.net
 VITE_DISCORD_CLIENT_ID=1248062921129459756
 VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
-VITE_I18N_DEBUG=1
+VITE_I18N_DEBUG=0

.env.development

@@ -3,5 +3,5 @@ VITE_BYPASS_TUTORIAL=0
 VITE_SERVER_URL=http://localhost:8001
 VITE_DISCORD_CLIENT_ID=1234567890
 VITE_GOOGLE_CLIENT_ID=1234567890
-VITE_I18N_DEBUG=1
+VITE_I18N_DEBUG=0
 VITE_PORT=8000

.github/CODEOWNERS

@@ -5,41 +5,3 @@
 
 # github actions/templates etc. - Dev Leads
 /.github @pagefaultgames/dev-leads
-
-# --- Translations ---
-
-# all translations - Translation Leads
-/src/locales @pagefaultgames/translation-leads
-
-# Catalan (Spain/Spanish)
-/src/locales/ca_ES @pagefaultgames/catalan-translation-team
-
-# German
-/src/locales/de @pagefaultgames/german-translation-team
-
-# English
-/src/locales/en @pagefaultgames/english-translation-team
-
-# Spanish
-/src/locales/es @pagefaultgames/spanish-translation-team
-
-# French
-/src/locales/fr @pagefaultgames/french-translation-team
-
-# Italian
-/src/locales/it @pagefaultgames/italian-translation-team
-
-# Japenese
-/src/locales/ja @pagefaultgames/japanese-translation-team
-
-# Korean
-/src/locales/ko @pagefaultgames/korean-translation-team
-
-# Brasilian (Brasil/Portuguese)
-/src/locales/pt_BR @pagefaultgames/portuguese_br-translation-team
-
-# Chinese (simplified)
-/src/locales/zh_CN @pagefaultgames/chinese_simplified-translation-team
-
-# Chinese (traditional)
-/src/locales/zh_TW @pagefaultgames/chinese_traditional-translation-team 

.github/FUNDING.yml

@@ -1 +1 @@
-github: patapancakes
+github: pagefaultgames

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug Report
 description: Create a report to help us improve
 title: "[Bug] "
-labels: ["Bug"]
+labels: ["Bug", "Triage"]
 body:
   - type: markdown
     attributes:
@@ -19,21 +19,12 @@ body:
       value: |
         ---
   - type: textarea
-    id: session-file
+    id: repro
     attributes:
-      label: Session export file
+      label: Reproduction
-      description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
+      description: Describe the steps to reproduce this bug. If applicable attach user/session data at the bottom
-      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
     validations:
-      required: false
+      required: true
-  - type: textarea
-    id: data-file
-    attributes:
-      label: User data export file
-      description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-    validations:
-      required: false
   - type: markdown
     attributes:
       value: |
@@ -60,48 +51,20 @@ body:
     attributes:
       value: |
         ---
-  - type: dropdown
+  - type: textarea
-    id: os
+    id: session-file
     attributes:
-      label: What OS did you observe the bug on?
+      label: Session export file
-      multiple: true
+      description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-      options:
+      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-        - PC/Windows
-        - Mac/OSX
-        - Linux
-        - iOS
-        - Android
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: os-other
-    attributes:
-      label: If other please specify
     validations:
       required: false
-  - type: markdown
+  - type: textarea
+    id: data-file
     attributes:
-      value: |
+      label: User data export file
-        ---
+      description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-  - type: dropdown
+      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-    id: browser
-    attributes:
-      label: Which browser do you use?
-      multiple: true
-      options:
-        - Chrome
-        - Firefox
-        - Safari
-        - Edge
-        - Opera
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: browser-other
-    attributes:
-      label: If other please specify
     validations:
       required: false
   - type: markdown

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,7 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: "[Feature] "
-labels: ["Enhancement"]
+labels: ["Enhancement", "Triage"]
 body:
   - type: markdown
     attributes:

.github/workflows/deploy-beta.yml

@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - uses: actions/setup-node@v4
         with:
           node-version: "20"

.github/workflows/deploy.yml

@@ -1,8 +1,12 @@
-name: Deploy
+name: Deploy Main
 
 on:
-  push: {}
+  push:
-  pull_request: {}
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   deploy:
@@ -10,6 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
@@ -20,7 +26,7 @@ jobs:
         env:
           NODE_ENV: production
       - name: Set up SSH
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        if: github.event_name == 'push' && github.ref_name == 'main'
         run: |
           mkdir ~/.ssh
           echo "${{ secrets.SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
@@ -28,12 +34,12 @@ jobs:
           chmod 600 ~/.ssh/*
           ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
       - name: Deploy build on server
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        if: github.event_name == 'push' && github.ref_name == 'main'
         run: | 
           rsync --del --no-times --checksum -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
           ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
       - name: Purge Cloudflare Cache
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        if: github.event_name == 'push' && github.ref_name == 'main'
         id: purge-cache
         uses: NathanVaughn/actions-cloudflare-purge@v3.1.0
         with:

.github/workflows/eslint.yml

@@ -21,10 +21,12 @@ jobs:
 
     steps:
       - name: Check out Git repository  # Step to check out the repository
-        uses: actions/checkout@v2  # Use the checkout action version 2
+        uses: actions/checkout@v4  # Use the checkout action version 4
+        with:
+          submodules: 'recursive'
 
       - name: Set up Node.js  # Step to set up Node.js environment
-        uses: actions/setup-node@v1  # Use the setup-node action version 1
+        uses: actions/setup-node@v4  # Use the setup-node action version 4
         with:
           node-version: 20  # Specify Node.js version 20
 

.github/workflows/github-pages.yml

@@ -26,6 +26,7 @@ jobs:
       - name: Checkout repository for Typedoc
         uses: actions/checkout@v3
         with:
+          submodules: 'recursive'
           path: pokerogue_docs
 
       - name: Install OS package

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

@@ -0,0 +1,32 @@
+name: Test Template
+
+on:
+  workflow_call:
+    inputs:
+      project:
+        required: true
+        type: string
+      shard:
+        required: true
+        type: number
+      totalShards:
+        required: true
+        type: number
+
+jobs:
+  test:
+    name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install Node.js dependencies
+        run: npm ci
+      - name: Run tests
+        run: npx vitest --project ${{ inputs.project }} --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}

.github/workflows/tests.yml

@@ -15,91 +15,34 @@ on:
     types: [checks_requested]
 
 jobs:
-  run-misc-tests:  # Define a job named "run-tests"
+  pre-test:
-    name: Run misc tests  # Human-readable name for the job
+    name: Run Pre-test
-    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: pre-test # pre-test to check overrides
-        run: npx vitest run --project pre 
-      - name: test misc
-        run: npx vitest --project misc
-
-  run-abilities-tests:
-    name: Run abilities tests
     runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          path: tests-action
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
       - name: Install Node.js dependencies
+        working-directory: tests-action
         run: npm ci
-      - name: pre-test
+      - name: Run Pre-test
-        run: npx vitest run --project pre 
+        working-directory: tests-action
-      - name: test abilities
+        run: npx vitest run --project pre ${{ !runner.debug && '--silent' || '' }}
-        run: npx vitest --project abilities
 
-  run-items-tests:
+  run-tests:
-    name: Run items tests
+    name: Run Tests 
-    runs-on: ubuntu-latest 
+    needs: [pre-test]
-    steps:
+    strategy:
-      - name: Check out Git repository
+      matrix:
-        uses: actions/checkout@v4
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-      - name: Set up Node.js
+    uses: ./.github/workflows/test-shard-template.yml
-        uses: actions/setup-node@v4
+    with:
-        with:
+      project: main
-          node-version: 20
+      shard: ${{ matrix.shard }}
-      - name: Install Node.js dependencies
+      totalShards: 10
-        run: npm ci
-      - name: pre-test
-        run: npx vitest run --project pre 
-      - name: test items
-        run: npx vitest --project items
-
-  run-moves-tests:
-    name: Run moves tests
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        run: npm ci
-      - name: pre-test
-        run: npx vitest run --project pre 
-      - name: test moves
-        run: npx vitest --project moves
-
-  run-battle-tests:
-    name: Run battle tests
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        run: npm ci
-      - name: pre-test
-        run: npx vitest run --project pre 
-      - name: test battle
-        run: npx vitest --project battle

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "public/locales"]
+	path = public/locales
+	url = https://github.com/pagefaultgames/pokerogue-locales

README.md

@@ -17,13 +17,21 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
 2. Run `npm run start:dev` to locally run the project in `localhost:8000`
 
 #### Linting
-We're using ESLint as our common linter and formatter. It will run automatically during the pre-commit hook but if you would like to manually run it, use the `npm run eslint` script.
+We're using ESLint as our common linter and formatter. It will run automatically during the pre-commit hook but if you would like to manually run it, use the `npm run eslint` script. To view the complete rules, check out the [eslint.config.js](./eslint.config.js) file.
+
+### 📚 Documentation
+You can find the auto-generated documentation [here](https://pagefaultgames.github.io/pokerogue/main/index.html).
+For information on enemy AI, check out the [enemy-ai.md](./docs/enemy-ai.md) file.
+For detailed guidelines on documenting your code, refer to the [comments.md](./docs/comments.md) file.
 
 ### ❔ FAQ
 
 **How do I test a new _______?**
 - In the `src/overrides.ts` file there are overrides for most values you'll need to change for testing
 
+**How do I retrieve the translations?**
+- The translations were moved to the [dedicated translation repository](https://github.com/pagefaultgames/pokerogue-locales) and are now applied as a submodule in this project.
+- The command to retrieve the translations is `git submodule update --init --recursive`. If you still struggle to get it working, please reach out to #dev-corner channel in Discord.
 
 ## 🪧 To Do
 Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to see how can you help us!
@@ -55,8 +63,8 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
   - Pokémon Sword/Shield
   - Pokémon Legends: Arceus
   - Pokémon Scarlet/Violet
-  - Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
+  - Firel (Custom Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
-  - Lmz (Custom Jungle biome music)
+  - Lmz (Custom Ancient Ruins, Jungle, and Lake biome music)
   - Andr06 (Custom Slum and Sea biome music)
 
 ### 🎵 Sound Effects

create-test-boilerplate.js

@@ -1,78 +1,120 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
 /**
- * This script creates a test boilerplate file for a move or ability.
+ * This script creates a test boilerplate file in the appropriate 
- * @param {string} type - The type of test to create. Either "move", "ability",
+ * directory based on the type selected.
- * or "item".
+ * @example npm run create-test
- * @param {string} fileName - The name of the file to create.
- * @example npm run create-test move tackle
  */
 
+import fs from "fs";
+import inquirer from "inquirer";
+import path from "path";
+import { fileURLToPath } from "url";
+
 // Get the directory name of the current module file
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const typeChoices = ["Move", "Ability", "Item", "Mystery Encounter"];
 
-// Get the arguments from the command line
+/**
-const args = process.argv.slice(2);
+ * Prompts the user to select a type via list.
-const type = args[0]; // "move" or "ability"
+ * @returns {Promise<{selectedOption: string}>} the selected type
-let fileName = args[1]; // The file name
+ */
+async function promptTestType() {
+  const typeAnswer = await inquirer.prompt([
+    {
+      type: "list",
+      name: "selectedOption",
+      message: "What type of test would you like to create:",
+      choices: [...typeChoices, "EXIT"],
+    },
+  ]);
 
-if (!type || !fileName) {
+  if (typeAnswer.selectedOption === "EXIT") {
-    console.error('Please provide both a type ("move", "ability", or "item") and a file name.');
+    console.log("Exiting...");
-    process.exit(1);
+    return process.exit();
+  } else if (!typeChoices.includes(typeAnswer.selectedOption)) {
+    console.error(`Please provide a valid type (${typeChoices.join(", ")})!`);
+    return await promptTestType();
+  }
+
+  return typeAnswer;
 }
 
-// Convert fileName from to snake_case if camelCase is given
+/**
-fileName = fileName.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
+ * Prompts the user to provide a file name.
+ * @param {string} selectedType
+ * @returns {Promise<{userInput: string}>} the selected file name
+ */
+async function promptFileName(selectedType) {
+  const fileNameAnswer = await inquirer.prompt([
+    {
+      type: "input",
+      name: "userInput",
+      message: `Please provide the name of the ${selectedType}:`,
+    },
+  ]);
 
-// Format the description for the test case
+  if (!fileNameAnswer.userInput || fileNameAnswer.userInput.trim().length === 0) {
-const formattedName = fileName
+    console.error("Please provide a valid file name!");
-    .replace(/_/g, ' ')
+    return await promptFileName(selectedType);
-    .replace(/\b\w/g, char => char.toUpperCase());
+  }
 
-// Determine the directory based on the type
+  return fileNameAnswer;
-let dir;
-let description;
-if (type === 'move') {
-    dir = path.join(__dirname, 'src', 'test', 'moves');
-    description = `Moves - ${formattedName}`;
-} else if (type === 'ability') {
-    dir = path.join(__dirname, 'src', 'test', 'abilities');
-    description = `Abilities - ${formattedName}`;
-} else if (type === "item") {
-    dir = path.join(__dirname, 'src', 'test', 'items');
-    description = `Items - ${formattedName}`;
-} else {
-    console.error('Invalid type. Please use "move", "ability", or "item".');
-    process.exit(1);
 }
 
-// Ensure the directory exists
+/**
-if (!fs.existsSync(dir)) {
+ * Runs the interactive create-test "CLI"
-    fs.mkdirSync(dir, { recursive: true });
+ * @returns {Promise<void>}
-}
+ */
+async function runInteractive() {
+  const typeAnswer = await promptTestType();
+  const fileNameAnswer = await promptFileName(typeAnswer.selectedOption);
 
-// Create the file with the given name
+  const type = typeAnswer.selectedOption.toLowerCase();
-const filePath = path.join(dir, `${fileName}.test.ts`);
+  // Convert fileName from kebab-case or camelCase to snake_case
+  const fileName = fileNameAnswer.userInput
+    .replace(/-+/g, "_") // Convert kebab-case (dashes) to underscores
+    .replace(/([a-z])([A-Z])/g, "$1_$2") // Convert camelCase to snake_case
+    .replace(/\s+/g, '_') // Replace spaces with underscores
+    .toLowerCase(); // Ensure all lowercase
+  // Format the description for the test case
 
-if (fs.existsSync(filePath)) {
+  const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, (char) => char.toUpperCase());
-    console.error(`File "${fileName}.test.ts" already exists.`);
+  // Determine the directory based on the type
-    process.exit(1);
+  let dir;
-}
+  let description;
+  switch (type) {
+    case "move":
+      dir = path.join(__dirname, "src", "test", "moves");
+      description = `Moves - ${formattedName}`;
+      break;
+    case "ability":
+      dir = path.join(__dirname, "src", "test", "abilities");
+      description = `Abilities - ${formattedName}`;
+      break;
+    case "item":
+      dir = path.join(__dirname, "src", "test", "items");
+      description = `Items - ${formattedName}`;
+      break;
+    case "mystery encounter":
+      dir = path.join(__dirname, "src", "test", "mystery-encounter", "encounters");
+      description = `Mystery Encounter - ${formattedName}`;
+      break;
+    default:
+      console.error(`Invalid type. Please use one of the following: ${typeChoices.join(", ")}.`);
+      process.exit(1);
+  }
 
-// Define the content template
+  // Define the content template
-const content = `import { Abilities } from "#enums/abilities";
+  const content = `import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
 import GameManager from "#test/utils/gameManager";
-import { SPLASH_ONLY } from "#test/utils/testUtils";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("${description}", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
-  const TIMEOUT = 20 * 1000;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -87,19 +129,43 @@ describe("${description}", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
+      .moveset([ Moves.SPLASH ])
+      .ability(Abilities.BALL_FETCH)
       .battleType("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(SPLASH_ONLY);
+      .enemyMoveset(Moves.SPLASH);
   });
 
-  it("test case", async () => {
+  it("should do X", async () => {
-    // await game.classicMode.startBattle();
+    await game.classicMode.startBattle([ Species.FEEBAS ]);
-    // game.move.select();
+
-  }, TIMEOUT);
+    game.move.select(Moves.SPLASH);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(true).toBe(true);
+  });
 });
 `;
 
-// Write the template content to the file
+  // Ensure the directory exists
-fs.writeFileSync(filePath, content, 'utf8');
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
 
-console.log(`File created at: ${filePath}`);
+  // Create the file with the given name
+  const filePath = path.join(dir, `${fileName}.test.ts`);
+
+  if (fs.existsSync(filePath)) {
+    console.error(`File "${fileName}.test.ts" already exists.`);
+    process.exit(1);
+  }
+
+  // Write the template content to the file
+  fs.writeFileSync(filePath, content, "utf8");
+
+  console.log(`File created at: ${filePath}`);
+}
+
+runInteractive();

eslint.config.js

@@ -1,7 +1,7 @@
 import tseslint from '@typescript-eslint/eslint-plugin';
-import stylisticTs from '@stylistic/eslint-plugin-ts'
+import stylisticTs from '@stylistic/eslint-plugin-ts';
 import parser from '@typescript-eslint/parser';
-// import imports from 'eslint-plugin-import'; // Disabled due to not being compatible with eslint v9
+import importX from 'eslint-plugin-import-x';
 
 export default [ 
     {
@@ -11,20 +11,20 @@ export default [
             parser: parser
         },
         plugins: {
-            // imports: imports.configs.recommended // Disabled due to not being compatible with eslint v9
+            "import-x": importX,
             '@stylistic/ts': stylisticTs,
             '@typescript-eslint': tseslint
         },
         rules: {
-            "eqeqeq": ["error", "always"], // Enforces the use of === and !== instead of == and !=
+            "eqeqeq": ["error", "always"], // Enforces the use of `===` and `!==` instead of `==` and `!=`
-            "indent": ["error", 2], // Enforces a 2-space indentation
+            "indent": ["error", 2, { "SwitchCase": 1 }], // Enforces a 2-space indentation, enforces indentation of `case ...:` statements
             "quotes": ["error", "double"], // Enforces the use of double quotes for strings
-            "no-var": "error", // Disallows the use of var, enforcing let or const instead
+            "no-var": "error", // Disallows the use of `var`, enforcing `let` or `const` instead
-            "prefer-const": "error", // Prefers the use of const for variables that are never reassigned
+            "prefer-const": "error", // Enforces the use of `const` for variables that are never reassigned
             "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
             "@typescript-eslint/no-unused-vars": [ "error", {
                 "args": "none", // Allows unused function parameters. Useful for functions with specific signatures where not all parameters are always used.
-                "ignoreRestSiblings": true // Allows unused variables that are part of a rest property in object destructuring. Useful for excluding certain properties from an object while using the rest.
+                "ignoreRestSiblings": true // Allows unused variables that are part of a rest property in object destructuring. Useful for excluding certain properties from an object while using the others.
             }],
             "eol-last": ["error", "always"], // Enforces at least one newline at the end of files
             "@stylistic/ts/semi": ["error", "always"], // Requires semicolons for TypeScript-specific syntax
@@ -32,14 +32,20 @@ export default [
             "no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax
             "brace-style": "off", // Note: you must disable the base rule as it can report incorrect errors
             "curly": ["error", "all"], // Enforces the use of curly braces for all control statements
-            "@stylistic/ts/brace-style": ["error", "1tbs"],
+            "@stylistic/ts/brace-style": ["error", "1tbs"], // Enforces the following brace style: https://eslint.style/rules/js/brace-style#_1tbs
             "no-trailing-spaces": ["error", { // Disallows trailing whitespace at the end of lines
                 "skipBlankLines": false, // Enforces the rule even on blank lines
                 "ignoreComments": false // Enforces the rule on lines containing comments
             }],
             "space-before-blocks": ["error", "always"], // Enforces a space before blocks
             "keyword-spacing": ["error", { "before": true, "after": true }], // Enforces spacing before and after keywords
-            "comma-spacing": ["error", { "before": false, "after": true }] // Enforces spacing after comma
+            "comma-spacing": ["error", { "before": false, "after": true }], // Enforces spacing after commas
+            "import-x/extensions": ["error", "never", { "json": "always" }], // Enforces no extension for imports unless json
+            "array-bracket-spacing": ["error", "always", { "objectsInArrays": false, "arraysInArrays": false }], // Enforces consistent spacing inside array brackets
+            "object-curly-spacing": ["error", "always", { "arraysInObjects": false, "objectsInObjects": false }], // Enforces consistent spacing inside braces of object literals, destructuring assignments, and import/export specifiers
+            "computed-property-spacing": ["error", "never" ], // Enforces consistent spacing inside computed property brackets
+            "space-infix-ops": ["error", { "int32Hint": false }], // Enforces spacing around infix operators
+            "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }], // Disallows multiple empty lines
         }
     }
 ]

global.d.ts

@@ -0,0 +1,14 @@
+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`
+   */
+  var i18nServer: SetupServerApi;
+}

index.css

@@ -26,10 +26,36 @@ body {
 #app {
   display: flex;
   justify-content: center;
+  align-items: center;
 }
 
 #app > div:first-child {
-  transform-origin: top !important;
+  transform-origin: center !important;
+}
+
+/*
+  Supports automatic vertical centering as suggested in PR#1114, but only via CSS
+
+  Condition factorized to deduce CSS rules:
+  true if (isLandscape && !isMobile() && !hasTouchscreen() || (hasTouchscreen() && !isTouchControlsEnabled))
+*/
+
+/* isLandscape && !isMobile() && !hasTouchscreen() */
+@media (orientation: landscape) and (pointer: fine) {
+  #app {
+    align-items: center;
+  }
+}
+
+@media (pointer: coarse) {
+  /* hasTouchscreen() && !isTouchControlsEnabled */
+  body:has(> #touchControls[class=visible]) #app {
+    align-items: start;
+  }
+
+  body:has(> #touchControls[class=visible]) #app > div:first-child {
+    transform-origin: top !important;
+  }
 }
 
 #layout:fullscreen #dpad, #layout:fullscreen {

lefthook.yml

@@ -14,3 +14,8 @@ pre-push:
     eslint:
       glob: "*.{js,ts,jsx,tsx}"
       run: npx eslint --fix {push_files}
+      
+post-merge:
+  commands:
+    update-submodules:
+      run: git submodule update --init --recursive

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.0.4",
+	"version": "1.1.0",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
@@ -19,7 +19,8 @@
 		"docs": "typedoc",
 		"depcruise": "depcruise src",
 		"depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg",
-		"create-test": "node ./create-test-boilerplate.js"
+		"create-test": "node ./create-test-boilerplate.js",
+		"postinstall": "npx lefthook install && npx lefthook run post-merge"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.3.0",
@@ -32,13 +33,16 @@
 		"@vitest/coverage-istanbul": "^2.0.4",
 		"dependency-cruiser": "^16.3.10",
 		"eslint": "^9.7.0",
+		"eslint-plugin-import-x": "^4.2.1",
+		"inquirer": "^11.0.2",
 		"jsdom": "^24.0.0",
 		"lefthook": "^1.6.12",
+		"msw": "^2.4.9",
 		"phaser3spectorjs": "^0.0.8",
 		"typedoc": "^0.26.4",
 		"typescript": "^5.5.3",
 		"typescript-eslint": "^8.0.0-alpha.54",
-		"vite": "^5.3.5",
+		"vite": "^5.4.8",
 		"vite-tsconfig-paths": "^4.3.2",
 		"vitest": "^2.0.4",
 		"vitest-canvas-mock": "^0.3.3"
@@ -48,6 +52,7 @@
 		"crypto-js": "^4.2.0",
 		"i18next": "^23.11.1",
 		"i18next-browser-languagedetector": "^7.2.1",
+		"i18next-http-backend": "^2.6.1",
 		"i18next-korean-postposition-processor": "^1.0.0",
 		"json-stable-stringify": "^1.1.0",
 		"phaser": "^3.70.0",

public/battle-anims/clanging-scales.json

@@ -27,7 +27,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -115,7 +115,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -215,7 +215,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -315,7 +315,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -414,7 +414,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -538,7 +538,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 23,
@@ -685,7 +685,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -19,
@@ -784,7 +784,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 26,
@@ -883,7 +883,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 23.5,
@@ -994,7 +994,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 9,
@@ -1069,7 +1069,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -18.5,
@@ -1157,7 +1157,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 37.5,
@@ -1221,7 +1221,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -1284,7 +1284,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -1348,7 +1348,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -1448,7 +1448,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -1548,7 +1548,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -1647,7 +1647,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 0,
@@ -1759,7 +1759,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -25.5,
@@ -1870,7 +1870,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 12,
@@ -1957,7 +1957,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -27,
@@ -2044,7 +2044,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -16,
@@ -2143,7 +2143,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -26.5,
@@ -2230,7 +2230,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 23,
@@ -2306,7 +2306,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": 24,
@@ -2346,7 +2346,7 @@
         "opacity": 255,
         "locked": true,
         "priority": 1,
-        "focus": 2
+        "focus": 1
       },
       {
         "x": -27,

public/battle-anims/encounter-dance.json

@@ -0,0 +1,951 @@
+{
+  "id": 686,
+  "graphic": "PRAS- Dragon Dance",
+  "frames": [
+    [
+      {
+        "x": 4,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 12,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -12,
+        "y": -0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": 12,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 16,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -16,
+        "y": -0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": 24,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 20,
+        "y": 0,
+        "zoomX": 108,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -20,
+        "y": -0.5,
+        "zoomX": 108,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": 32,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 24,
+        "y": 0,
+        "zoomX": 108,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -24,
+        "y": -0.5,
+        "zoomX": 108,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": 36,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 28,
+        "y": 0,
+        "zoomX": 108,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -28,
+        "y": -0.5,
+        "zoomX": 108,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": 36,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 36,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 32,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 24,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 12,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 4,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -4,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 12,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -12,
+        "y": -0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": -12,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 16,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -16,
+        "y": -0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": -24,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 20,
+        "y": 0,
+        "zoomX": 108,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -20,
+        "y": -0.5,
+        "zoomX": 108,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": -32,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 24,
+        "y": 0,
+        "zoomX": 108,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -24,
+        "y": -0.5,
+        "zoomX": 108,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 155,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": -36,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      },
+      {
+        "x": 28,
+        "y": 0,
+        "zoomX": 108,
+        "zoomY": 100,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      },
+      {
+        "x": -28,
+        "y": -0.5,
+        "zoomX": 108,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "blendType": 1,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 70,
+        "tone": [
+          0,
+          0,
+          0,
+          255
+        ],
+        "priority": 1,
+        "focus": 3
+      }
+    ],
+    [
+      {
+        "x": -36,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -36,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -32,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -24,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -12,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -4,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 1,
+        "focus": 2
+      }
+    ]
+  ],
+  "frameTimedEvents": {
+    "0": [
+      {
+        "frameIndex": 0,
+        "resourceName": "PRSFX- Attract.wav",
+        "volume": 100,
+        "pitch": 100,
+        "eventType": "AnimTimedSoundEvent"
+      }
+    ],
+    "1": [
+      {
+        "frameIndex": 0,
+        "resourceName": "PRSFX- Ally Switch.wav",
+        "volume": 80,
+        "pitch": 100,
+        "eventType": "AnimTimedSoundEvent"
+      }
+    ]
+  },
+  "position": 4,
+  "hue": 0
+}

public/battle-anims/encounter-magma-bg.json

@@ -0,0 +1,66 @@
+{
+  "frames": [
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    []
+  ],
+  "frameTimedEvents": {
+    "0": [
+      {
+        "frameIndex": 0,
+        "resourceName": "PRAS- Fire BG",
+        "bgX": 0,
+        "bgY": 0,
+        "opacity": 0,
+        "duration": 35,
+        "eventType": "AnimTimedAddBgEvent"
+      },
+      {
+        "frameIndex": 0,
+        "resourceName": "",
+        "bgX": 0,
+        "bgY": 0,
+        "opacity": 255,
+        "duration": 12,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ],
+    "25": [
+      {
+        "frameIndex": 25,
+        "resourceName": "",
+        "bgX": 0,
+        "bgY": 0,
+        "opacity": 0,
+        "duration": 8,
+        "eventType": "AnimTimedUpdateBgEvent"
+      }
+    ]
+  },
+  "position": 1,
+  "hue": 0
+}

public/battle-anims/encounter-magma-spout.json

@@ -0,0 +1,902 @@
+{
+  "graphic": "PRAS- Magma Storm",
+  "frames": [
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 120,
+        "y": -56,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 144,
+        "y": -84,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 100,
+        "y": -86.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 140,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 9,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 136,
+        "y": -92,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 9,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 108,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 9,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 152,
+        "y": -76,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 10,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 116,
+        "y": -88,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 10,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 128,
+        "y": -62.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 10,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 136,
+        "y": -96,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 100,
+        "y": -76,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 148,
+        "y": -66.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 108,
+        "y": -92,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 120,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 144,
+        "y": -86.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 100,
+        "y": -76,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 9,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 136,
+        "y": -68,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 9,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 128,
+        "y": -94.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 9,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 100.5,
+        "y": -70,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 10,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 144,
+        "y": -66,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 10,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 126,
+        "y": -86.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 10,
+        "opacity": 255,
+        "priority": 4,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "priority": 4,
+        "focus": 1
+      }
+    ],
+    [
+      {
+        "x": 101,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 130,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 152,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 130,
+        "priority": 4,
+        "focus": 1
+      },
+      {
+        "x": 124.5,
+        "y": -78.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 140,
+        "priority": 4,
+        "focus": 1
+      }
+    ]
+  ],
+  "frameTimedEvents": {
+    "0": [
+      {
+        "frameIndex": 0,
+        "resourceName": "PRSFX- Magma Storm1.wav",
+        "volume": 100,
+        "pitch": 100,
+        "eventType": "AnimTimedSoundEvent"
+      }
+    ],
+    "8": [
+      {
+        "frameIndex": 8,
+        "resourceName": "PRSFX- Magma Storm2.wav",
+        "volume": 100,
+        "pitch": 100,
+        "eventType": "AnimTimedSoundEvent"
+      }
+    ]
+  },
+  "position": 1,
+  "hue": 0
+}

public/battle-anims/encounter-smokescreen.json

@@ -0,0 +1,822 @@
+{
+  "graphic": "PRAS- Smokescreen",
+  "frames": [
+    [
+      {
+        "x": 15.5,
+        "y": 12.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": 8.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": 0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -4,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": -3.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -4,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -11,
+        "y": 21.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": -7.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -8,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -11,
+        "y": 17.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": -11.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -12,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -11,
+        "y": 13.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": 21,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": -15.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -16,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -11,
+        "y": 5.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": 17,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": -19.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -20,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -11,
+        "y": 0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": 13,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -12.5,
+        "y": 8.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 15.5,
+        "y": -23.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -24,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -11,
+        "y": -2.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": 9,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -12.5,
+        "y": 4.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -11,
+        "y": -6.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -28,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": 5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -12.5,
+        "y": 0.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 8,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": 23,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -11,
+        "y": -10.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -32,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": 1,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -12.5,
+        "y": -3.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 7,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": 19,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -11,
+        "y": -14.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 0,
+        "y": -36,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": -3,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -12.5,
+        "y": -7.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": 15,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 0,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -11,
+        "y": -18.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": -7,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": -12.5,
+        "y": -11.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 6,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": 7,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 1,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -12.5,
+        "y": -15.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": -11,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": 3,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -12.5,
+        "y": -19.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 11,
+        "y": -15,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": -1,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 2,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": -12.5,
+        "y": -23.5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "mirror": true,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 5,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      },
+      {
+        "x": 4.5,
+        "y": -5,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 3,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 4.5,
+        "y": -9,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 150,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 4.5,
+        "y": -13,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 100,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 4.5,
+        "y": -17,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 2,
+        "graphicFrame": 4,
+        "opacity": 50,
+        "priority": 4,
+        "focus": 2
+      }
+    ],
+    [
+      {
+        "x": 0,
+        "y": 0,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 0,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 4,
+        "focus": 3
+      },
+      {
+        "x": 128,
+        "y": -64,
+        "zoomX": 100,
+        "zoomY": 100,
+        "visible": true,
+        "target": 1,
+        "graphicFrame": 0,
+        "opacity": 255,
+        "locked": true,
+        "priority": 4,
+        "focus": 3
+      }
+    ],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [],
+    []
+  ],
+  "frameTimedEvents": {
+    "0": [
+      {
+        "frameIndex": 0,
+        "resourceName": "PRSFX- Haze.wav",
+        "volume": 100,
+        "pitch": 85,
+        "eventType": "AnimTimedSoundEvent"
+      },
+      {
+        "frameIndex": 0,
+        "resourceName": "Explosion1.m4a",
+        "volume": 100,
+        "pitch": 85,
+        "eventType": "AnimTimedSoundEvent"
+      }
+    ]
+  },
+  "position": 2,
+  "hue": 0
+}

public/exp-sprites.json

@@ -4633,11 +4633,7 @@
     "690",
     "691",
     "696",
-    "696_3",
-    "696_3",
     "697",
-    "697_3",
-    "697_3",
     "700",
     "704",
     "705_2",

public/images/mystery-encounters/berries_abound_bush.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "berries_abound_bush.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 49,
+				"h": 53
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 49,
+						"h": 53
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 49,
+						"h": 53
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 49,
+						"h": 53
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:d5f83625477b5f98b726343f4a3a396f:f4665258986e97345cfeee041b4b8bcf:e7781fcc447e6d12deb2af78c9493c7f$"
+	}
+}

public/images/mystery-encounters/dark_deal_porygon.json

@@ -1,11 +1,11 @@
 {
 	"textures": [
 		{
-			"image": "6706_3.png",
+			"image": "dark_deal_porygon.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 82,
+				"w": 36,
-				"h": 82
+				"h": 45
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 82,
+						"w": 36,
-						"h": 72
+						"h": 45
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 82,
+						"w": 44,
-						"h": 72
+						"h": 44
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 82,
+						"w": 36,
-						"h": 72
+						"h": 45
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:02eb46aa66ac70df612e129b7801a85c:a77cca14b23f4f3aece64d1a82449a0f:d60cc2e5ae2bd18de8ee3ab0649593ee$"
+		"smartupdate": "$TexturePacker:SmartUpdate:895f0a79b89fa0fb44167f4584fd9a22:357b46953b7e17c6b2f43a62d52855d8:cc1ed0e4f90aaa9dcf1b39a0af1283b0$"
 	}
 }

public/images/mystery-encounters/dark_deal_scientist.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "dark_deal_scientist.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 46,
+				"h": 76
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 44,
+						"h": 74
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 44,
+						"h": 74
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 44,
+						"h": 74
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:a7f8ff2bbb362868f51125c254eb6681:cf76e61ddd31a8f46af67ced168c44a2:4fc09abe16c0608828269e5da81d0744$"
+	}
+}

public/images/mystery-encounters/field_trip_teacher.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "field_trip_teacher.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 43,
+				"h": 74
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 19,
+						"y": 8,
+						"w": 41,
+						"h": 72
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 41,
+						"h": 72
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:506e5a4ce79c134a7b4af90a90aef244:1b81d3d84bf12cedc419805eaff82548:59bc5dd000b5e72588320b473e31c312$"
+	}
+}

public/images/mystery-encounters/fun_and_games_game.json

@@ -1,10 +1,10 @@
 {
 	"textures": [
 		{
-			"image": "6706_2.png",
+			"image": "fun_and_games_game.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 82,
+				"w": 38,
 				"h": 82
 			},
 			"scale": 1,
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 82,
+						"w": 38,
-						"h": 72
+						"h": 82
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 82,
+						"w": 38,
-						"h": 72
+						"h": 82
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 82,
+						"w": 38,
-						"h": 72
+						"h": 82
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:02eb46aa66ac70df612e129b7801a85c:a77cca14b23f4f3aece64d1a82449a0f:d60cc2e5ae2bd18de8ee3ab0649593ee$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d40b6742392c2fe8ca0735b3f561e319:5dcda5410b12f0aa75eb0dd1fbcbe4f9:d171fb17d3017d1f655cd8dd14c252b7$"
 	}
 }

public/images/mystery-encounters/fun_and_games_man.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "fun_and_games_man.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 50,
+				"h": 77
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 15,
+						"y": 3,
+						"w": 50,
+						"h": 77
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 50,
+						"h": 77
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:e80aa9a809a7cca6d05992cb82f6dbd9:ea9962edd1cdc1e503deecf2ce1863c1:55647352b6547cf03212506309f2abf5$"
+	}
+}

public/images/mystery-encounters/fun_and_games_wobbuffet.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "fun_and_games_wobbuffet.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 45,
+				"h": 55
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 45,
+						"h": 55
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 45,
+						"h": 55
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 45,
+						"h": 55
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:879de17da906ea52e5a71afacb88fcf6:90f64e8eaac4ff1e67373f60c3d98d36:a090cb3294ca1218a4f90ecb97df81d7$"
+	}
+}

public/images/mystery-encounters/global_trade_system.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "global_trade_system.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 77,
+				"h": 78
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 77,
+						"h": 78
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 77,
+						"h": 78
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 77,
+						"h": 78
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:8a51d7a17b3d8c32f0e5e4a0f15daeb4:6eba29c5345847f735d8b69a05fc49d1:98ad8b8b8d8c4865d7d23ec97b516594$"
+	}
+}

public/images/mystery-encounters/lost_at_sea_buoy.json

@@ -0,0 +1,19 @@
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 46, "h": 60 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 46, "h": 60 },
+    "sourceSize": { "w": 46, "h": 60 }
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "buoy-sheet.png",
+  "format": "RGBA8888",
+  "size": { "w": 46, "h": 60 },
+  "scale": "1"
+ }
+}

public/images/mystery-encounters/mysterious_chest_blue.json

@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "mysterious_chest_blue.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 54,
+				"h": 492
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0000.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 39
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 39
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 47,
+						"h": 35
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 47,
+						"h": 35
+					},
+					"frame": {
+						"x": 0,
+						"y": 39,
+						"w": 47,
+						"h": 35
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 39
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 39
+					},
+					"frame": {
+						"x": 0,
+						"y": 74,
+						"w": 46,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 46
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 46
+					},
+					"frame": {
+						"x": 0,
+						"y": 113,
+						"w": 46,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 53,
+						"h": 65
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 53,
+						"h": 65
+					},
+					"frame": {
+						"x": 0,
+						"y": 159,
+						"w": 53,
+						"h": 65
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 224,
+						"w": 54,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 291,
+						"w": 54,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 358,
+						"w": 54,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 425,
+						"w": 54,
+						"h": 67
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:017ecc2437e580a185f9843f97e80da5:f44ef1c27a4a17183a5bcf1f7fc8ce6a:f4f3c064e6c93b8d1290f93bee927f60$"
+	}
+}

public/images/mystery-encounters/mysterious_chest_red.json

@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "mysterious_chest_red.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 54,
+				"h": 492
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0000.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 39
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 39
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 47,
+						"h": 35
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 47,
+						"h": 35
+					},
+					"frame": {
+						"x": 0,
+						"y": 39,
+						"w": 47,
+						"h": 35
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 39
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 39
+					},
+					"frame": {
+						"x": 0,
+						"y": 74,
+						"w": 46,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 46,
+						"h": 46
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 46,
+						"h": 46
+					},
+					"frame": {
+						"x": 0,
+						"y": 113,
+						"w": 46,
+						"h": 46
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 53,
+						"h": 65
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 53,
+						"h": 65
+					},
+					"frame": {
+						"x": 0,
+						"y": 159,
+						"w": 53,
+						"h": 65
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 224,
+						"w": 54,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 291,
+						"w": 54,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 358,
+						"w": 54,
+						"h": 67
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 54,
+						"h": 67
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 54,
+						"h": 67
+					},
+					"frame": {
+						"x": 0,
+						"y": 425,
+						"w": 54,
+						"h": 67
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:2a0b6c93c5be115efa635d40780603f0:b5fde49f991c2ecc49afedd80cc8a544:a163d960e9966469ae4dde4b53c13496$"
+	}
+}

public/images/mystery-encounters/part_timer_crate.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "part_timer_crate.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 71,
+				"h": 52
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 56
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 71,
+						"h": 52
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 71,
+						"h": 52
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:c8df5f0b35fb9c2a69b0e4aaa9fa9f91:f1d4643c26f2aed86ad77d354e669aaf:0c073e3c2048ea0779db9429e5e1d8bc$"
+	}
+}

public/images/mystery-encounters/pokemon_salesman.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "pokemon_salesman.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 40,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 21,
+						"y": 2,
+						"w": 38,
+						"h": 78
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 38,
+						"h": 78
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:dd57e3db21f3933c15be65bec261f4c1:05c7ef32252a5c2d3ad007b7e26fabd7:ae82f52e471ed81e2558206f05476cd7$"
+	}
+}

public/images/mystery-encounters/safari_zone.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "safari_zone.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 84
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 118,
+						"h": 82
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 118,
+						"h": 82
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 118,
+						"h": 82
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:6fad7a61e47043b974153148b4fd3997:5ec4d0890f2f03446daf22c8ae8ba77b:87aa745cd95eef6cbf38935230f4e10f$"
+	}
+}

public/images/mystery-encounters/safari_zone_bait.json

@@ -0,0 +1,83 @@
+{
+	"textures": [
+		{
+			"image": "safari_zone_bait.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 14,
+				"h": 43
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 12,
+						"h": 16
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 12,
+						"h": 13
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 12,
+						"h": 13
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 12,
+						"h": 16
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 12,
+						"h": 13
+					},
+					"frame": {
+						"x": 1,
+						"y": 16,
+						"w": 12,
+						"h": 13
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 12,
+						"h": 16
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 11,
+						"h": 11
+					},
+					"frame": {
+						"x": 1,
+						"y": 31,
+						"w": 11,
+						"h": 11
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:f0ec04fcd67ac346dce973693711d032:b697e09191c4312b8faaa0a080a309b7:1af241a52e61fa01ca849aa03c112f85$"
+	}
+}